Spec fixes

Author: dorner

app/models/kit.rb

@@ -21,7 +21,6 @@ class Kit < ApplicationRecord
 
   scope :active, -> { where(active: true) }
   scope :alphabetized, -> { order(:name) }
-  scope :by_partner_key, ->(key) { joins(:items).where(items: { partner_key: key }) }
   scope :by_name, ->(name) { where("name ILIKE ?", "%#{name}%") }
 
   validates :name, presence: true

app/services/reports/children_served_report_service.rb

@@ -52,7 +52,7 @@ def children_served_with_kits_containing_disposables
       kits_subquery = organization
         .distributions
         .for_year(year)
-        .joins(line_items: { item: { kit: { line_items: :item} }})
+        .joins(line_items: { item: { kit: { item: { line_items: :item} } }})
         .where("items_line_items.reporting_category = 'disposable_diapers'")
         .select("DISTINCT ON (distributions.id, line_items.id, kits.id) line_items.quantity, items.distribution_quantity")
         .to_sql

spec/events/inventory_aggregate_spec.rb

@@ -440,8 +440,8 @@
       inventory = InventoryAggregate.inventory_for(organization.id) # reload
 
       kit.item.line_items = []
-      kit.item.line_items << build(:line_item, quantity: 20, item: item1, itemizable: kit)
-      kit.item.line_items << build(:line_item, quantity: 5, item: item2, itemizable: kit)
+      kit.item.line_items << build(:line_item, quantity: 20, item: item1, itemizable: kit.item)
+      kit.item.line_items << build(:line_item, quantity: 5, item: item2, itemizable: kit.item)
       KitDeallocateEvent.publish(kit, storage_location1.id, 2)
 
       # 30 + (20*2) = 70, 10 + (5*2) = 20

spec/models/kit_spec.rb

@@ -64,22 +64,6 @@
       expect(Kit.alphabetized.count).to eq(3)
       expect(Kit.alphabetized.map(&:name)).to eq(alphabetized_list)
     end
-
-    describe "->by_partner_key" do
-      it "shows the kits for a particular item" do
-        base1 = create(:base_item)
-        base2 = create(:base_item)
-
-        c1 = create(:item, base_item: base1, organization: organization)
-        c2 = create(:item, base_item: base2, organization: organization)
-
-        create(:kit, organization: organization, line_items: [create(:line_item, item: c1)])
-        create(:kit, organization: organization, line_items: [create(:line_item, item: c2)])
-
-        expect(Kit.by_partner_key(c1.partner_key).size).to eq(1)
-        expect(Kit.active.size).to be > 1
-      end
-    end
   end
 
   context "Value >" do

spec/services/reports/children_served_report_service_spec.rb

@@ -29,15 +29,17 @@
       toddler_disposable_kit_item = create(:item, name: "Toddler Disposable Diapers", reporting_category: :disposable_diapers)
       infant_disposable_kit_item = create(:item, name: "Infant Disposable Diapers", reporting_category: :disposable_diapers)
 
-      kit_1 = create(:kit, organization: organization, line_items: [
+      kit_1 = create(:kit, organization: organization)
+      kit_1.item.line_items = [
         create(:line_item, item: toddler_disposable_kit_item),
         create(:line_item, item: infant_disposable_kit_item)
-      ])
+      ]
 
-      kit_2 = create(:kit, organization: organization, line_items: [
+      kit_2 = create(:kit, organization: organization)
+      kit_2.item.line_items = [
         create(:line_item, item: toddler_disposable_kit_item),
         create(:line_item, item: infant_disposable_kit_item)
-      ])
+      ]
 
       create(:item, name: "Kit 1", kit: kit_1, organization:, distribution_quantity: 1)
       create(:item, name: "Kit 2", kit: kit_2, organization:, distribution_quantity: 1)
@@ -83,10 +85,11 @@
       toddler_disposable_kit_item = create(:item, name: "Toddler Disposable Diapers", reporting_category: :disposable_diapers)
       infant_disposable_kit_item = create(:item, name: "Infant Disposable Diapers", reporting_category: :disposable_diapers)
 
-      kit = create(:kit, organization: organization, line_items: [
+      kit = create(:kit, organization: organization)
+      kit.item.line_items = [
         create(:line_item, item: toddler_disposable_kit_item),
         create(:line_item, item: infant_disposable_kit_item)
-      ])
+      ]
 
       create(:item, name: "Kit 1", kit:, organization:, distribution_quantity: 1)
 
@@ -124,11 +127,12 @@
       not_disposable_kit_item = create(:item, name: "Adult Diapers", reporting_category: :adult_incontinence)
 
       # this quantity shouldn't matter so I'm setting it to a high number to ensure it isn't used
-      kit = create(:kit, organization: organization, line_items: [
+      kit = create(:kit, organization: organization)
+      kit.item.line_items = [
         create(:line_item, quantity: 1000, item: toddler_disposable_kit_item),
         create(:line_item, quantity: 1000, item: infant_disposable_kit_item),
         create(:line_item, quantity: 1000, item: not_disposable_kit_item)
-      ])
+      ]
 
       create(:item, name: "Kit 1", kit:, organization:, distribution_quantity: 3)