5248 combined purchased from (#5267)

* Refactor diaper report service to combine purchased_from and vendors_purchased_from into a single method

* Refactor combined_purchased_from method to use compact_blank and update specs for merged output

Author: yahyaelganyni1

app/services/reports/diaper_report_service.rb

@@ -32,11 +32,15 @@ def report
                      "% disposable diapers purchased" => "#{percent_disposable_diapers_purchased.round}%",
                      "% cloth diapers purchased" => "#{percent_cloth_diapers_purchased.round}%",
                      "Money spent purchasing diapers" => number_to_currency(money_spent_on_diapers),
-                     "Purchased from" => purchased_from,
-                     "Vendors diapers purchased through" => vendors_purchased_from
+                     "Purchased from" => combined_purchased_from
                    }}
     end
 
+    # Helper method to combine purchased_from and vendors_purchased_from
+    def combined_purchased_from
+      [purchased_from, vendors_purchased_from].compact_blank.join(", ")
+    end
+
     # @return [Integer]
     def distributed_loose_disposable_diapers
       @distributed_loose_disposable_diapers ||= organization
@@ -53,10 +57,10 @@ def distributed_disposable_diapers_from_kits
 
       sql_query = <<-SQL
         SELECT SUM(line_items.quantity * kit_line_items.quantity)
-        FROM distributions 
-        INNER JOIN line_items ON line_items.itemizable_type = 'Distribution' AND line_items.itemizable_id = distributions.id 
-        INNER JOIN items ON items.id = line_items.item_id 
-        INNER JOIN kits ON kits.id = items.kit_id 
+        FROM distributions
+        INNER JOIN line_items ON line_items.itemizable_type = 'Distribution' AND line_items.itemizable_id = distributions.id
+        INNER JOIN items ON items.id = line_items.item_id
+        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
         WHERE distributions.organization_id = ?

spec/services/reports/diaper_report_service_spec.rb

@@ -171,8 +171,7 @@
                   "% disposable diapers purchased" => "22%",
                   "% cloth diapers purchased" => "11%",
                   "Money spent purchasing diapers" => "$60.00",
-                  "Purchased from" => "Google, Walmart",
-                  "Vendors diapers purchased through" => "Vendor 1, Vendor 2"},
+                  "Purchased from" => "Google, Walmart, Vendor 1, Vendor 2"},
         name: "Diapers"
       })
     end