4175 add request type flag

app/controllers/partners/family_requests_controller.rb

@@ -31,6 +31,7 @@ def create
       end
 
       create_service = Partners::FamilyRequestCreateService.new(
+        request_type: params[:request_type],
         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: params[:request_type],
         partner_user_id: current_user.id,
         comments: individuals_request_params[:comments],
         family_requests_attributes: individuals_request_params[:items_attributes]&.values
@@ -36,7 +37,7 @@ def create
 
     def individuals_request_params
       params.require(:partners_family_request)
-            .permit(:comments, items_attributes: %i[item_id person_count])
+            .permit(:request_type, :comments, items_attributes: %i[item_id person_count])
     end
   end
 end

app/controllers/partners/requests_controller.rb

@@ -20,6 +20,7 @@ def show
 
     def create
       create_service = Partners::RequestCreateService.new(
+        request_type: params[:request_type],
         partner_user_id: current_user.id,
         comments: partner_request_params[:comments],
         item_requests_attributes: partner_request_params[:item_requests_attributes]&.values || []
@@ -45,7 +46,7 @@ def create
     private
 
     def partner_request_params
-      params.require(:request).permit(:comments, item_requests_attributes: [:item_id, :quantity])
+      params.require(:request).permit(:request_type, :comments, item_requests_attributes: [:item_id, :quantity])
     end
   end
 end

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    :integer
 #  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: { quantity: 0, individual: 1, child: 2 }, _prefix: true
 
   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/family_request_create_service.rb

@@ -8,7 +8,8 @@ class FamilyRequestCreateService
 
     attr_reader :partner_user_id, :comments, :family_requests_attributes, :partner_request
 
-    def initialize(partner_user_id:, family_requests_attributes:, comments: nil, for_families: false)
+    def initialize(request_type:, partner_user_id:, family_requests_attributes:, comments: nil, for_families: false)
+      @request_type = request_type
       @partner_user_id = partner_user_id
       @comments = comments
       @family_requests_attributes = family_requests_attributes.presence || []
@@ -19,6 +20,7 @@ def call
       return self unless valid?
 
       request_create_svc = Partners::RequestCreateService.new(
+        request_type: @request_type.to_i,
         partner_user_id: partner_user_id,
         comments: comments,
         for_families: @for_families,

app/services/partners/request_create_service.rb

@@ -4,7 +4,8 @@ class RequestCreateService
 
     attr_reader :partner_request
 
-    def initialize(partner_user_id:, comments: nil, for_families: false, item_requests_attributes: [], additional_attrs: {})
+    def initialize(request_type:, partner_user_id:, comments: nil, for_families: false, item_requests_attributes: [], additional_attrs: {})
+      @request_type = request_type
       @partner_user_id = partner_user_id
       @comments = comments
       @for_families = for_families
@@ -13,7 +14,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.to_i,
+        partner_id: partner.id,
         organization_id: organization_id,
         comments: comments,
         partner_user_id: partner_user_id)

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

@@ -82,6 +82,7 @@
             <hr>
 
             <div class="card-footer">
+              <%= hidden_field_tag :request_type, 2 %>
               <%= submit_tag("Submit Essentials Request", class: "btn btn-success") %>
               <%= link_to "Cancel Request", partners_requests_path, class: "btn btn-danger" %>
             </div>

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

@@ -57,6 +57,7 @@
               <hr>
 
               <div class="card-footer">
+                <%= hidden_field_tag :request_type, 1 %>
                 <!-- TODO(chaserx): we should add some js to prevent submission if the items selected are the blank option or any item has an empty quantity -->
                 <%= form.submit("Submit Essentials Request", class: "btn btn-success") %>
                 <%= link_to "Cancel Request", partners_requests_path, class: "btn btn-danger" %>

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

@@ -55,6 +55,7 @@
 
           </div>
               <div class="card-footer">
+                <%= hidden_field_tag :request_type, 0 %>
                 <!-- TODO(chaserx): we should add some js to prevent submission if the items selected are the blank option or any item has an empty quantity -->
                 <%= form.submit("Submit Essentials Request", class: "btn btn-success") %> <%= link_to "Cancel Request", partners_requests_path, class: "btn btn-danger" %>
               </div>

app/views/requests/_request_row.html.erb

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

app/views/requests/_request_type.html.erb

@@ -0,0 +1,8 @@
+<% case request_type %>
+<% when "quantity" %>
+    <div>Quantity<div>
+<% when "individual" %>
+    <div>Individual<div>
+<% when "child" %>
+    <div>Child</div>
+<% end %>

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><%= render partial: "request_type", locals: {request_type: @request.request_type} %></td>
                 <td><%= render partial: "status", locals: {status: @request.status} %></td>
                 <td><%= @request.comments || 'None' %></td>
               </tr>

config/database.yml

@@ -1,7 +1,8 @@
 default: &default
   adapter: postgresql
   encoding: unicode
-  host: <%= ENV.fetch("PG_HOST", 'localhost') %>
+  host: <%= ENV['DB_HOST'] || 'localhost' %>
+
   database: diaper_dev
   username: <%= ENV.fetch("PG_USERNAME", 'postgres') %>
   password: <%= ENV.fetch("PG_PASSWORD", nil) %>

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, :integer
+  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[7.0].define(version: 2024_04_02_230156) do
+ActiveRecord::Schema[7.0].define(version: 2024_03_15_190152) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -735,6 +735,7 @@
     t.datetime "discarded_at", precision: nil
     t.text "discard_reason"
     t.integer "partner_user_id"
+    t.integer "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"

spec/factories/requests.rb

@@ -7,6 +7,7 @@
 #  discard_reason  :text
 #  discarded_at    :datetime
 #  request_items   :jsonb
+#  request_type    :integer
 #  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    :integer
 #  status          :integer          default("pending")
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
@@ -23,12 +24,27 @@
       let!(:request_started) { create(:request, :started) }
       let!(:request_fulfilled) { create(:request, :fulfilled) }
 
-      it "scopes" do
+      it "scopes by status" do
         expect(Request.status_pending).to eq([request_pending])
         expect(Request.status_started).to eq([request_started])
         expect(Request.status_fulfilled).to eq([request_fulfilled])
       end
     end
+
+    describe "#request_type" do
+      it "scopes by request_type" do
+        request = Request.new
+
+        request.request_type = :quantity
+        assert_equal "quantity", request.request_type
+
+        request.request_type = :individual
+        assert_equal "individual", request.request_type
+
+        request.request_type = :child
+        assert_equal "child", request.request_type
+      end
+    end
   end
 
   describe "item data" do

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

spec/services/partners/family_request_create_service_spec.rb

@@ -5,6 +5,7 @@
     subject { described_class.new(**args).call }
     let(:args) do
       {
+        request_type: 0,
         partner_user_id: partner_user.id,
         comments: comments,
         for_families: for_families,
@@ -108,7 +109,7 @@
         let(:fake_request_create_service) { instance_double(Partners::RequestCreateService, call: -> {}, errors: [], partner_request: -> {}) }
 
         before do
-          allow(Partners::RequestCreateService).to receive(:new).with(partner_user_id: partner_user.id, comments: comments, for_families: false, item_requests_attributes: contain_exactly(*expected_item_request_attributes)).and_return(fake_request_create_service)
+          allow(Partners::RequestCreateService).to receive(:new).with(request_type: 0, partner_user_id: partner_user.id, comments: comments, for_families: false, item_requests_attributes: contain_exactly(*expected_item_request_attributes)).and_return(fake_request_create_service)
         end
 
         it 'should send the correct request payload to the Partners::RequestCreateService and call it' do

spec/services/partners/request_create_service_spec.rb

@@ -5,6 +5,7 @@
     subject { described_class.new(**args).call }
     let(:args) do
       {
+        request_type: 0,
         partner_user_id: partner_user.id,
         comments: comments,
         item_requests_attributes: item_requests_attributes