AO3-6944 500 error when sorting by prompter with anon prompts

app/controllers/challenge_requests_controller.rb

@@ -1,12 +1,11 @@
 class ChallengeRequestsController < ApplicationController
-
   before_action :load_collection
   before_action :check_visibility
 
   def check_visibility
     unless @collection
       flash.now[:notice] = ts("Collection could not be found")
-      redirect_to '/' and return
+      redirect_to "/" and return
     end
     unless @collection.challenge_type == "PromptMeme" || (@collection.challenge_type == "GiftExchange" && @collection.challenge.user_allowed_to_see_requests_summary?(current_user))
       flash.now[:notice] = ts("You are not allowed to view the requests summary!")
@@ -28,14 +27,19 @@ def index
       INNER JOIN tags ON tags.id = set_taggings.tag_id 
       WHERE prompts.type = 'Request' AND tags.type = 'Fandom' AND prompts.collection_id = " + @collection.id.to_s + " GROUP BY prompts.id ORDER BY tagnames " + @sort_direction
       @requests = Prompt.paginate_by_sql(query, page: params[:page], per_page: ArchiveConfig.ITEMS_PER_PAGE)
-    elsif @sort_column == "prompter" && !@collection.prompts.where(anonymous: true).exists?
-      @requests = @collection.prompts.where("type = 'Request'").
-        joins(challenge_signup: :pseud).
-        order("pseuds.name #{direction}").
-        paginate(page: params[:page])
+    elsif @sort_column == "prompter" && !@collection.prompts.exists?(anonymous: true)
+      @requests = @collection.prompts.where(type: "Request")
+        .joins(challenge_signup: :pseud)
+        .order(pseuds: { name: direction })
+        .paginate(page: params[:page])
+    elsif @sort_column == "prompter" && @collection.prompts.exists?(anonymous: true)
+      @requests = @collection.prompts.where(type: "Request")
+        .joins(challenge_signup: :pseud)
+        .paginate(page: params[:page])
     else
-      @requests = @collection.prompts.where("type = 'Request'").order(@sort_order).paginate(page: params[:page], per_page: ArchiveConfig.ITEMS_PER_PAGE)
+      @requests = @collection.prompts.where(type: "Request")
+        .order(@sort_order)
+        .paginate(page: params[:page], per_page: ArchiveConfig.ITEMS_PER_PAGE)
     end
   end
-
 end

spec/controllers/challenge_requests_controller_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe ChallengeRequestsController, bookmark_search: true, collection_search: true, work_search: true do 
+  include LoginMacros
+  include RedirectExpectationHelper
+
+  describe "index" do
+    context "when there are anonymous prompts" do
+      render_views
+
+      it "does not throw a 500 error if sorting by prompter with an anonymous prompt" do
+        signup = create(:prompt_meme_signup)  
+        signup.requests.create(anonymous: true)
+        run_all_indexing_jobs
+        get :index, params: { collection_id: signup.collection.name, sort_column: "prompter" }
+        expect(response.status).not_to eq(500)
+      end
+    end
+  end
+end