4175 add request type flag

app/controllers/partners/family_requests_controller.rb

@@ -29,8 +29,8 @@ def create
       family_requests_attributes = children_grouped_by_item_id.map do |item_id, item_requested_children|
         { item_id: item_id, person_count: item_requested_children.size, children: item_requested_children }
       end
-
       create_service = Partners::FamilyRequestCreateService.new(
+        request_type: "child",
         partner_user_id: current_user.id,
         family_requests_attributes: family_requests_attributes,
         for_families: true

app/controllers/partners/individuals_requests_controller.rb

@@ -10,6 +10,7 @@ def new
 
     def create
       create_service = Partners::FamilyRequestCreateService.new(
+        request_type: "individual",
         partner_user_id: current_user.id,
         comments: individuals_request_params[:comments],
         family_requests_attributes: individuals_request_params[:items_attributes]&.values

app/controllers/partners/requests_controller.rb

@@ -20,6 +20,7 @@ def show
 
     def create
       create_service = Partners::RequestCreateService.new(
+        request_type: "quantity",
         partner_user_id: current_user.id,
         comments: partner_request_params[:comments],
         item_requests_attributes: partner_request_params[:item_requests_attributes]&.values || []

app/controllers/requests_controller.rb

@@ -13,10 +13,12 @@ def index
     @calculate_product_totals = RequestsTotalItemsService.new(requests: @requests).calculate
     @items = current_organization.items.alphabetized
     @partners = current_organization.partners.order(:name)
-    @statuses = Request.statuses.transform_keys(&:humanize)
+    @selected_partner = filter_params[:by_partner]
     @partner_users = User.where(id: @paginated_requests.pluck(:partner_user_id))
+    @request_types = Request.request_types.transform_keys(&:humanize)
+    @selected_request_type = filter_params[:by_request_type]
     @selected_request_item = filter_params[:by_request_item_id]
-    @selected_partner = filter_params[:by_partner]
+    @statuses = Request.statuses.transform_keys(&:humanize)
     @selected_status = filter_params[:by_status]
 
     respond_to do |format|
@@ -57,6 +59,6 @@ def load_items
     def filter_params
     return {} unless params.key?(:filters)
 
-    params.require(:filters).permit(:by_request_item_id, :by_partner, :by_status)
+    params.require(:filters).permit(:by_request_item_id, :by_partner, :by_status, :by_request_type)
   end
 end

app/models/request.rb

@@ -7,6 +7,7 @@
 #  discard_reason  :text
 #  discarded_at    :datetime
 #  request_items   :jsonb
+#  request_type    :string
 #  status          :integer          default("pending")
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
@@ -31,6 +32,7 @@ class Request < ApplicationRecord
   has_many :child_item_requests, through: :item_requests
 
   enum status: { pending: 0, started: 1, fulfilled: 2, discarded: 3 }, _prefix: true
+  enum request_type: %w[quantity individual child].map { |v| [v, v] }.to_h
 
   validates :distribution_id, uniqueness: true, allow_nil: true
   before_save :sanitize_items_data
@@ -42,6 +44,7 @@ class Request < ApplicationRecord
   scope :by_partner, ->(partner_id) { where(partner_id: partner_id) }
   # status scope to allow filtering by status
   scope :by_status, ->(status) { where(status: status) }
+  scope :by_request_type, ->(request_type) { where(request_type: request_type) }
   scope :during, ->(range) { where(created_at: range) }
   scope :for_csv_export, ->(organization, *) {
     where(organization: organization)

app/services/exports/export_request_service.rb

@@ -46,6 +46,9 @@ def base_table
         "Requestor" => ->(request) {
           request.partner.name
         },
+        "Type" => ->(request) {
+          request.request_type&.humanize
+        },
         "Status" => ->(request) {
           request.status.humanize
         }

app/services/partners/request_create_service.rb

@@ -13,7 +13,9 @@ def initialize(partner_user_id:, comments: nil, for_families: false, item_reques
     end
 
     def call
-      @partner_request = ::Request.new(partner_id: partner.id,
+      @partner_request = ::Request.new(
+        request_type: request_type,
+        partner_id: partner.id,
         organization_id: organization_id,
         comments: comments,
         partner_user_id: partner_user_id)
@@ -100,5 +102,9 @@ def organization_id
     def partner
       @partner ||= ::User.find(partner_user_id).partner
     end
+
+    def request_type 
+      @for_families ? "child" : "individual"
+    end
   end
 end

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

@@ -81,7 +81,7 @@
             <hr>
 
             <div class="card-footer">
-              <%= submit_tag("Submit Essentials Request", class: "btn btn-success") %>
+              <%= submit_tag("Submit Essentials Request", class: "btn btn-primary") %>
               <%= link_to "Cancel Request", partners_requests_path, class: "btn btn-danger" %>
             </div>
           <% end %>

app/views/requests/_request_row.html.erb

@@ -12,6 +12,9 @@
   <td>
     <%= request_row.comments %>
   </td>
+  <td>
+    <%= request_row&.request_type&.first&.capitalize %>
+  </td>
   <td>
     <%= render partial: "status", locals: {status: request_row.status} %>
   </td>

app/views/requests/index.html.erb

@@ -47,6 +47,9 @@
                     <%= filter_select(scope: :by_partner, collection: @partners, selected: @selected_partner) %>
                   </div>
                 <% end %>
+                <div class="form-group col-lg-3 col-md-3 col-sm-6 col-xs-12">
+                  <%= filter_select(scope: :by_request_type, collection: @request_types, key: :last, value: :first, selected: @selected_request_type) %>
+                </div>
                 <div class="form-group col-lg-3 col-md-3 col-sm-6 col-xs-12">
                   <%= filter_select(scope: :by_status, collection: @statuses, key: :last, value: :first, selected: @selected_status) %>
                 </div>
@@ -92,6 +95,7 @@
                 <th>Request Sender</th>
                 <th># of Items (Request Limit)</th>
                 <th>Comments</th>
+                <th>Type</th>
                 <th>Status</th>
                 <th class="text-right">Actions</th>
               </tr>

app/views/requests/show.html.erb

@@ -37,6 +37,7 @@
                 <tr>
                 <th>Request was sent by:</th>
                 <th>Request Sender:</th>
+                <th>Request Type:</th>
                 <th>Request Status:</th>
                 <th>Comments:</th>
               </tr>
@@ -45,6 +46,7 @@
               <tr>
                 <td><%= @request.partner.name %></td>
                 <td><%= @request.partner_user&.formatted_email %></td>
+                <td><%= @request.request_type&.first&.capitalize %></td>
                 <td><%= render partial: "status", locals: {status: @request.status} %></td>
                 <td><%= @request.comments || 'None' %></td>
               </tr>

db/migrate/20240315190152_add_type_to_requests.rb

@@ -0,0 +1,5 @@
+class AddTypeToRequests < ActiveRecord::Migration[7.0]
+  def change
+    add_column :requests, :request_type, :string
+  end
+end

db/schema.rb

@@ -737,6 +737,7 @@
     t.datetime "discarded_at", precision: nil
     t.text "discard_reason"
     t.integer "partner_user_id"
+    t.string "request_type"
     t.index ["discarded_at"], name: "index_requests_on_discarded_at"
     t.index ["distribution_id"], name: "index_requests_on_distribution_id", unique: true
     t.index ["organization_id"], name: "index_requests_on_organization_id"
@@ -848,7 +849,8 @@
   end
 
   create_table "versions", force: :cascade do |t|
-    t.string "item_type", null: false
+    t.string "item_type"
+    t.string "{:null=>false}"
     t.bigint "item_id", null: false
     t.string "event", null: false
     t.string "whodunnit"

spec/factories/requests.rb

@@ -7,6 +7,7 @@
 #  discard_reason  :text
 #  discarded_at    :datetime
 #  request_items   :jsonb
+#  request_type    :string
 #  status          :integer          default("pending")
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
@@ -42,6 +43,18 @@ def random_request_items
     status { 'pending' }
   end
 
+  trait :quantity do
+    request_type { 'quantity' }
+  end
+
+  trait :individual do
+    request_type { 'individual' }
+  end
+
+  trait :child do
+    request_type { 'child' }
+  end
+
   trait :with_duplicates do
     request_items {
       # get 3 unique item ids

spec/models/request_spec.rb

@@ -7,6 +7,7 @@
 #  discard_reason  :text
 #  discarded_at    :datetime
 #  request_items   :jsonb
+#  request_type    :string
 #  status          :integer          default("pending")
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null

spec/services/exports/export_request_service_spec.rb

@@ -56,7 +56,7 @@
     let(:expected_headers) do
       expected_headers_item_headers = [item_2t, item_3t].map(&:name).sort
       expected_headers_item_headers << Exports::ExportRequestService::DELETED_ITEMS_COLUMN_HEADER
-      %w(Date Requestor Status) + expected_headers_item_headers
+      %w(Date Requestor Type Status) + expected_headers_item_headers
     end
 
     it "includes headers as the first row with ordered item names alphabetically with deleted item included at the end" do