fix meeting sorter

Som-Energia · Oct 16, 2023 · c618da5 · c618da5
1 parent 9076d66
commit c618da5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/services/som_energia/meetings/meeting_sort.rb b/app/services/som_energia/meetings/meeting_sort.rb
@@ -20,7 +20,7 @@ def meetings
       end
 
       def new_order
-        Arel.sql("POSITION(id::text IN '#{sorted_ids.join(",")}')")
+        Arel.sql("array_position(ARRAY[#{sorted_ids.join(",")}], id::int)")
       end
 
       def sorted_ids

diff --git a/spec/services/meeting_sort_spec.rb b/spec/services/meeting_sort_spec.rb
@@ -5,15 +5,17 @@
 module SomEnergia::Meetings
   describe MeetingSort do
     let(:component) { create(:component, manifest_name: "meetings") }
-    let(:upcoming_meeting_1) { create(:meeting, :upcoming, component: component, start_time: 1.year.from_now) }
+    let(:upcoming_meeting_1) { create(:meeting, :upcoming, id: past_meeting_1.id * 10, component: component, start_time: 1.year.from_now) }
     let(:upcoming_meeting_2) { create(:meeting, :upcoming, component: component, start_time: 2.years.from_now) }
+    let(:upcoming_meeting_3) { create(:meeting, :upcoming, id: past_meeting_2.id * 10, component: component, start_time: 1.day.ago, end_time: 1.day.from_now) }
     let(:past_meeting_1) { create(:meeting, :past, component: component, start_time: 1.year.ago) }
     let(:past_meeting_2) { create(:meeting, :past, component: component, start_time: 2.years.ago) }
     let(:meetings) do
       [
         past_meeting_2,
         upcoming_meeting_2,
         past_meeting_1,
+        upcoming_meeting_3,
         upcoming_meeting_1
       ]
     end
@@ -25,6 +27,7 @@ module SomEnergia::Meetings
       let(:expected_ids) { expected_meetings.map(&:id) }
       let(:expected_meetings) do
         [
+          upcoming_meeting_3,
           upcoming_meeting_1,
           upcoming_meeting_2,
           past_meeting_1,