Merge pull request #2329 from NCCE/2987-make-legacy-activities-count-towards-certificate-completion

Make legacy activities count towards certificate completion

Author: msquance-stem

app/components/community_activity_list_component.rb

@@ -6,13 +6,16 @@ def initialize(programme_activity_grouping:, community_achievements:, number_to_
     @class_name = class_name
     @button_class = button_class
 
-    activities_with_achievements = programme_activity_grouping.programme_activities.not_legacy.map do |programme_activity|
+    activities_with_achievements = programme_activity_grouping.programme_activities.map do |programme_activity|
       {
         programme_activity:,
         achievement: community_achievements&.find { _1.activity_id == programme_activity.activity_id }
       }
     end
 
+    # Remove legacy if they do not have an achievement
+    activities_with_achievements.delete_if { _1[:achievement].nil? && _1[:programme_activity].legacy }
+
     complete, non_complete = activities_with_achievements.partition { _1[:achievement]&.in_state? :complete }
 
     if complete.size < programme_activity_grouping.required_for_completion

app/models/programme_activity_grouping.rb

@@ -55,7 +55,6 @@ def users_completed(users:)
       .belonging_to_programme(programme)
       .joins(activity: :programme_activities)
       .where(
-        activities: {programme_activities: {legacy: false}},
         user: users
       )
       .group_by(&:user_id)

spec/components/community_activity_list_component_spec.rb

@@ -47,4 +47,26 @@
       expect(page).to have_css(".community-activity-list--show-hide")
     end
   end
+
+  context "with legacy activity" do
+    let(:activity) { create(:activity, title: "Legacy activity") }
+    let(:programme_activities) {
+      create_list(:programme_activity, 2, programme_activity_grouping:)
+      create(:programme_activity, programme_activity_grouping:, activity:, legacy: true)
+    }
+
+    context "without achievement" do
+      it "should not show legacy activity" do
+        expect(page).not_to have_text("Legacy activity")
+      end
+    end
+
+    context "with achievement" do
+      let(:community_achievements) { [create(:completed_achievement, activity: activity)] }
+
+      it "should show legacy activity" do
+        expect(page).to have_text("Legacy activity")
+      end
+    end
+  end
 end

spec/models/programme_activity_grouping_spec.rb

@@ -55,9 +55,9 @@
         programme_activity.update(legacy: true)
       end
 
-      it "returns false" do
+      it "returns true" do
         grouping = programme_activity_groupings.first
-        expect(grouping.user_complete?(user)).to be false
+        expect(grouping.user_complete?(user)).to be true
       end
     end
   end
@@ -80,6 +80,12 @@
     end
   end
 
+  describe "#objective_displayed_in_body?" do
+    it "should default to true" do
+      expect(programme_activity_grouping.objective_displayed_in_body?).to be true
+    end
+  end
+
   describe "#users_completed" do
     let!(:programme) { create(:programme) }
     let!(:programme_activity_grouping) { create(:programme_activity_grouping, required_for_completion: 3, programme:) }