Merge pull request #6659 from rubyforgood/InvalidColumnReference-fix

claude spec for prod bug

Author: compwron

app/datatables/volunteer_datatable.rb

@@ -49,6 +49,7 @@ def raw_records
       .select(
         <<-SQL
           users.*,
+          COALESCE(users.display_name, users.email) AS default_sort_order,
           COALESCE(supervisors.display_name, supervisors.email) AS supervisor_name,
           supervisors.id AS supervisor_id,
           transition_aged_youth_cases.volunteer_id IS NOT NULL AS has_transition_aged_youth_cases,
@@ -133,7 +134,7 @@ def hours_spent_in_days_subquery
   end
 
   def order_clause
-    @order_clause ||= build_order_clause || Arel.sql("COALESCE(users.display_name, users.email) ASC")
+    @order_clause ||= build_order_clause || Arel.sql("default_sort_order ASC")
   end
 
   def supervisor_filter

spec/datatables/volunteer_datatable_spec.rb

@@ -506,4 +506,74 @@
       end
     end
   end
+
+  describe "extra_languages filter" do
+    let(:org) { build :casa_org }
+    let(:supervisor) { create :supervisor, casa_org: org }
+    let(:volunteer_with_language) { create :volunteer, casa_org: org, supervisor: supervisor }
+    let(:volunteer_without_language) { create :volunteer, casa_org: org, supervisor: supervisor }
+    let(:language) { create :language, casa_org: org }
+
+    before do
+      create :user_language, user: volunteer_with_language, language: language
+    end
+
+    context "when filtering for volunteers with extra languages with default ordering" do
+      # Use an invalid order_by to trigger the default COALESCE ordering
+      # which causes PG::InvalidColumnReference when combined with DISTINCT
+      let(:order_by) { "invalid_column" }
+      let(:additional_filters) do
+        {
+          active: %w[false true],
+          supervisor: [supervisor.id],
+          transition_aged_youth: %w[false true],
+          extra_languages: %w[true]
+        }
+      end
+
+      it "does not raise PG::InvalidColumnReference error" do
+        # Bug: PG::InvalidColumnReference: ERROR: for SELECT DISTINCT, ORDER BY
+        # expressions must appear in select list
+        # This occurs because extra_languages filter adds .distinct but the default
+        # ORDER BY COALESCE(users.display_name, users.email) is not in the SELECT list
+        expect { subject }.not_to raise_error
+      end
+
+      it "returns only volunteers with languages" do
+        expect(subject[:data].map { |d| d[:id].to_i }).to contain_exactly(volunteer_with_language.id)
+      end
+    end
+
+    context "when filtering for volunteers without extra languages with default ordering" do
+      let(:order_by) { "invalid_column" }
+      let(:additional_filters) do
+        {
+          active: %w[false true],
+          supervisor: [supervisor.id],
+          transition_aged_youth: %w[false true],
+          extra_languages: %w[false]
+        }
+      end
+
+      it "does not raise PG::InvalidColumnReference error" do
+        expect { subject }.not_to raise_error
+      end
+    end
+
+    context "when filtering with multiple extra_languages options with default ordering" do
+      let(:order_by) { "invalid_column" }
+      let(:additional_filters) do
+        {
+          active: %w[false true],
+          supervisor: [supervisor.id],
+          transition_aged_youth: %w[false true],
+          extra_languages: %w[true false]
+        }
+      end
+
+      it "does not raise PG::InvalidColumnReference error" do
+        expect { subject }.not_to raise_error
+      end
+    end
+  end
 end