Allow a hard limit on number of specific items per request

app/controllers/items_controller.rb

@@ -177,12 +177,17 @@ def item_params
       :distribution_quantity,
       :visible_to_partners,
       :active,
-      :additional_info
+      :additional_info,
+      :unit_request_limit
     )
   end
 
   def request_unit_ids
-    params.require(:item).permit(request_unit_ids: []).fetch(:request_unit_ids, [])
+    params.require(:item).permit(unit_ids: []).fetch(:unit_ids, []).compact_blank
+  end
+
+  def request_unit_limits
+    (params.require(:item).permit(unit_limits: {})[:unit_limits] || {}).to_h
   end
 
   # We need to update both the item and the request_units together and fail together
@@ -198,7 +203,7 @@ def update_item_and_request_units
     begin
       Item.transaction do
         @item.save!
-        @item.sync_request_units!(request_unit_ids)
+        @item.sync_request_units!(request_unit_ids, request_unit_limits)
       end
     rescue
       return false

app/controllers/partners/requests_controller.rb

@@ -43,6 +43,7 @@ def create
       else
         @partner_request = create_service.partner_request
         @errors = create_service.errors
+        flash[:error] = @errors.full_messages.join("; ").capitalize + "." if @errors.present?
 
         fetch_items
 
@@ -84,7 +85,7 @@ def fetch_items
         # hash of (item ID => hash of (request unit name => request unit plural name))
         item_ids = @requestable_items.to_h.values
         if item_ids.present?
-          @item_units = Item.where(id: item_ids).to_h do |i|
+          @item_units = Item.where(id: item_ids).includes(:request_units).to_h do |i|
             [i.id, i.request_units.to_h { |u| [u.name, u.name.pluralize] }]
           end
         end

app/models/item.rb

@@ -13,6 +13,7 @@
 #  package_size                 :integer
 #  partner_key                  :string
 #  reporting_category           :string
+#  unit_request_limit           :integer
 #  value_in_cents               :integer          default(0)
 #  visible_to_partners          :boolean          default(TRUE), not null
 #  created_at                   :datetime         not null
@@ -186,10 +187,12 @@ def default_quantity
     distribution_quantity || 50
   end
 
-  def sync_request_units!(unit_ids)
+  def sync_request_units!(unit_ids, limits = {})
     request_units.clear
-    organization.request_units.where(id: unit_ids).pluck(:name).each do |name|
-      request_units.create!(name:)
+    organization.request_units.where(id: unit_ids).find_each do |unit|
+      item_unit = request_units.create!(name: unit.name)
+      limit = limits[unit.id.to_s]
+      item_unit.update!(request_limit: limit.to_i) if limit.present?
     end
   end
 

app/models/item_unit.rb

@@ -2,11 +2,12 @@
 #
 # Table name: item_units
 #
-#  id         :bigint           not null, primary key
-#  name       :string           not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#  item_id    :bigint
+#  id            :bigint           not null, primary key
+#  name          :string           not null
+#  request_limit :integer
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#  item_id       :bigint
 #
 class ItemUnit < ApplicationRecord
   belongs_to :item

app/services/partners/request_create_service.rb

@@ -105,6 +105,23 @@ def populate_item_request(partner_request)
         }.compact
       end
 
+      # Validate if request quantity exceeds the request limit for the item and unit type
+      partner_request.request_items.each do |ir|
+        item = Item.find(ir["item_id"])
+        unit_type = ir["request_unit"]
+        quantity_requested = ir["quantity"].to_i
+
+        limit = if unit_type.blank?
+          item.unit_request_limit
+        else
+          item.request_units.where(name: unit_type)&.first&.request_limit
+        end
+
+        if limit.present? && (quantity_requested > limit)
+          errors.add(:base, "#{item.name}: You requested #{quantity_requested} #{unit_type.pluralize}, but are limited to #{limit} #{unit_type.pluralize}")
+        end
+      end
+
       partner_request
     end
 

app/views/items/_form.html.erb

@@ -44,10 +44,43 @@
                 <%= f.input_field :package_size, class: "form-control", min: 0 %>
               <% end %>
 
+              <%= f.input :name, label: "Request limit (individual items)", wrapper: :input_group do %>
+                <%= f.input_field :unit_request_limit, class: "form-control", min: 0 %>
+              <% end %>
+
               <% if Flipper.enabled?(:enable_packs) %>
                 <%= f.input :request_units, label: "Additional Custom Request Units" do %>
-                  <%= f.association :request_units, as: :check_boxes, collection: current_organization.request_units, checked: selected_item_request_units(@item), label_method: :name, value_method: :id, class: "form-check-input" %>
+                  <% current_organization.request_units.each do |unit| %>
+                    <% item_unit = @item.request_units.find { |item_unit| item_unit.name == unit.name } %>
+                    <% selected = item_unit.present? %>
+
+                    <div class="form-check mb-2">
+                      <%= check_box_tag "item[unit_ids][]", unit.id, selected, id: "unit_#{unit.id}", class: "form-check-input" %>
+                      <%= label_tag "unit_#{unit.id}", unit.name, class: "form-check-label me-2" %>
+
+                      <%= number_field_tag "item[unit_limits][#{unit.id}]",
+                                           item_unit&.request_limit,
+                                           class: "form-control d-inline-block w-auto",
+                                           min: 0,
+                                           placeholder: "Limit",
+                                           disabled: !selected %>
+                    </div>
+                  <% end %>
+
+                  <!-- keep the param key present even if nothing checked -->
+                  <%= hidden_field_tag "item[unit_ids][]", "" %>
                 <% end %>
+
+                <script>
+                    // Optional: toggle limit input enabled state with the checkbox
+                    document.addEventListener("change", (e) => {
+                        if (e.target.matches('input[type="checkbox"][id^="unit_"]')) {
+                            const id = e.target.id.replace("unit_", "");
+                            const limit = document.querySelector(`input[name="item[unit_limits][${id}]"]`);
+                            if (limit) limit.disabled = !e.target.checked;
+                        }
+                    });
+                </script>
               <% end %>
 
               <%= f.input :visible, label: "Item is Visible to Partners?", wrapper: :input_group do %>

app/views/partners/individuals_requests/new.html.erb

@@ -24,29 +24,29 @@
       <div class="col-md-12">
         <!-- Default box -->
         <div class="card"
-          data-controller="confirmation"
-          data-confirmation-pre-check-path-value="<%= validate_partners_individuals_requests_path(format: :json) %>">
+             data-controller="confirmation"
+             data-confirmation-pre-check-path-value="<%= validate_partners_individuals_requests_path(format: :json) %>">
           <div class="card-body">
 
             <% if @errors.present? %>
               <%= render partial: 'partners/requests/error' %>
             <% end %>
 
-            <%= simple_form_for @request, url: partners_individuals_requests_path, html: {role: 'form', class: 'form-horizontal'},
-              data: {controller: 'form-input', confirmation_target: "form"} do |form| %>
+            <%= simple_form_for @request, url: partners_individuals_requests_path, html: { role: 'form', class: 'form-horizontal' },
+                                data: { controller: 'form-input', confirmation_target: "form" } do |form| %>
 
               <%= form.input :comments, label: "Comments:", as: :text, class: "form-control", wrapper: :input_group %>
 
               <table class='table'>
                 <thead>
-                  <tr>
-                    <th>Item Requested</th>
-                    <th>Number of Individuals</th>
-                  </tr>
+                <tr>
+                  <th>Item Requested</th>
+                  <th>Number of Individuals</th>
+                </tr>
                 </thead>
 
                 <tbody class='fields'>
-                  <%= render 'partners/individuals_requests/item_request', form: form %>
+                <%= render 'partners/individuals_requests/item_request', form: form %>
                 </tbody>
               </table>
 
@@ -65,15 +65,16 @@
               </div>
             <% end %>
 
-          <%# Confirmation modal: See confirmation_controller.js for how this gets displayed %>
-          <%# and app/controllers/partners/individuals_requests_controller.rb#validate for how it gets populated. %>
-          <div id="partnerIndividualRequestConfirmationModal"
-            class="modal confirm"
-            aria-labelledby="partnerIndividualRequestConfirmationModal"
-            aria-hidden="true"
-            tabindex="-1"
-            data-bs-backdrop="static"
-            data-confirmation-target="modal">
+            <%# Confirmation modal: See confirmation_controller.js for how this gets displayed %>
+            <%# and app/controllers/partners/individuals_requests_controller.rb#validate for how it gets populated. %>
+            <div id="partnerIndividualRequestConfirmationModal"
+                 class="modal confirm"
+                 aria-labelledby="partnerIndividualRequestConfirmationModal"
+                 aria-hidden="true"
+                 tabindex="-1"
+                 data-bs-backdrop="static"
+                 data-confirmation-target="modal">
+            </div>
           </div>
         </div>
       </div>

app/views/partners/requests/new.html.erb

@@ -27,11 +27,6 @@
           data-controller="confirmation"
           data-confirmation-pre-check-path-value="<%= validate_partners_requests_path(format: :json) %>">
           <div class="card-body">
-
-            <% if @errors.present? %>
-              <%= render partial: 'partners/requests/error' %>
-            <% end %>
-
             <%= simple_form_for @partner_request, url: partners_requests_path(@partner_request),
               html: {role: 'form', class: 'form-horizontal'}, method: :post, data: { controller: 'form-input', confirmation_target: "form" } do |form| %>
               <%= form.input :comments, label: "Comments:", as: :text, class: "form-control", wrapper: :input_group %>

db/migrate/20250912155420_add_request_limit_to_item_unit.rb

@@ -0,0 +1,6 @@
+class AddRequestLimitToItemUnit < ActiveRecord::Migration[8.0]
+  def change
+    add_column :item_units, :request_limit, :integer, default: nil, null: true
+    add_column :items, :unit_request_limit, :integer, default: nil, null: true
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_08_11_094943) do
+ActiveRecord::Schema[8.0].define(version: 2025_09_12_155420) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -387,6 +387,7 @@
     t.bigint "item_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer "request_limit"
     t.index ["item_id"], name: "index_item_units_on_item_id"
   end
 
@@ -408,6 +409,7 @@
     t.integer "item_category_id"
     t.text "additional_info"
     t.string "reporting_category"
+    t.integer "unit_request_limit"
     t.index ["kit_id"], name: "index_items_on_kit_id"
     t.index ["organization_id"], name: "index_items_on_organization_id"
     t.index ["partner_key"], name: "index_items_on_partner_key"

spec/factories/item_units.rb

@@ -2,11 +2,12 @@
 #
 # Table name: item_units
 #
-#  id         :bigint           not null, primary key
-#  name       :string           not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#  item_id    :bigint
+#  id            :bigint           not null, primary key
+#  name          :string           not null
+#  request_limit :integer
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#  item_id       :bigint
 #
 FactoryBot.define do
   factory :item_unit do

spec/factories/items.rb

@@ -13,6 +13,7 @@
 #  package_size                 :integer
 #  partner_key                  :string
 #  reporting_category           :string
+#  unit_request_limit           :integer
 #  value_in_cents               :integer          default(0)
 #  visible_to_partners          :boolean          default(TRUE), not null
 #  created_at                   :datetime         not null

spec/models/item_spec.rb

@@ -13,6 +13,7 @@
 #  package_size                 :integer
 #  partner_key                  :string
 #  reporting_category           :string
+#  unit_request_limit           :integer
 #  value_in_cents               :integer          default(0)
 #  visible_to_partners          :boolean          default(TRUE), not null
 #  created_at                   :datetime         not null

spec/models/item_unit_spec.rb

@@ -2,11 +2,12 @@
 #
 # Table name: item_units
 #
-#  id         :bigint           not null, primary key
-#  name       :string           not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#  item_id    :bigint
+#  id            :bigint           not null, primary key
+#  name          :string           not null
+#  request_limit :integer
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#  item_id       :bigint
 #
 RSpec.describe ItemUnit, type: :model do
   context "Validations >" do