5002 - Filter by Category Added to Donations And Purchases Page

Author: Naraveni

app/controllers/donations_controller.rb

@@ -23,6 +23,7 @@ def index
                                      .order(created_at: :desc)
                                      .class_filter(filter_params)
                                      .during(helpers.selected_range)
+    @item_categories = current_organization.item_categories.pluck(:name).uniq
     @paginated_donations = @donations.page(params[:page])
 
     @product_drives = current_organization.product_drives.alphabetized
@@ -39,6 +40,7 @@ def index
     @selected_storage_location = filter_params[:at_storage_location]
     @sources = @donations.collect(&:source).uniq.sort
     @selected_source = filter_params[:by_source]
+    @selected_item_category = filter_params[:by_category]
     @donation_sites = @donations.collect(&:donation_site).compact.uniq.sort_by { |site| site.name.downcase }
     @selected_donation_site = filter_params[:from_donation_site]
     @selected_product_drive = filter_params[:by_product_drive]
@@ -155,7 +157,7 @@ def donation_item_params
     def filter_params
     return {} unless params.key?(:filters)
 
-    params.require(:filters).permit(:at_storage_location, :by_source, :from_donation_site, :by_product_drive, :by_product_drive_participant, :from_manufacturer)
+    params.require(:filters).permit(:at_storage_location, :by_source, :from_donation_site, :by_product_drive, :by_product_drive_participant, :from_manufacturer, :by_category)
   end
 
   # Omits donation_site_id or product_drive_participant_id if those aren't selected as source

app/controllers/purchases_controller.rb

@@ -9,6 +9,7 @@ def index
                                      .order(created_at: :desc)
                                      .class_filter(filter_params)
                                      .during(helpers.selected_range)
+    @item_categories = current_organization.item_categories.pluck(:name).uniq
 
     @paginated_purchases = @purchases.page(params[:page])
     # Are these going to be inefficient with large datasets?
@@ -24,6 +25,7 @@ def index
     @paginated_fair_market_values = @paginated_purchases.collect(&:value_per_itemizable).sum
     # Storage and Vendor
     @storage_locations = current_organization.storage_locations.active
+    @selected_item_category = filter_params[:by_category]
     @selected_storage_location = filter_params[:at_storage_location]
     @vendors = current_organization.vendors.sort_by { |vendor| vendor.business_name.downcase }
     @selected_vendor = filter_params[:from_vendor]
@@ -118,7 +120,7 @@ def purchase_params
     def filter_params
     return {} unless params.key?(:filters)
 
-    params.require(:filters).permit(:at_storage_location, :by_source, :from_vendor)
+    params.require(:filters).permit(:at_storage_location, :by_source, :from_vendor, :by_category)
   end
 
   # If line_items have submitted with empty rows, clear those out first.

app/models/donation.rb

@@ -52,6 +52,10 @@ class Donation < ApplicationRecord
     where(manufacturer_id: manufacturer_id)
   }
 
+  scope :by_category, ->(item_category) {
+    joins(line_items: {item: :item_category}).where("item_categories.name ILIKE ?", item_category)
+  }
+
   before_create :combine_duplicates
 
   validates :donation_site, presence:

app/models/purchase.rb

@@ -51,6 +51,10 @@ class Purchase < ApplicationRecord
 
   scope :active, -> { joins(:line_items).joins(:items).where(items: { active: true }) }
 
+  scope :by_category, ->(item_category) {
+    joins(line_items: {item: :item_category}).where("item_categories.name ILIKE ?", item_category)
+  }
+
   before_create :combine_duplicates
 
   validates :amount_spent_in_cents, numericality: { greater_than: 0 }

app/views/donations/index.html.erb

@@ -71,6 +71,15 @@
                     <%= filter_select(label: "Filter by Donation Site", scope: :from_donation_site, collection: @donation_sites, key: :id, value: :name, selected: @selected_donation_site) %>
                   </div>
                 <% end %>
+                <% if @item_categories.present? %>
+                  <div class="form-group col-lg-3 col-md-4 col-sm-6 col-xs-12">
+                    <% id = "filter_#{SecureRandom.uuid}" %>
+                    <%= label_tag id, "Filter by Category" %>
+                    <%= select_tag "filters[by_category]",
+                    options_for_select(@item_categories, @selected_item_category),
+                    { include_blank: true, class: "form-control", id: id } %>
+                  </div>
+                <% end %>
                 <div class="form-group col-lg-3 col-md-4 col-sm-6 col-xs-12">
                   <%= label_tag "Date Range" %>
                   <%= render partial: "shared/date_range_picker", locals: {css_class: "form-control"} %>

app/views/purchases/index.html.erb

@@ -46,6 +46,15 @@
                     <%= filter_select(label: "Filter by vendor", scope: :from_vendor, collection: @vendors, value: :business_name, selected: @selected_vendor) %>
                   </div>
                 <% end %>
+                <% if @item_categories.present? %>
+                  <div class="form-group col-lg-3 col-md-4 col-sm-6 col-xs-12">
+                    <% id = "filter_#{SecureRandom.uuid}" %>
+                    <%= label_tag id, "Filter by Category" %>
+                    <%= select_tag "filters[by_category]",
+                    options_for_select(@item_categories, @selected_item_category),
+                    { include_blank: true, class: "form-control", id: id } %>
+                  </div>
+                <% end %>
                 <div class="form-group col-lg-4 col-md-4 col-sm-6 col-xs-12">
                   <%= label_tag "Purchase Date Range" %>
                   <%= render partial: "shared/date_range_picker", locals: {css_class: "form-control"} %>

spec/system/donation_system_spec.rb

@@ -135,6 +135,20 @@
         expect(page).to have_css("table tbody tr", count: 1)
       end
 
+      it "Filters by category" do
+        category_1 = create(:item_category, name: "Category 1", organization: organization)
+        category_2 = create(:item_category, name: "Category 2", organization: organization)
+        item_1 = create(:item, item_category: category_1, name: "Item 1", value_in_cents: 100)
+        item_2 = create(:item, item_category: category_2, name: "Item 2", value_in_cents: 200)
+        create(:donation, :with_items, item_quantity: 25, item: item_1)
+        create(:donation, :with_items, item_quantity: 30, item: item_2)
+        visit subject
+        expect(page).to have_css("table tbody tr", count: 2)
+        select organization.item_categories.first.name, from: "filters[by_category]"
+        click_button "Filter"
+        expect(page).to have_css("table tbody tr", count: 1)
+      end
+
       it_behaves_like "Date Range Picker", Donation, "issued_at"
 
       it "Filters by multiple attributes" do

spec/system/purchase_system_spec.rb

@@ -80,6 +80,20 @@
           expect(page).to have_css("table tbody tr", count: 1)
         end
 
+        it "Filters by category" do
+          category_1 = create(:item_category, name: "Category 1", organization: organization)
+          category_2 = create(:item_category, name: "Category 2", organization: organization)
+          item_1 = create(:item, item_category: category_1, name: "Item 1", value_in_cents: 100)
+          item_2 = create(:item, item_category: category_2, name: "Item 2", value_in_cents: 200)
+          create(:purchase, :with_items, item_quantity: 25, item: item_1)
+          create(:purchase, :with_items, item_quantity: 30, item: item_2)
+          visit subject
+          expect(page).to have_css("table tbody tr", count: 2)
+          select organization.item_categories.first.name, from: "filters[by_category]"
+          click_button "Filter"
+          expect(page).to have_css("table tbody tr", count: 1)
+        end
+
         it_behaves_like "Date Range Picker", Purchase, :issued_at
       end
     end