Factor out item request name and qty/units helper

Author: awwaiid

app/models/partners/item_request.rb

@@ -36,11 +36,24 @@ def request_unit_is_supported
       end
     end
 
+    # Usually the item_name, but fall back to our local copy
+    def item_name
+      item&.name || name
+    end
+
+    def quantity_with_units
+      if Flipper.enabled?(:enable_packs) && request_unit.present?
+        "#{quantity} #{request_unit.pluralize(quantity.to_i)}"
+      else
+        quantity
+      end
+    end
+
     def name_with_unit(quantity_override = nil)
       if Flipper.enabled?(:enable_packs) && request_unit.present?
-        "#{item&.name || name} - #{request_unit.pluralize(quantity_override || quantity.to_i)}"
+        "#{item_name} - #{request_unit.pluralize(quantity_override || quantity.to_i)}"
       else
-        item&.name || name
+        item_name
       end
     end
   end

app/views/requests/show.html.erb

@@ -79,7 +79,7 @@
               <tbody>
               <% @item_requests.each do |item_request| %>
                 <tr>
-                  <td><%= item_request.item&.name || item_request.name %></td>
+                  <td><%= item_request.item_name %></td>
                   <td><%= item_request.quantity %></td>
                   <% if @custom_units %>
                     <td><%= item_request.request_unit&.pluralize(item_request.quantity.to_i) %></td>

app/views/requests_confirmation_mailer/confirmation_email.html.erb

@@ -3,13 +3,7 @@
 <p>This email confirms that <%= @organization.name %> has received a request<%= " submitted by #{@requester_user_name}" if @requester_user_name.present? %> for:</p>
 <ul>
   <% @item_requests.each do |item_request| %>
-    <li><%= item_request.item&.name || item_request.name %> -
-    <% if Flipper.enabled?(:enable_packs) && item_request.request_unit.present? %>
-    <%= pluralize(item_request.quantity.to_i, item_request.request_unit) %>
-    <% else %>
-    <%= item_request.quantity %>
-    <% end %>
-    </li>
+    <li><%= item_request.item_name %> - <%= item_request.quantity_with_units %></li>
   <% end %>
 </ul>
 

app/views/requests_confirmation_mailer/confirmation_email.text.erb

@@ -2,7 +2,7 @@ Hello <%= @partner.name %>,
 
 This email confirms that <%= @organization.name %> has received a request<%= " submitted by #{@requester_user_name}" if @requester_user_name.present? %> for:
 <% @item_requests.each do |item_request| %>
-  <%= item_request.item&.name || item_request.name %> - <%= item_request.quantity %>
+  <%= item_request.item_name %> - <%= item_request.quantity_with_units %>
 <% end %>
 
 You will receive a notification when a distribution has been created of the pick-up time and date.