Merge pull request #12651 from empirical-org/develop

Release 2024-12-11

Author: anathomical

services/QuillLMS/app/models/activity.rb

@@ -105,6 +105,7 @@ class Activity < ApplicationRecord
   scope :alpha_user, -> { where("'#{ALPHA}' = ANY(activities.flags) OR '#{BETA}' = ANY(activities.flags) OR '#{GAMMA}' = ANY(activities.flags) OR '#{PRODUCTION}' = ANY(activities.flags)") }
 
   scope :with_classification, -> { includes(:classification).joins(:classification) }
+  scope :diagnostic, -> { where(classification: ActivityClassification.diagnostic) }
   scope :evidence, -> { where(classification: ActivityClassification.evidence) }
   scope :evidence_beta1, -> { where(flags: [Flags::EVIDENCE_BETA1]) }
   scope :evidence_beta2, -> { where(flags: [Flags::EVIDENCE_BETA2]) }

services/QuillLMS/app/models/concerns/translatable.rb

@@ -59,19 +59,19 @@ module Translatable
     class_attribute :default_translatable_field, default: nil
   end
 
-  def create_translation_mappings
-    create_translation_mappings_with_text(translatable_text:)
-  end
-
-  def create_translation_mappings_with_text(translatable_text:, field_name: default_translatable_field)
+  def create_translation_mappings(field_name: default_translatable_field)
     return unless translatable_text.is_a?(String) && translatable_text.present?
-    return unless translation_mappings.joins(:english_text)
+    return if translation_mappings.joins(:english_text)
       .where(field_name:)
       .where(english_text: { text: translatable_text })
-      .empty?
+      .exists?
 
-    clean_deprecated_translations(translatable_text:, field_name:)
+    destroy_deprecated_translations(translatable_text:, field_name:)
 
+    create_translation_mappings_with_text(translatable_text:)
+  end
+
+  def create_translation_mappings_with_text(translatable_text:, field_name: default_translatable_field)
     english_text = EnglishText.find_or_create_by(text: translatable_text)
     translation_mappings.create(english_text:, field_name:)
   end
@@ -130,7 +130,7 @@ def open_ai_prompt(locale:)
     data[default_translatable_field]
   end
 
-  private def clean_deprecated_translations(translatable_text:, field_name:)
+  private def destroy_deprecated_translations(translatable_text:, field_name:)
     translation_mappings.joins(:english_text)
       .where(field_name:)
       .where.not(english_text: { text: translatable_text })

services/QuillLMS/app/models/student_learning_sequence_activity.rb

@@ -25,6 +25,8 @@ class StudentLearningSequenceActivity < ApplicationRecord
   belongs_to :classroom_unit
   belongs_to :student_learning_sequence
 
+  delegate :user, to: :student_learning_sequence
+
   validates :activity_id, presence: true
   validates :classroom_unit_id, presence: true
   validates :student_learning_sequence_id, presence: true

services/QuillLMS/app/services/student_learning_sequences/find_initial_activity.rb

@@ -13,25 +13,46 @@ def run
       return unless activity_id && classroom_unit_id
       return activity if pre_diagnostic?
 
-      for_post_diagnostic || for_recommended_activity
+      for_post_diagnostic || for_pre_recommendation || for_post_recommendation
     end
 
     private def activity = @activity ||= Activity.find_by(id: activity_id)
     private def classroom_unit = @classroom_unit ||= ClassroomUnit.find(classroom_unit_id)
 
     private def pre_diagnostic? = activity.is_pre_diagnostic?
-    private def for_post_diagnostic = Activity.find_by(follow_up_activity_id: activity_id)
+    private def for_post_diagnostic = Activity.diagnostic.find_by(follow_up_activity_id: activity_id)
 
-    private def for_recommended_activity
+    private def for_pre_recommendation
       Activity.joins(recommendations: {
         unit_template: {
           unit_unscoped: :classroom_units
         }
-      }).find_by(recommendations: {
-        unit_template: {
-          units: {
-            classroom_units: {
-              id: classroom_unit_id
+      }).where.not(follow_up_activity_id: nil)
+        .find_by(recommendations: {
+          unit_template: {
+            units: {
+              classroom_units: {
+                id: classroom_unit_id
+              }
+            }
+          }
+        })
+    end
+
+    private def for_post_recommendation
+      Activity.joins(follow_up_activity: {
+        recommendations: {
+          unit_template: {
+            unit_unscoped: :classroom_units
+          }
+        }
+      }).find_by(follow_up_activity: {
+        recommendations: {
+          unit_template: {
+            units: {
+              classroom_units: {
+                id: classroom_unit_id
+              }
             }
           }
         }

services/QuillLMS/app/workers/student_learning_sequences/backfill/post_recommendation_assignment_worker.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module StudentLearningSequences
+  module Backfill
+    class PostRecommendationAssignmentWorker < BaseWorker
+      def run_backfill
+        backfill_classroom_units(recommendation_classroom_units)
+      end
+
+      def recommendation_classroom_units
+        ClassroomUnit.joins(unit_unscoped: { unit_template: :recommendations })
+          .where(unit: {
+            unit_template: {
+              recommendations: {
+                activity_id: post_diagnostic_activity_ids
+              }
+            }
+          })
+      end
+    end
+  end
+end

services/QuillLMS/app/workers/student_learning_sequences/backfill/post_recommendation_completion_worker.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module StudentLearningSequences
+  module Backfill
+    class PostRecommendationCompletionWorker < BaseWorker
+      def run_backfill
+        backfill_activity_sessions(recommendation_activity_sessions)
+      end
+
+      def recommendation_activity_sessions
+        ActivitySession.unscoped.joins(classroom_unit: {
+          unit_unscoped: {
+            unit_template: :recommendations
+          }
+        }).where(classroom_unit: {
+          unit: {
+            unit_template: {
+              recommendations: {
+                activity_id: post_diagnostic_activity_ids
+              }
+            }
+          }
+        })
+      end
+    end
+  end
+end

services/QuillLMS/app/workers/student_learning_sequences/backfill/recommendation_assignment_worker.rb

@@ -8,7 +8,7 @@ def run_backfill
       end
 
       def recommendation_classroom_units
-        ClassroomUnit.joins(unit: { unit_template: :recommendations })
+        ClassroomUnit.joins(unit_unscoped: { unit_template: :recommendations })
           .where(unit: {
             unit_template: {
               recommendations: {

services/QuillLMS/app/services/student_learning_sequences/handle_assignment_backfill_worker.rb renamed to services/QuillLMS/app/workers/student_learning_sequences/handle_assignment_backfill_worker.rb

@@ -34,7 +34,7 @@ module StudentLearningSequences
       it { expect(subject).to eq(pre_diagnostic) }
     end
 
-    context 'activity is part of a recommendation' do
+    context 'activity is part of a pre diagnostic recommendation' do
       let(:pre_diagnostic) { create(:pre_diagnostic_activity) }
       let!(:recommendation) { create(:recommendation, activity: pre_diagnostic, unit_template:) }
 
@@ -56,5 +56,19 @@ module StudentLearningSequences
         end
       end
     end
+
+    context 'activity is part of a post diagnostic recommendation' do
+      let(:pre_diagnostic) { create(:pre_diagnostic_activity) }
+      let(:post_diagnostic) { pre_diagnostic.follow_up_activity }
+      let!(:recommendation) { create(:recommendation, activity: post_diagnostic, unit_template:) }
+
+      it { expect(subject).to eq(pre_diagnostic) }
+
+      context 'even when the recommendation is a follow-up, handling an edge case that did not come up with pre diagnostic recommendations' do
+        let!(:precursor_activity) { create(:connect_activity, follow_up_activity: activity) }
+
+        it { expect(subject).to eq(pre_diagnostic) }
+      end
+    end
   end
 end

services/QuillLMS/spec/services/student_learning_sequences/find_initial_activity_spec.rb

@@ -104,6 +104,17 @@ module StudentLearningSequences
               .and not_change(StudentLearningSequenceActivity, :count)
           end
         end
+
+        context 'handle assigning post-diagnostic recommendations' do
+          let(:recommended_activity) { create(:activity) }
+          let(:unit_template) { create(:unit_template, activities: [recommended_activity]) }
+          let(:unit) { create(:unit, unit_template:, activities: [recommended_activity]) }
+          let(:classroom_unit) { create(:classroom_unit, classroom:, unit:, assigned_student_ids: [student_id]) }
+          let!(:recommendation) { create(:recommendation, activity: post_diagnostic, unit_template:) }
+
+          it { expect { subject }.to not_change(StudentLearningSequence, :count) }
+          it { expect { subject }.to change(StudentLearningSequenceActivity, :count).by(1) }
+        end
       end
     end
   end