Add date range filtering to ItemsFlowQuery and update Inventory Flow tab

Author: Olexii Kasianenko

app/controllers/storage_locations_controller.rb

@@ -58,9 +58,9 @@ def show
     setup_date_range_picker
     @storage_location = current_organization.storage_locations.find(params[:id])
     version_date = params[:version_date].presence&.to_date
-    @items = ItemsFlowQuery.new(storage_location: @storage_location, organization: current_organization).call.to_a
-    @total_quantity_in = @items.first["total_quantity_in"].to_i
-    @total_quantity_out = @items.first["total_quantity_out"].to_i
+    @items = ItemsFlowQuery.new(storage_location: @storage_location, organization: current_organization, filter_params: date_range).call.to_a
+    @total_quantity_in = @items.count.positive? ? @items.first["total_quantity_in"].to_i : 0
+    @total_quantity_out = @items.count.positive? ? @items.first["total_quantity_out"].to_i : 0
     @total_quantity_change = @total_quantity_in - @total_quantity_out
     if View::Inventory.within_snapshot?(current_organization.id, version_date)
       @inventory = View::Inventory.new(current_organization.id, event_time: version_date)
@@ -163,6 +163,8 @@ def filter_params
   end
 
   def date_range
+    return unless filter_params[:date_range].present?
+
     date_range = filter_params[:date_range].split(" - ")
     start_date = Date.parse(date_range[0])
     end_date = Date.parse(date_range[1])

app/queries/items_flow_query.rb

@@ -54,6 +54,7 @@ def call
         LEFT JOIN adjustments ON adjustments.id = li.itemizable_id AND li.itemizable_type = 'Adjustment'
         LEFT JOIN transfers ON transfers.id = li.itemizable_id AND li.itemizable_type = 'Transfer'
         LEFT JOIN items it ON it.id = li.item_id
+        WHERE it.created_at BETWEEN :start_date AND :end_date
       )
       SELECT
         item_id,
@@ -71,7 +72,12 @@ def call
     SQL
 
     ActiveRecord::Base.connection.exec_query(
-      ActiveRecord::Base.send(:sanitize_sql_array, [query, {id: @storage_location.id, organization_id: @organization.id}])
+      ActiveRecord::Base.send(:sanitize_sql_array, [query, {
+        id: @storage_location.id,
+        organization_id: @organization.id,
+        start_date: @filter_params ? @filter_params[0] : 20.years.ago,
+        end_date: @filter_params ? @filter_params[1] : Time.current.end_of_day
+      }])
     )
   end
 end

app/views/storage_locations/show.html.erb

@@ -68,18 +68,18 @@
         <div class="card card-primary card-outline card-outline-tabs">
           <div class="card-header p-0 border-bottom-0">
             <ul class="nav nav-tabs" id="custom-tabs-three-tab" role="tablist">
-              <li class="nav-item active">
-                <a class="nav-link active" id="custom-tabs-inventory-tab" data-bs-toggle="pill" href="#custom-tabs-inventory" role="tab" aria-controls="custom-tabs-one-home-tab" aria-selected="true">Inventory</a>
+              <li class="nav-item <%= params.dig(:filters, :date_range).nil? ? 'active' : '' %>">
+                <a class="nav-link <%= params.dig(:filters, :date_range).nil? ? 'active' : '' %>" id="custom-tabs-inventory-tab" data-bs-toggle="pill" href="#custom-tabs-inventory" role="tab" aria-controls="custom-tabs-one-home-tab" aria-selected="true">Inventory</a>
               </li>
-              <li class="nav-item">
-                <a class="nav-link" id="custom-tabs-inventory-flow-tab" data-bs-toggle="pill" href="#custom-tabs-inventory-flow" role="tab" aria-controls="custom-tabs-two-home-tab" aria-selected="false">Inventory Flow</a>
+              <li class="nav-item <%= params.dig(:filters, :date_range).present? ? 'active' : '' %>">
+                <a class="nav-link <%= params.dig(:filters, :date_range).present? ? 'active' : '' %>" id="custom-tabs-inventory-flow-tab" data-bs-toggle="pill" href="#custom-tabs-inventory-flow" role="tab" aria-controls="custom-tabs-two-home-tab" aria-selected="false">Inventory Flow</a>
               </li>
             </ul>
           </div>
           <div class="card-body">
             <div class="tab-content" id="custom-tabs-three-tabContent">
 
-              <div class="tab-pane fade show active" id="custom-tabs-inventory" role="tabpanel" aria-labelledby="custom-tabs-one-home-tab">
+              <div class="tab-pane fade  <%= params.dig(:filters, :date_range).nil? ? 'show active' : '' %>" id="custom-tabs-inventory" role="tabpanel" aria-labelledby="custom-tabs-one-home-tab">
                 <%= form_for @storage_location, method: :get do %>
                   Show Inventory at Date: <%= date_field_tag 'version_date', params[:version_date], min: InventoryItem::EARLIEST_VERSION, autocomplete: "on" %>
                   <%= filter_button(text: 'View') %>
@@ -128,7 +128,7 @@
                 </table>
               </div><!-- /.box-body.table-responsive -->
 
-              <div class="tab-pane fade show" id="custom-tabs-inventory-flow" role="tabpanel" aria-labelledby="custom-two-home-tab">
+              <div class="tab-pane fade  <%= params.dig(:filters, :date_range).present? ? 'show active' : '' %>" id="custom-tabs-inventory-flow" role="tabpanel" aria-labelledby="custom-two-home-tab">
                 <%= form_for @storage_location, method: :get do %>
                     <%= label_tag "Date Range" %>
                   <div class="row">

spec/queries/items_flow_query_spec.rb

@@ -46,4 +46,51 @@
       expect(subject.to_a).to match_array(result)
     end
   end
+
+  context "with filter params" do
+    let(:filter_params) { [11.days.ago, 9.days.ago] }
+    let!(:old_items) do
+      [
+        create(:item, organization: organization, created_at: 10.days.ago.beginning_of_day),
+        create(:item, organization: organization, created_at: 10.days.ago.end_of_day)
+      ]
+    end
+    let(:other_location) { create(:storage_location, organization: organization) }
+
+    subject { described_class.new(organization: organization, storage_location: storage_location, filter_params: filter_params).call }
+
+    before do
+      create(:donation, :with_items, item: old_items[0], item_quantity: 10, storage_location: storage_location)
+      create(:distribution, :with_items, item: old_items[1], item_quantity: 5, storage_location: storage_location)
+    end
+
+    let(:filtered_result) do
+      [
+        {
+          item_id: old_items[0].id,
+          item_name: old_items[0].name,
+          quantity_in: 10,
+          quantity_out: 0,
+          change: 10,
+          total_quantity_in: 10,
+          total_quantity_out: 5,
+          total_change: 5
+        },
+        {
+          item_id: old_items[1].id,
+          item_name: old_items[1].name,
+          quantity_in: 0,
+          quantity_out: 5,
+          change: -5,
+          total_quantity_in: 10,
+          total_quantity_out: 5,
+          total_change: 5
+        }
+      ].map(&:with_indifferent_access)
+    end
+
+    it "returns array of hashes" do
+      expect(subject.to_a).to match_array(filtered_result)
+    end
+  end
 end