4175 add request type flag

app/controllers/partners/family_requests_controller.rb

@@ -30,7 +30,7 @@ def create
         { item_id: item_id, person_count: item_requested_children.size, children: item_requested_children }
       end
       create_service = Partners::FamilyRequestCreateService.new(
-        request_type: 2,
+        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,7 +10,7 @@ def new
 
     def create
       create_service = Partners::FamilyRequestCreateService.new(
-        request_type: 1,
+        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,7 +20,7 @@ def show
 
     def create
       create_service = Partners::RequestCreateService.new(
-        request_type: 0,
+        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/models/request.rb

@@ -7,7 +7,7 @@
 #  discard_reason  :text
 #  discarded_at    :datetime
 #  request_items   :jsonb
-#  request_type    :integer
+#  request_type    :string
 #  status          :integer          default("pending")
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
@@ -32,7 +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
+  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

app/services/partners/family_request_create_service.rb

@@ -8,8 +8,7 @@ class FamilyRequestCreateService
 
     attr_reader :partner_user_id, :comments, :family_requests_attributes, :partner_request
 
-    def initialize(request_type:, partner_user_id:, family_requests_attributes:, comments: nil, for_families: false)
-      @request_type = request_type
+    def initialize(partner_user_id:, family_requests_attributes:, comments: nil, for_families: false)
       @partner_user_id = partner_user_id
       @comments = comments
       @family_requests_attributes = family_requests_attributes.presence || []
@@ -20,7 +19,6 @@ 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,8 +4,7 @@ class RequestCreateService
 
     attr_reader :partner_request
 
-    def initialize(request_type:, partner_user_id:, comments: nil, for_families: false, item_requests_attributes: [], additional_attrs: {})
-      @request_type = request_type
+    def initialize(partner_user_id:, comments: nil, for_families: false, item_requests_attributes: [], additional_attrs: {})
       @partner_user_id = partner_user_id
       @comments = comments
       @for_families = for_families
@@ -15,7 +14,7 @@ def initialize(request_type:, partner_user_id:, comments: nil, for_families: fal
 
     def call
       @partner_request = ::Request.new(
-        request_type: @request_type.to_i,
+        request_type: request_type,
         partner_id: partner.id,
         organization_id: organization_id,
         comments: comments,
@@ -103,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/requests/_request_row.html.erb

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

app/views/requests/show.html.erb

@@ -46,7 +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><%= @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

@@ -1,5 +1,5 @@
 class AddTypeToRequests < ActiveRecord::Migration[7.0]
   def change
-    add_column :requests, :request_type, :integer
+    add_column :requests, :request_type, :string
   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_03_15_190152) do
+ActiveRecord::Schema[7.0].define(version: 2024_04_19_225137) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -737,7 +737,7 @@
     t.datetime "discarded_at", precision: nil
     t.text "discard_reason"
     t.integer "partner_user_id"
-    t.integer "request_type"
+    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"
@@ -849,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,7 +7,7 @@
 #  discard_reason  :text
 #  discarded_at    :datetime
 #  request_items   :jsonb
-#  request_type    :integer
+#  request_type    :string
 #  status          :integer          default("pending")
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null

spec/models/request_spec.rb

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

spec/services/partners/family_request_create_service_spec.rb

@@ -5,7 +5,6 @@
     subject { described_class.new(**args).call }
     let(:args) do
       {
-        request_type: 0,
         partner_user_id: partner_user.id,
         comments: comments,
         for_families: for_families,
@@ -112,7 +111,7 @@
         let(:fake_request_create_service) { instance_double(Partners::RequestCreateService, call: -> {}, errors: [], partner_request: -> {}) }
 
         before do
-          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)
+          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)
         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,7 +5,6 @@
     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