Standardize on episode ordering

PRX · Aug 9, 2023 · d1d6ef2 · d1d6ef2
1 parent e1d6e42
commit d1d6ef2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/controllers/episodes_controller.rb b/app/controllers/episodes_controller.rb
@@ -13,8 +13,8 @@ def index
 
     filtered_episodes = episodes.filter_by_title(params[:q]).includes(:contents, :uncut)
 
-    @published_episodes = filtered_episodes.published.order(published_at: :desc).page(params[:published_page]).per(10)
-    @scheduled_episodes = filtered_episodes.draft_or_scheduled.reorder("released_at ASC NULLS FIRST").page(params[:scheduled_page]).per(10)
+    @published_episodes = filtered_episodes.published.dropdate_desc.page(params[:published_page]).per(10)
+    @scheduled_episodes = filtered_episodes.draft_or_scheduled.dropdate_asc.page(params[:scheduled_page]).per(10)
   end
 
   # GET /episodes/1

diff --git a/app/controllers/podcasts_controller.rb b/app/controllers/podcasts_controller.rb
@@ -34,8 +34,8 @@ def add_sorting(query)
   def show
     authorize @podcast
 
-    @recently_published = @podcast.episodes.published.order(published_at: :desc).limit(3)
-    @next_scheduled = @podcast.episodes.draft_or_scheduled.order(released_at: :asc).limit(3)
+    @recently_published = @podcast.episodes.published.dropdate_desc.limit(3)
+    @next_scheduled = @podcast.episodes.draft_or_scheduled.dropdate_asc.limit(3)
 
     @metrics_jwt = prx_jwt
     @metrics_castle_root = castle_root

diff --git a/app/models/episode.rb b/app/models/episode.rb
@@ -63,6 +63,8 @@ class Episode < ApplicationRecord
   scope :draft_or_scheduled, -> { draft.or(scheduled) }
   scope :after, ->(time) { where("COALESCE(published_at, released_at) > ?", time) }
   scope :filter_by_title, ->(text) { where("episodes.title ILIKE ?", "%#{text}%") }
+  scope :dropdate_asc, -> { reorder(Arel.sql("COALESCE(published_at, released_at) ASC NULLS FIRST")) }
+  scope :dropdate_desc, -> { reorder(Arel.sql("COALESCE(published_at, released_at) DESC NULLS LAST")) }
 
   enum :medium, [:audio, :uncut, :video], prefix: true