moar fixes

Author: dorner

app/controllers/items_controller.rb

@@ -11,7 +11,7 @@ def index
     @items = @items.active unless params[:include_inactive_items]
 
     @item_categories = current_organization.item_categories.includes(:items).order('name ASC')
-    @kits = current_organization.kits.includes(item: {line_items: :item})
+    @kits = current_organization.kits.includes(kit_item: {line_items: :item})
     @storages = current_organization.storage_locations.active.order(id: :asc)
 
     @include_inactive_items = params[:include_inactive_items]

app/controllers/kits_controller.rb

@@ -4,7 +4,7 @@ def show
   end
 
   def index
-    @kits = current_organization.kits.includes(item: {line_items: :item}).class_filter(filter_params)
+    @kits = current_organization.kits.includes(kit_item: {line_items: :item}).class_filter(filter_params)
     @inventory = View::Inventory.new(current_organization.id)
     unless params[:include_inactive_items]
       @kits = @kits.active

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: { item: { line_items: :item} } }})
+        .joins(line_items: { item: { kit: { 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/models/item_spec.rb

@@ -483,7 +483,7 @@
       let(:organization) { create(:organization) }
       let(:base_item) { create(:base_item, name: "Kit") }
       let(:kit) { create(:kit, organization: organization) }
-      let(:kit_item) { create(:item, kit: kit, organization: organization, base_item: base_item) }
+      let(:kit_item) { create(:kit_item, kit: kit, organization: organization, base_item: base_item) }
       let(:regular_item) { create(:item, organization: organization) }
 
       it "has no reporting category" do

spec/services/reports/adult_incontinence_report_service_spec.rb

@@ -52,10 +52,10 @@
         adult_incontinence_kit_item_3.line_items.create!(item: adult_incontinence_kit_item_3, quantity: 5)
         non_adult_incontinence_kit_item.line_items.create!(item: non_adult_incontinence_kit_item, quantity: 5)
 
-        @kit_1 = create(:kit, organization: organization, item: adult_incontinence_kit_item_1)
-        @kit_2 = create(:kit, organization: organization, item: adult_incontinence_kit_item_2)
-        @kit_4 = create(:kit, organization: organization, item: adult_incontinence_kit_item_3)
-        @kit_3 = create(:kit, organization: organization, item: non_adult_incontinence_kit_item)
+        @kit_1 = create(:kit, organization: organization, kit_item: adult_incontinence_kit_item_1)
+        @kit_2 = create(:kit, organization: organization, kit_item: adult_incontinence_kit_item_2)
+        @kit_4 = create(:kit, organization: organization, kit_item: adult_incontinence_kit_item_3)
+        @kit_3 = create(:kit, organization: organization, kit_item: non_adult_incontinence_kit_item)
 
         # kit distributions
         kit_distribution_1 = create(:distribution, organization: organization, issued_at: within_time)