[Card Grants] Remove reviewer selection

app/controllers/reimbursement/reports_controller.rb

@@ -481,7 +481,7 @@ def update_reimbursement_report_params
       reimbursement_report_params = params.require(:reimbursement_report).permit(:report_name, :event_id, :maximum_amount, :reviewer_id).compact
       reimbursement_report_params.delete(:maximum_amount) unless admin_signed_in? || OrganizerPosition.role_at_least?(current_user, @event, :manager)
       reimbursement_report_params.delete(:maximum_amount) unless @report.draft? || @report.submitted?
-      reimbursement_report_params.delete(:reviewer_id) unless admin_signed_in? || OrganizerPosition.role_at_least?(current_user, @event, :manager)
+      reimbursement_report_params.delete(:reviewer_id) unless admin_signed_in? || OrganizerPosition.role_at_least?(current_user, @event, :manager) || (@report.reviewer_assignable_by_creator? && @report.user == current_user && (@report.draft? || @report.submitted?))
       reimbursement_report_params
     end
 

app/models/reimbursement/report.rb

@@ -326,7 +326,11 @@ def team_review_required?
     end
 
     def reviewer_selectable?
-      !event.reviewer_selection_disabled?
+      card_grant.blank? && !event.reviewer_selection_disabled?
+    end
+
+    def reviewer_assignable_by_creator?
+      card_grant.present? && !event.reviewer_selection_disabled?
     end
 
     def assigned_reviewer_required?

app/views/events/settings/_reimbursements.html.erb

@@ -40,6 +40,7 @@
       <div class="field">
         <%= form.label :reimbursement_reviewer_selection, "Let submitters pick a reviewer" %>
         <%= form.select :reimbursement_reviewer_selection, [["Disabled", "disabled"], ["Enabled, optional", "optional"], ["Enabled, required", "required"]], {}, { disabled: } %>
+        <p class="h5 muted mt1 mb0">This doesn’t apply to reports converted from card grants. Those submitters can’t pick a reviewer, but one can still be assigned from the report’s settings menu.</p>
       </div>
 
       <hr class="my-4">

app/views/reimbursement/reports/_edit_form.html.erb

@@ -35,6 +35,11 @@
       <%= form.label :reviewer_id, "Assigned reviewer", class: "mt2" %>
       <%= form.collection_select :reviewer_id, @report.event.managers, :id, :name, include_blank: "Anyone" %>
     </div>
+  <% elsif @report.reviewer_assignable_by_creator? && current_user == @report.user && (@report.submitted? || @report.draft?) %>
+    <div class="field">
+      <%= form.label :reviewer_id, "Reviewer", class: "mt2" %>
+      <%= form.collection_select :reviewer_id, @report.eligible_reviewers, :id, :name, include_blank: "No preference" %>
+    </div>
   <% end %>
   <div class="flex items-center w-full justify-between">
     <%= form.submit "Update report", class: "left mt2" %>

app/views/reimbursement/reports/show.html.erb

@@ -55,7 +55,7 @@
                       style: "height: 32px; width: 32px; background: #338eda20; color: #338eda",
                       'aria-label': "View the associated card grant." %>
     <% end %>
-    <% unless @report.closed? || !(organizer_signed_in?(as: :member) || policy(@report).change_event?) %>
+    <% unless @report.closed? || !(organizer_signed_in?(as: :member) || policy(@report).change_event? || (@report.reviewer_assignable_by_creator? && policy(@report).edit?)) %>
       <%= pop_icon_to "settings",
                       "#",
                       data: { behavior: "modal_trigger", modal: "edit" },

spec/controllers/reimbursement/reports_controller_spec.rb

@@ -92,6 +92,25 @@ def header_badges(body)
       expect(selects.map { |select| select["required"] }).to all(eq("required"))
     end
 
+    it "never asks card grant submitters for a reviewer" do
+      event = create(:event, :card_grant_event, :with_positive_balance)
+      member = create(:user)
+      create(:organizer_position, user: member, event:, role: :member)
+      card_grant = create(:card_grant, event:, user: member)
+      report = create(:reimbursement_report, user: member, event:, card_grant:)
+      create_session(member, verified: true)
+
+      event.update!(reimbursement_reviewer_selection: :optional)
+      get(:show, params: { id: report.id })
+      body = Nokogiri::HTML5(response.body)
+      expect(body.css('select[name="reviewer_id"]')).to be_empty
+      expect(body.css('select[name="reimbursement_report[reviewer_id]"]')).not_to be_empty
+
+      event.update!(reimbursement_reviewer_selection: :required)
+      get(:show, params: { id: report.id })
+      expect(Nokogiri::HTML5(response.body).css('select[name="reviewer_id"]')).to be_empty
+    end
+
     it "shows the status badge when no reviewer is assigned" do
       creator = create(:user)
       event = create(:event)
@@ -399,6 +418,44 @@ def header_badges(body)
         expect(report.reload.reviewer_id).to be_nil
       end
 
+      it "lets a card grant recipient assign a reviewer from the settings menu" do
+        event = create(:event, :card_grant_event, :with_positive_balance)
+        recipient = create(:user)
+        reviewer = create(:user)
+        create(:organizer_position, user: reviewer, event:)
+        card_grant = create(:card_grant, event:, user: recipient)
+        report = create(:reimbursement_report, user: recipient, event:, card_grant:)
+
+        event.update!(reimbursement_reviewer_selection: :optional)
+        create_session(recipient, verified: true)
+
+        patch(:update, params: {
+                id: report.id,
+                reimbursement_report: { report_name: report.name, reviewer_id: reviewer.id }
+              })
+
+        expect(report.reload.reviewer_id).to eq(reviewer.id)
+      end
+
+      it "rejects an ineligible reviewer from a card grant recipient" do
+        event = create(:event, :card_grant_event, :with_positive_balance)
+        recipient = create(:user)
+        outsider = create(:user)
+        card_grant = create(:card_grant, event:, user: recipient)
+        report = create(:reimbursement_report, user: recipient, event:, card_grant:)
+
+        event.update!(reimbursement_reviewer_selection: :optional)
+        create_session(recipient, verified: true)
+
+        patch(:update, params: {
+                id: report.id,
+                reimbursement_report: { report_name: report.name, reviewer_id: outsider.id }
+              })
+
+        expect(response).to have_http_status(:unprocessable_content)
+        expect(report.reload.reviewer_id).to be_nil
+      end
+
       it "allows a manager to assign a reviewer on their own report" do
         manager = create(:user)
         event = create(:event)