Merge pull request #752 from podverse/develop

Release v4.16.18
podverse · Apr 27, 2024 · 4314494 · 4314494
2 parents 9456938 + bab3753
commit 4314494
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "podverse-api",
-  "version": "4.16.17",
+  "version": "4.16.18",
   "description": "Data API, database migration scripts, and backend services for all Podverse models.",
   "contributors": [
     "Mitch Downey"

diff --git a/src/lib/utility/index.ts b/src/lib/utility/index.ts
@@ -151,50 +151,45 @@ export const addOrderByToQuery = (qb, type, sort, sortDateKey, allowRandom, isFr
   } else if (sort === 'live-item-start-desc') {
     qb.orderBy(`liveItem.start`, descKey)
   } else if (sort === 'top-past-day') {
-    qb.leftJoin(
+    qb.innerJoin(
       ormStatsType,
       `stats_${type}`,
       `${type}.id = stats_${type}.${statsParentId}_id AND stats_${type}.timeframe = :timeframe`,
       { timeframe: 'daily' }
     )
-
-    qb.addOrderBy(`stats_${type}.play_count`, descKey)
+    qb.orderBy(`stats_${type}.play_count`, descKey)
   } else if (sort === 'top-past-week') {
-    qb.leftJoin(
+    qb.innerJoin(
       ormStatsType,
       `stats_${type}`,
       `${type}.id = stats_${type}.${statsParentId}_id AND stats_${type}.timeframe = :timeframe`,
       { timeframe: 'weekly' }
     )
-
-    qb.addOrderBy(`stats_${type}.play_count`, descKey)
+    qb.orderBy(`stats_${type}.play_count`, descKey)
   } else if (sort === 'top-past-month') {
-    qb.leftJoin(
+    qb.innerJoin(
       ormStatsType,
       `stats_${type}`,
       `${type}.id = stats_${type}.${statsParentId}_id AND stats_${type}.timeframe = :timeframe`,
       { timeframe: 'monthly' }
     )
-
-    qb.addOrderBy(`stats_${type}.play_count`, descKey)
+    qb.orderBy(`stats_${type}.play_count`, descKey)
   } else if (sort === 'top-past-year') {
-    qb.leftJoin(
+    qb.innerJoin(
       ormStatsType,
       `stats_${type}`,
       `${type}.id = stats_${type}.${statsParentId}_id AND stats_${type}.timeframe = :timeframe`,
       { timeframe: 'yearly' }
     )
-
-    qb.addOrderBy(`stats_${type}.play_count`, descKey)
+    qb.orderBy(`stats_${type}.play_count`, descKey)
   } else if (sort === 'top-all-time') {
-    qb.leftJoin(
+    qb.innerJoin(
       ormStatsType,
       `stats_${type}`,
       `${type}.id = stats_${type}.${statsParentId}_id AND stats_${type}.timeframe = :timeframe`,
       { timeframe: 'all_time' }
     )
-
-    qb.addOrderBy(`stats_${type}.play_count`, descKey)
+    qb.orderBy(`stats_${type}.play_count`, descKey)
   } else if (sort === 'most-recent') {
     qb.orderBy(`${type}.${sortDateKey}`, descKey)
   } else if (sort === 'oldest') {
@@ -210,14 +205,13 @@ export const addOrderByToQuery = (qb, type, sort, sortDateKey, allowRandom, isFr
   } else if (sort === 'episode-number-asc') {
     qb.orderBy(`${type}.itunesEpisode`, ascKey)
   } else {
-    qb.leftJoin(
+    qb.innerJoin(
       ormStatsType,
       `stats_${type}`,
       `${type}.id = stats_${type}.${type}_id AND stats_${type}.timeframe = :timeframe`,
       { timeframe: 'weekly' }
     )
-
-    qb.addOrderBy(`stats_${type}.play_count`, descKey)
+    qb.orderBy(`stats_${type}.play_count`, descKey)
   }
 
   return qb