Product totals - custom units

app/services/requests_total_items_service.rb

@@ -6,39 +6,29 @@ def initialize(requests:)
   def calculate
     return unless requests
 
-    request_items_array = []
-
-    request_items.each do |items|
-      items.each do |json|
-        request_items_array << [item_name(json['item_id']), json['quantity']]
-      end
+    totals = {}
+    item_requests.each do |item_request|
+      name = item_name(item_request)
+      totals[name] ||= 0
+      totals[name] += item_request.quantity.to_i
     end
 
-    request_items_array.inject({}) do |item, (quantity, total)|
-      item[quantity] ||= 0
-      item[quantity] += total.to_i
-      item
-    end
+    totals
   end
 
   private
 
   attr_accessor :requests
 
-  def request_items
-    @request_items ||= requests.pluck(:request_items)
-  end
-
-  def request_items_ids
-    request_items.flat_map { |jitem| jitem.map { |item| item["item_id"] } }
+  def item_requests
+    @item_requests ||= requests.flat_map(&:item_requests)
   end
 
-  def items_names
-    @items_names ||= Item.where(id: request_items_ids).as_json(only: [:id, :name])
-  end
-
-  def item_name(id)
-    item_found = items_names.find { |item| item["id"] == id }
-    item_found&.fetch('name') || '*Unknown Item*'
+  def item_name(item_request)
+    if Flipper.enabled?(:enable_packs) && item_request.request_unit
+      "#{item_request.name} - #{item_request.request_unit}"
+    else
+      item_request.name
+    end
   end
 end

app/views/requests/_calculate_product_totals.html.erb

@@ -16,7 +16,7 @@
           </tr>
           </thead>
           <tbody>
-            <% @calculate_product_totals.sort_by { |name, quantity| -quantity}.each do |name, quantity| %>
+            <% @calculate_product_totals.sort_by { |name, quantity| name }.each do |name, quantity| %>
               <tr>
                 <td><%= name %></td>
                 <td><%= quantity %></td>

spec/services/requests_total_items_service_spec.rb

@@ -9,8 +9,8 @@
       let(:item_ids) { sample_items.pluck(:id) }
       let(:requests) do
         [
-          create(:request, request_items: item_ids.map { |k| { "item_id" => k, "quantity" => 20 } }),
-          create(:request, request_items: item_ids.map { |k| { "item_id" => k, "quantity" => 10 } })
+          create(:request, :with_item_requests, request_items: item_ids.map { |k| { "item_id" => k, "quantity" => 20 } }),
+          create(:request, :with_item_requests, request_items: item_ids.map { |k| { "item_id" => k, "quantity" => 10 } })
         ]
       end
 
@@ -23,23 +23,8 @@
       end
     end
 
-    context 'when item name is nil' do
-      let(:item) do
-        i = build(:item, name: nil)
-        i.save(validate: false)
-        i
-      end
-      let(:requests) do
-        [create(:request, request_items: [{ "item_id" => item.id, "quantity" => 20 }])]
-      end
-
-      it 'return Unknown Item' do
-        expect(subject.first.first).to eq('*Unknown Item*')
-      end
-    end
-
     context 'when provided with requests that have no request items' do
-      let(:requests) { [create(:request, request_items: {})] }
+      let(:requests) { [create(:request, :with_item_requests, request_items: {})] }
 
       it { is_expected.to be_blank }
     end