View object in place.

Author: cielf

Gemfile.lock

@@ -858,4 +858,4 @@ DEPENDENCIES
   webmock (~> 3.26)
 
 BUNDLED WITH
-  4.0.10
+  4.0.11

app/controllers/distributions_by_county_controller.rb

@@ -2,32 +2,10 @@ class DistributionsByCountyController < ApplicationController
   include DateRangeHelper
   include DistributionHelper
 
-  helper_method :filter_params
-
   def report
     setup_date_range_picker
-    start_date = helpers.selected_range.first.utc.iso8601
-    end_date = helpers.selected_range.last.utc.iso8601
-
-    @reporting_categories = Item.reporting_categories_for_select
-    @items = current_organization.items.loose.alphabetized.select(:id, :name)
-    @selected_reporting_category = filter_params[:by_reporting_category].presence
-    @selected_item = filter_params[:by_item_id].presence
-
-    @breakdown = DistributionSummaryByCountyQuery.call(
-      organization_id: current_organization.id,
-      start_date: start_date,
-      end_date: end_date,
-      reporting_category: @selected_reporting_category,
-      item_id: @selected_item
-    )
-  end
-
-  def filter_params
-    return {} unless params.key?(:filters)
 
-    params
-      .require(:filters)
-      .permit(:by_item_id, :by_reporting_category, :date_range)
+    @dbc_info = View::DistributionsByCounty.from_params(params: params,
+      organization: current_organization, helpers: helpers)
   end
 end

app/models/view/distributions_by_county.rb

@@ -0,0 +1,46 @@
+module View
+  DistributionsByCounty = Data.define(
+    :breakdown,
+    :filters,
+    :items,
+    :reporting_categories
+  ) do
+    include DateRangeHelper
+
+    class << self
+      def filter_params(params)
+        return {} unless params.key?(:filters)
+        params
+          .require(:filters)
+          .permit(:by_item_id, :by_reporting_category, :date_range)
+      end
+
+      def from_params(params:, organization:, helpers:)
+        filters = filter_params(params)
+        start_date = helpers.selected_range.first.utc.iso8601
+        end_date = helpers.selected_range.last.utc.iso8601
+        breakdown = DistributionSummaryByCountyQuery.call(
+          organization_id: organization.id,
+          start_date: start_date,
+          end_date: end_date,
+          reporting_category: filters[:by_reporting_category].presence,
+          item_id: filters[:by_item_id].presence
+        )
+
+        new(
+          breakdown: breakdown,
+          filters: filters,
+          reporting_categories: Item.reporting_categories_for_select,
+          items: organization.items.loose.alphabetized.select(:id, :name)
+        )
+      end
+    end
+    def selected_reporting_category
+      filters[:by_reporting_category].presence
+    end
+
+    def selected_item
+      filters[:by_item_id].presence
+    end
+  end
+end

app/views/distributions_by_county/report.html.erb

@@ -33,13 +33,13 @@
               <div class="description-block border-right">
                 <%= form_tag(distributions_by_county_report_path(current_organization), method: :get) do |f| %>
                   <div class="row">
-                  <% if @items.present? %>
+                  <% if @dbc_info.items.present? %>
                     <div class="form-group col-lg-2 col-md-2 col-sm-6 col-xs-12">
-                      <%= filter_select(label: "Item", scope: :by_item_id, collection: @items, selected: @selected_item) %>
+                      <%= filter_select(label: "Item", scope: :by_item_id, collection: @dbc_info.items, selected: @dbc_info.selected_item) %>
                     </div>
                   <% end %>
                   <div class="form-group col-lg-2 col-md-2 col-sm-6 col-xs-12">
-                    <%= filter_select(label: "Reporting Category", scope: :by_reporting_category, collection: @reporting_categories, selected: @selected_reporting_category) %>
+                    <%= filter_select(label: "Reporting Category", scope: :by_reporting_category, collection: @dbc_info.reporting_categories, selected: @dbc_info.selected_reporting_category) %>
                   </div>
 
                  <div class="form-group col-lg-3 col-md-3 col-sm-6 col-xs-12">
@@ -66,7 +66,7 @@
               </tr>
               </thead>
               <tbody>
-              <% @breakdown.each do |bd| %>
+              <% @dbc_info.breakdown.each do |bd| %>
                 <tr>
                   <td><%= bd.name %></td>
                   <td class="numeric"><%= number_with_delimiter(bd.quantity) %></td>