5037 default the quantity per individual to 50 in the data (#5080)

* Add migration to set default distribution quantity

* Set default distribution quantity in after_initialize if new record

* Display default value in the form

* Add tests

* Remove changes to form view

* Remove unecessary valid? call

* Update Schema version to match main

* WIP

* Add Gemfile.lock to gitignore

* Update values for recent addition to children_served_report_service_spec

* Update values for recent addition to children_served_report_service_spec

* Update values for recent addition to children_served_report_service_spec

* Attempt to remove Gemfile and .gitignore from PR.

* Attempt to remove Gemfile and .gitignore from PR.

* Add distribution_quantity of 1 to items in test setup

* Add distribution_quantity of one to kit items

* Update total_people_served_with_loose_supplies_per_month to exclude kits

* Merge main

* Fix merge main mistake.

* Add new line to fix linting error

---------

Co-authored-by: CL Fisher <[email protected]>

Author: nathangthomas

app/models/item.rb

@@ -29,6 +29,7 @@ class Item < ApplicationRecord
   include Exportable
   include Valuable
 
+  after_initialize :set_default_distribution_quantity, if: :new_record?
   after_update :update_associated_kit_name, if: -> { kit.present? }
   before_create :set_reporting_category
   before_destroy :validate_destroy, prepend: true
@@ -194,6 +195,10 @@ def set_reporting_category
     self.reporting_category = base_item.reporting_category if base_item.reporting_category
   end
 
+  def set_default_distribution_quantity
+    self.distribution_quantity ||= kit_id.present? ? 1 : 50
+  end
+
   def update_associated_kit_name
     kit.update(name: name)
   end

app/services/reports/adult_incontinence_report_service.rb

@@ -127,7 +127,7 @@ def total_people_served_with_loose_supplies_per_month
                         .distributions
                         .for_year(year)
                         .joins(line_items: :item)
-                        .merge(Item.adult_incontinence)
+                        .merge(Item.adult_incontinence.where(kit_id: nil)) # exclude kits
                         .sum('line_items.quantity / COALESCE(items.distribution_quantity, 50.0)')
       total_quantity.to_f / 12.0
     end

db/migrate/20250307161544_set_default_distribution_quantity.rb

@@ -0,0 +1,11 @@
+class SetDefaultDistributionQuantity < ActiveRecord::Migration[7.2]
+  def up
+    Item.where(distribution_quantity: nil).find_each do |item|
+      item.update_column(:distribution_quantity, item.kit_id.present? ? 1 : 50)
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

spec/models/item_spec.rb

@@ -409,6 +409,20 @@
     end
   end
 
+  describe "when distribution_quantity is set by default" do
+    it "should set distribution_quantity to 50 for regular items" do
+      item = Item.new
+      expect(item.distribution_quantity).to eq(50)
+    end
+
+    it "should set distribution_quantity to 1 for kits" do
+      organization = create(:organization)
+      kit = create(:kit, organization: organization)
+      item = Item.new(kit: kit)
+      expect(item.distribution_quantity).to eq(1)
+    end
+  end
+
   describe "distribution_quantity and package size" do
     it "have nil values if an empty string is passed" do
       expect(create(:item, distribution_quantity: '').distribution_quantity).to be_nil

spec/services/reports/adult_incontinence_report_service_spec.rb

@@ -41,9 +41,9 @@
         non_adult_incontinence_item = organization.items.where.not(id: organization.items.adult_incontinence).first
 
         # kits
-        adult_incontinence_kit_item_1 = create(:item, name: "Adult Briefs (Medium)", reporting_category: "adult_incontinence")
-        adult_incontinence_kit_item_2 = create(:item, name: "Adult Briefs (Large)", reporting_category: "adult_incontinence")
-        adult_incontinence_kit_item_3 = create(:item, name: "Adult Briefs (Small)", reporting_category: "adult_incontinence")
+        adult_incontinence_kit_item_1 = create(:item, name: "Adult Briefs (Medium)", reporting_category: "adult_incontinence", distribution_quantity: 1)
+        adult_incontinence_kit_item_2 = create(:item, name: "Adult Briefs (Large)", reporting_category: "adult_incontinence", distribution_quantity: 1)
+        adult_incontinence_kit_item_3 = create(:item, name: "Adult Briefs (Small)", reporting_category: "adult_incontinence", distribution_quantity: 1)
         non_adult_incontinence_kit_item = create(:item, name: "Baby Wipes", reporting_category: "other")
 
         donation_1 = create(:donation)
@@ -129,7 +129,7 @@
       end
 
       it "returns an accurate number of adult served per month" do
-        expect(report.adults_served_per_month.round).to eq(109)
+        expect(report.adults_served_per_month.round).to eq(108)
       end
 
       it "should return the number of loose adult incontinence supplies distributed" do
@@ -154,9 +154,9 @@
         expect(report.report[:entries]).to match(hash_including({
                                           "% adult incontinence bought" => "60%",
                                           "% adult incontinence supplies donated" => "40%",
-                                          "Adults Assisted Per Month" => 233.83,
+                                          "Adults Assisted Per Month" => 233.33,
                                           "Adult incontinence supplies distributed" => "51,800",
-                                          "Adult incontinence supplies per adult per month" => 18.46,
+                                          "Adult incontinence supplies per adult per month" => 18.5,
                                           "Money spent purchasing adult incontinence supplies" => "$30.00"
                                         }))
         expect(report.report[:entries]['Adult incontinence supplies'].split(', '))
@@ -183,8 +183,8 @@
                                           "% adult incontinence bought" => "60%",
                                           "% adult incontinence supplies donated" => "40%",
                                           "Adult incontinence supplies distributed" => "51,800",
-                                          "Adults Assisted Per Month" => 108.83,
-                                          "Adult incontinence supplies per adult per month" => 39.66,
+                                          "Adults Assisted Per Month" => 108.33,
+                                          "Adult incontinence supplies per adult per month" => 39.85,
                                           "Money spent purchasing adult incontinence supplies" => "$30.00"
                                       }))
         expect(report.report[:entries]['Adult incontinence supplies'].split(', '))

spec/services/reports/children_served_report_service_spec.rb

@@ -39,8 +39,8 @@
         create(:line_item, item: infant_disposable_kit_item)
       ])
 
-      create(:item, name: "Kit 1", kit: kit_1, organization:)
-      create(:item, name: "Kit 2", kit: kit_2, organization:)
+      create(:item, name: "Kit 1", kit: kit_1, organization:, distribution_quantity: 1)
+      create(:item, name: "Kit 2", kit: kit_2, organization:, distribution_quantity: 1)
 
       # Distributions
       distributions = create_list(:distribution, 2, issued_at: within_time, organization: organization)
@@ -88,7 +88,7 @@
         create(:line_item, item: infant_disposable_kit_item)
       ])
 
-      create(:item, name: "Kit 1", kit:, organization:)
+      create(:item, name: "Kit 1", kit:, organization:, distribution_quantity: 1)
 
       # Distributions
       distributions = create_list(:distribution, 2, issued_at: within_time, organization: organization)