4175 add request type flag

app/controllers/partners/family_requests_controller.rb

@@ -29,9 +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: params[:request_type],
+        request_type: 2,
         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: params[:request_type],
+        request_type: 1,
         partner_user_id: current_user.id,
         comments: individuals_request_params[:comments],
         family_requests_attributes: individuals_request_params[:items_attributes]&.values
@@ -37,7 +37,7 @@ def create
 
     def individuals_request_params
       params.require(:partners_family_request)
-            .permit(:request_type, :comments, items_attributes: %i[item_id person_count])
+            .permit(:comments, items_attributes: %i[item_id person_count])
     end
   end
 end

app/controllers/partners/requests_controller.rb

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

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

@@ -82,8 +82,7 @@
             <hr>
 
             <div class="card-footer">
-              <%= hidden_field_tag :request_type, 2 %>
-              <%= 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/partners/individuals_requests/new.html.erb

@@ -57,7 +57,6 @@
               <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,7 +55,6 @@
 
           </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

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

config/database.yml

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

spec/models/request_spec.rb

@@ -24,27 +24,12 @@
       let!(:request_started) { create(:request, :started) }
       let!(:request_fulfilled) { create(:request, :fulfilled) }
 
-      it "scopes by status" do
+      it "scopes" 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