Add new purchase information on summary report view (#4723)

Author: manuel1280

app/controllers/reports_controller.rb

@@ -12,8 +12,7 @@ def manufacturer_donations_summary
   end
 
   def purchases_summary
-    @purchases = current_organization.purchases.during(helpers.selected_range)
-    @recent_purchases = @purchases.recent.includes(:vendor)
+    @summary_struct = Purchase.organization_summary_by_dates(current_organization, helpers.selected_range)
   end
 
   def product_drives_summary

app/models/purchase.rb

@@ -81,6 +81,20 @@ def remove(item)
     line_item&.destroy
   end
 
+  def self.organization_summary_by_dates(organization, date_range)
+    purchases = where(organization: organization).during(date_range)
+
+    OpenStruct.new(
+      amount_spent: purchases.sum(:amount_spent_in_cents),
+      recent_purchases: purchases.recent.includes(:vendor),
+      period_supplies: purchases.sum(:amount_spent_on_period_supplies_cents),
+      diapers: purchases.sum(:amount_spent_on_diapers_cents),
+      adult_incontinence: purchases.sum(:amount_spent_on_adult_incontinence_cents),
+      other: purchases.sum(:amount_spent_on_other_cents),
+      total_items: purchases.joins(:line_items).sum(:quantity)
+    )
+  end
+
   private
 
   def combine_duplicates

app/views/reports/purchases_summary.html.erb

@@ -9,12 +9,21 @@
   filter_url: reports_purchases_summary_path
 ) do %>
   <%= new_button_to new_purchase_path, {text: "New Purchase"} %>
-  <h3 class="text-center"><%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %>
+  <h3 class="text-center"><%= dollar_presentation(@summary_struct.amount_spent) %>
     spent
     <%= @selected_date_range_label %>
   </h3>
+  <div class="box-body" style="margin: 40px">
+    <h4> Total spent on diapers: <%= dollar_presentation @summary_struct.diapers %></h4>
+    <h4> Total spent on period supplies: <%= dollar_presentation @summary_struct.period_supplies %> </h4>
+    <h4> Total spent on adult incontinence: <%= dollar_presentation @summary_struct.adult_incontinence %> </h4>
+    <h4> Total spent on other: <%= dollar_presentation @summary_struct.other %> </h4>
+  </div>
+  <div style="margin: 40px">
+    <h4> Total items: <%= @summary_struct.total_items %> </h4>
+  </div>
   <div class="box-body">
     <h4>Recent purchases</h4>
-    <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %>
+    <%= render partial: "purchase", collection: @summary_struct.recent_purchases, as: :purchase %>
   </div>
 <% end %>

db/seeds.rb

@@ -709,6 +709,7 @@ def seed_quantity(item_name, organization, storage_location, quantity)
 # ----------------------------------------------------------------------------
 
 suppliers = %w(Target Wegmans Walmart Walgreens)
+amount_items = %w(period_supplies diapers adult_incontinence other)
 comments = [
   "Maecenas ante lectus, vestibulum pellentesque arcu sed, eleifend lacinia elit. Cras accumsan varius nisl, a commodo ligula consequat nec. Aliquam tincidunt diam id placerat rutrum.",
   "Integer a molestie tortor. Duis pretium urna eget congue porta. Fusce aliquet dolor quis viverra volutpat.",
@@ -726,13 +727,18 @@ def seed_quantity(item_name, organization, storage_location, quantity)
     comment: comments.sample,
     organization_id: pdx_org.id,
     storage_location_id: storage_location.id,
-    amount_spent_in_cents: rand(200..10_000),
     issued_at: purchase_date,
     created_at: purchase_date,
     updated_at: purchase_date,
-    vendor_id: vendor.id
+    vendor_id: vendor.id,
+    amount_spent_on_period_supplies_cents: rand(0..5_000),
+    amount_spent_on_diapers_cents: rand(0..5_000),
+    amount_spent_on_adult_incontinence_cents: rand(0..5_000),
+    amount_spent_on_other_cents: rand(0..5_000)
   )
 
+  purchase.amount_spent_in_cents = amount_items.map{|i| purchase.send("amount_spent_on_#{i}_cents")}.sum
+
   rand(1..5).times do
     purchase.line_items.push(LineItem.new(quantity: rand(1..1000),
                                           item_id: pdx_org.item_ids.sample))

spec/requests/reports/purchases_summary_requests_spec.rb

@@ -10,6 +10,10 @@
     describe "GET #index" do
       it "shows a list of recent purchases" do
         get reports_purchases_summary_path
+        expect(response.body).to include("Total spent on diapers")
+        expect(response.body).to include("Total spent on adult incontinence")
+        expect(response.body).to include("Total spent on other")
+        expect(response.body).to include("Total items")
         expect(response.body).to include("Recent purchases")
       end
     end