Merge branch 'main' into 5037-default-the-quantity-per-individual-to-50-in-the-data

Author: nathangthomas

app/models/base_item.rb

@@ -39,7 +39,7 @@ class BaseItem < ApplicationRecord
     "Adult Briefs (XXXL)" => "adult_incontinence",
     "Adult Cloth Diapers (Large/XL/XXL)" => "adult_incontinence",
     "Adult Cloth Diapers (Small/Medium)" => "adult_incontinence",
-    "adult_incontinence Pads" => "adult_incontinence",
+    "Adult Incontinence Pads" => "adult_incontinence",
     "Bed Pads (Cloth)" => "other",
     "Bed Pads (Disposable)" => "other",
     "Bibs (Adult & Child)" => "other",
@@ -69,7 +69,7 @@ class BaseItem < ApplicationRecord
     "Kids S/M (38-65 lbs)" => "disposable_diapers",
     "Kit" => nil,
     "Liners (Incontinence)" => "adult_incontinence",
-    "Liners (Menstrual)" => "menstrual",
+    "Liners (Menstrual)" => "period_liners",
     "Other" => "other",
     "Pads" => "pads",
     "Swimmers" => "disposable_diapers",

app/models/distribution.rb

@@ -47,7 +47,7 @@ class Distribution < ApplicationRecord
   enum :state, { scheduled: 5, complete: 10 }
   enum :delivery_method, { pick_up: 0, delivery: 1, shipped: 2 }
   scope :active, -> { joins(:line_items).joins(:items).where(items: { active: true }) }
-  scope :with_diapers, -> { joins(line_items: :item).merge(Item.disposable.or(Item.cloth_diapers)) }
+  scope :with_diapers, -> { joins(line_items: :item).merge(Item.disposable_diapers.or(Item.cloth_diapers)) }
   scope :with_period_supplies, -> { joins(line_items: :item).merge(Item.period_supplies) }
   # add item_id scope to allow filtering distributions by item
   scope :by_item_id, ->(item_id) { includes(:items).where(items: { id: item_id }) }

app/models/item.rb

@@ -68,56 +68,22 @@ class Item < ApplicationRecord
 
   scope :by_size, ->(size) { joins(:base_item).where(base_items: { size: size }) }
 
-  # Scopes - explanation of business rules for filtering scopes as of 20240527.  This was a mess, but is much better now.
-  # 1/  Disposable.   Disposables are only the disposable diapers for children.  So we deliberately exclude adult and cloth
-  # 2/  Cloth.  Cloth diapers for children.  Exclude adult cloth. Cloth training pants also go here.
-  # 3/  Adult incontinence.  Items for adult incontinence -- diapers, ai pads, but not adult wipes.
-  # 4/  Period supplies.  All things with 'menstrual in the category'
-  # 5/  Other -- Miscellaneous, and wipes
-  # Known holes and ambiguities as of 20240527.  Working on these with the business
-  # 1/  Liners.   We are adding a new item for AI liners,  and renaming the current liners to be specifically for periods,
-  # having confirmed with the business that the majority of liners are for menstrual use.
-  # However, there is a product which can be used for either, so we are still sussing out what to do about that.
-
-  scope :disposable, -> {
-    joins(:base_item)
-      .where("lower(base_items.category) LIKE '%diaper%'")
-      .where.not("lower(base_items.category) LIKE '%cloth%' OR lower(base_items.name) LIKE '%cloth%'")
-      .where.not("lower(base_items.category) LIKE '%adult%'")
-  }
-
-  scope :cloth_diapers, -> {
-    joins(:base_item)
-      .where("lower(base_items.category) LIKE '%cloth%'")
-      .or(where("base_items.category = 'Training Pants'"))
-      .where.not("lower(base_items.category) LIKE '%adult%'")
-  }
-
-  scope :adult_incontinence, -> {
-    joins(:base_item)
-      .where("lower(base_items.category) LIKE '%adult%' AND lower(base_items.category) NOT LIKE '%wipes%'")
-  }
-
   scope :period_supplies, -> {
-    joins(:base_item)
-      .where("lower(base_items.category) LIKE '%menstrual%'")
-  }
-
-  scope :other_categories, -> {
-    joins(:base_item)
-      .where("lower(base_items.category) LIKE '%wipes%'")
-      .or(where("base_items.category = 'Miscellaneous'"))
+    where(reporting_category: [:pads, :tampons, :period_liners, :period_underwear, :period_other])
   }
 
   enum :reporting_category, {
     adult_incontinence: "adult_incontinence",
     cloth_diapers: "cloth_diapers",
     disposable_diapers: "disposable_diapers",
     menstrual: "menstrual",
-    other: "other",
+    other_categories: "other",
     pads: "pads",
+    period_liners: "period_liners",
+    period_other: "period_other",
+    period_underwear: "period_underwear",
     tampons: "tampons"
-  }, scopes: false, instance_methods: false
+  }, instance_methods: false
 
   def self.reactivate(item_ids)
     item_ids = Array.wrap(item_ids)

app/services/reports/adult_incontinence_report_service.rb

@@ -105,11 +105,9 @@ def distributed_adult_incontinence_items_from_kits
         INNER JOIN kits ON kits.id = items.kit_id 
         INNER JOIN line_items AS kit_line_items ON kits.id = kit_line_items.itemizable_id
         INNER JOIN items AS kit_items ON kit_items.id = kit_line_items.item_id
-        INNER JOIN base_items ON base_items.partner_key = kit_items.partner_key 
         WHERE distributions.organization_id = ?
           AND EXTRACT(year FROM issued_at) = ?
-          AND LOWER(base_items.category) LIKE '%adult%'
-          AND NOT (LOWER(base_items.category) LIKE '%wipes%' OR LOWER(base_items.name) LIKE '%wipes%')
+          AND kit_items.reporting_category = 'adult_incontinence'
           AND kit_line_items.itemizable_type = 'Kit';
       SQL
 

app/services/reports/children_served_report_service.rb

@@ -38,23 +38,21 @@ def total_children_served_with_loose_disposables
       .distributions
       .for_year(year)
       .joins(line_items: :item)
-      .merge(Item.loose.disposable)
+      .merge(Item.loose.disposable_diapers)
       .pick(Arel.sql("CEILING(SUM(line_items.quantity::numeric / COALESCE(items.distribution_quantity, 50)))"))
       .to_i
     end
 
     # These joins look circular but are needed due to polymorphic relationships.
-    # A distribution has many line_items, items, and base_items but kits also
+    # A distribution has many line_items and  items, but kits also
     # have the same relationships and we want to perform calculations on the
     # items in the kits not the kit items themselves.
     def children_served_with_kits_containing_disposables
       kits_subquery = organization
         .distributions
         .for_year(year)
-        .joins(line_items: { item: { kit: { line_items: {item: :base_item} }}})
-        .where("base_items.category ILIKE '%diaper%' AND
-          NOT base_items.category ILIKE '%cloth%' OR base_items.name ILIKE '%cloth%' AND
-          NOT base_items.category ILIKE '%adult%'")
+        .joins(line_items: { item: { kit: { 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
 

app/services/reports/diaper_report_service.rb

@@ -43,7 +43,7 @@ def distributed_loose_disposable_diapers
         .distributions
         .for_year(year)
         .joins(line_items: :item)
-        .merge(Item.disposable)
+        .merge(Item.disposable_diapers)
         .sum("line_items.quantity")
     end
 
@@ -59,11 +59,9 @@ def distributed_disposable_diapers_from_kits
         INNER JOIN kits ON kits.id = items.kit_id 
         INNER JOIN line_items AS kit_line_items ON kits.id = kit_line_items.itemizable_id
         INNER JOIN items AS kit_items ON kit_items.id = kit_line_items.item_id
-        INNER JOIN base_items ON base_items.partner_key = kit_items.partner_key 
         WHERE distributions.organization_id = ?
           AND EXTRACT(year FROM issued_at) = ?
-          AND LOWER(base_items.category) LIKE '%diaper%'
-          AND NOT (LOWER(base_items.category) LIKE '%cloth%' OR LOWER(base_items.name) LIKE '%cloth%')
+          AND kit_items.reporting_category = 'disposable_diapers'
           AND kit_line_items.itemizable_type = 'Kit';
       SQL
 
@@ -100,7 +98,7 @@ def annual_drives
     # @return [Integer]
     def disposable_diapers_from_drives
       @disposable_diapers_from_drives ||=
-        annual_drives.joins(donations: {line_items: :item}).merge(Item.disposable).sum(:quantity)
+        annual_drives.joins(donations: {line_items: :item}).merge(Item.disposable_diapers).sum(:quantity)
     end
 
     def cloth_diapers_from_drives
@@ -127,7 +125,7 @@ def money_from_virtual_drives
     def disposable_diapers_from_virtual_drives
       @disposable_diapers_from_virtual_drives ||= virtual_product_drives
         .joins(donations: {line_items: :item})
-        .merge(Item.disposable)
+        .merge(Item.disposable_diapers)
         .sum(:quantity)
     end
 
@@ -202,7 +200,7 @@ def vendors_purchased_from
     # @return [Integer]
     def purchased_loose_disposable_diapers
       @purchased_disposable_diapers ||= LineItem.joins(:item)
-        .merge(Item.disposable)
+        .merge(Item.disposable_diapers)
         .where(itemizable: organization.purchases.for_year(year))
         .sum(:quantity)
     end
@@ -228,7 +226,7 @@ def total_cloth_diapers_acquired
     # @return [Integer]
     def donated_disposable_diapers
       @donated_diapers ||= LineItem.joins(:item)
-        .merge(Item.disposable)
+        .merge(Item.disposable_diapers)
         .where(itemizable: organization.donations.for_year(year))
         .sum(:quantity)
     end

app/services/reports/period_supply_report_service.rb

@@ -116,11 +116,9 @@ def kit_items_calculation(itemizable_type, string_itemizable_type)
         INNER JOIN kits ON kits.id = items.kit_id 
         INNER JOIN line_items AS kit_line_items ON kits.id = kit_line_items.itemizable_id
         INNER JOIN items AS kit_items ON kit_items.id = kit_line_items.item_id
-        INNER JOIN base_items ON base_items.partner_key = kit_items.partner_key 
         WHERE #{itemizable_type}.organization_id = ?
           AND EXTRACT(year FROM issued_at) = ?
-          AND LOWER(base_items.category) LIKE '%menstrual supplies%'
-          AND NOT (LOWER(base_items.category) LIKE '%diaper%' OR LOWER(base_items.name) LIKE '%cloth%')
+          AND kit_items.reporting_category IN ('pads', 'tampons', 'period_liners', 'period_underwear', 'period_other')
           AND kit_line_items.itemizable_type = 'Kit';
       SQL
 

app/services/reports/summary_report_service.rb

@@ -71,7 +71,7 @@ def money(year)
     # @return [Integer]
     def diapers(year)
       LineItem.joins(:item)
-              .merge(Item.disposable)
+              .merge(Item.disposable_diapers)
               .where(itemizable: organization.donations.for_year(year))
               .sum(:quantity)
     end

app/views/layouts/partners/navigation/_navbar.html.erb

@@ -1,3 +1,7 @@
+<li id="help" class="nav-item dropdown">
+  <%= link_to 'Need Help?', partners_help_path, class: 'nav-link bg-yellow-400 mx-2 font-bold rounded-2xl' %>
+</li>
+
 <li class="nav-item dropdown">
   <a class="nav-link" data-bs-toggle="dropdown" href="#">
     <%= current_user.email %>
@@ -32,8 +36,4 @@
     <% end %>
 
   </div>
-
-   <li id="help" class="nav-item dropdown">
-     <%= link_to 'Need Help?', partners_help_path, class: 'nav-link bg-yellow-400 mx-2 font-bold rounded-2xl' %>
-   </li>
 </li>

db/migrate/20250404102321_fix_reporting_category_mistakes.rb

@@ -0,0 +1,26 @@
+class FixReportingCategoryMistakes < ActiveRecord::Migration[8.0]
+  def up
+    # Fix for categorization mistake
+    BaseItem
+      .where(name: "Liners (Menstrual)")
+      .update_all(reporting_category: :period_liners)
+
+    Item
+      .joins(:base_item)
+      .where(base_item: { name: "Liners (Menstrual)" })
+      .update_all(reporting_category: :period_liners)
+
+    # Fix for typo mistake in BaseItem::NAME_TO_REPORTING_CATEGORY
+    BaseItem
+      .where(name: "Adult Incontinence Pads")
+      .update_all(reporting_category: :adult_incontinence)
+
+    Item
+      .joins(:base_item)
+      .where(base_item: { name: "Adult Incontinence Pads" })
+      .update_all(reporting_category: :adult_incontinence)
+  end
+
+  def down
+  end
+end