fix: Update progress calculation to count all person checklist items; improve existing item ID retrieval in specs

Author: rsmithlal

app/models/better_together/checklist.rb

@@ -35,7 +35,7 @@ def completion_percentage_for(person)
       total = checklist_items.count
       return 0 if total.zero?
 
-      completed = person_checklist_items.where(person:, done: true).count
+      completed = person_checklist_items.where(person:).count
       ((completed.to_f / total) * 100).round
     end
 

db/migrate/20250901203002_add_children_count_to_checklist_items.rb

@@ -17,8 +17,17 @@ def change
 
   private
 
-  def backfill_children_count
-    sql = "UPDATE better_together_checklist_items parent SET children_count = sub.count FROM (SELECT parent_id, COUNT(*) as count FROM better_together_checklist_items WHERE parent_id IS NOT NULL GROUP BY parent_id) AS sub WHERE parent.id = sub.parent_id" # rubocop:disable Layout/LineLength
-    execute(sql)
+  def backfill_children_count # rubocop:todo Metrics/MethodLength
+    execute(<<-SQL.squish)
+      UPDATE better_together_checklist_items parent
+      SET children_count = sub.count
+      FROM (
+        SELECT parent_id, COUNT(*) as count
+        FROM better_together_checklist_items
+        WHERE parent_id IS NOT NULL
+        GROUP BY parent_id
+      ) AS sub
+      WHERE parent.id = sub.parent_id
+    SQL
   end
 end

spec/requests/better_together/checklist_items_nested_spec.rb

@@ -6,6 +6,8 @@
   let(:checklist) { create(:better_together_checklist) }
   # create a few items
   let!(:parent) { create(:better_together_checklist_item, checklist: checklist) }
+  # capture existing item ids so newly created items can be found without relying on a `label` column
+  let!(:existing_item_ids) { checklist.checklist_items.pluck(:id) }
 
   context 'when creating a nested child' do
     before do
@@ -26,7 +28,8 @@
     end
 
     let(:created) do
-      BetterTogether::ChecklistItem.where(checklist: checklist, parent: parent).find_by(label: 'nested child') ||
+      BetterTogether::ChecklistItem.where(checklist: checklist,
+                                          parent: parent).where.not(id: existing_item_ids).first ||
         BetterTogether::ChecklistItem.i18n.find_by(label: 'nested child')
     end
 
@@ -39,7 +42,7 @@
     end
   end
 
-  context 'when reordering siblings' do
+  context 'when reordering siblings' do # rubocop:todo RSpec/MultipleMemoizedHelpers
     let!(:a) { create(:better_together_checklist_item, checklist: checklist, parent: parent, position: 0) }
     let!(:b) { create(:better_together_checklist_item, checklist: checklist, parent: parent, position: 1) }
     let!(:top) { create(:better_together_checklist_item, checklist: checklist, position: 0) }
@@ -81,7 +84,7 @@
     end
 
     let(:created_localized) do
-      BetterTogether::ChecklistItem.where(checklist: checklist, parent: parent).find_by(label: 'localized child')
+      BetterTogether::ChecklistItem.where(checklist: checklist, parent: parent).where.not(id: existing_item_ids).first
     end
 
     it 'creates a localized child record' do