Allow order by times consumed (#1208)

* feat(backend): allow order metadata list by times consumed * fix(utils/dependent): use correct query for ordering by seen count * chore(utils/dependent): change order of match arms * fix(utils/dependent): remove useless group
IgnisDa · Jan 26, 2025 · 2883943 · 2883943
1 parent 75693e1
commit 2883943
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/crates/models/media/src/lib.rs b/crates/models/media/src/lib.rs
@@ -1263,12 +1263,13 @@ pub enum GraphqlSortOrder {
 
 #[derive(Debug, Serialize, Deserialize, Enum, Clone, PartialEq, Eq, Copy, Default)]
 pub enum MediaSortBy {
-    LastUpdated,
     Title,
-    #[default]
-    ReleaseDate,
     LastSeen,
     UserRating,
+    #[default]
+    ReleaseDate,
+    LastUpdated,
+    TimesConsumed,
     ProviderRating,
 }
 

diff --git a/crates/utils/dependent/src/lib.rs b/crates/utils/dependent/src/lib.rs
@@ -2792,7 +2792,6 @@ pub async fn metadata_list(
             avg_rating_col,
         )
         .group_by(metadata::Column::Id)
-        .group_by(user_to_entity::Column::MediaReason)
         .filter(user_to_entity::Column::UserId.eq(user_id))
         .apply_if(input.lot, |query, v| {
             query.filter(metadata::Column::Lot.eq(v))
@@ -2866,10 +2865,11 @@ pub async fn metadata_list(
             })),
         })
         .apply_if(input.sort.map(|s| s.by), |query, v| match v {
+            MediaSortBy::Title => query.order_by(metadata::Column::Title, order_by),
+            MediaSortBy::TimesConsumed => query.order_by(seen::Column::Id.count(), order_by),
             MediaSortBy::LastUpdated => query
                 .order_by(user_to_entity::Column::LastUpdatedOn, order_by)
                 .group_by(user_to_entity::Column::LastUpdatedOn),
-            MediaSortBy::Title => query.order_by(metadata::Column::Title, order_by),
             MediaSortBy::ReleaseDate => query.order_by_with_nulls(
                 metadata::Column::PublishYear,
                 order_by,

diff --git a/libs/generated/src/graphql/backend/graphql.ts b/libs/generated/src/graphql/backend/graphql.ts
@@ -1005,6 +1005,7 @@ export enum MediaSortBy {
   LastUpdated = 'LAST_UPDATED',
   ProviderRating = 'PROVIDER_RATING',
   ReleaseDate = 'RELEASE_DATE',
+  TimesConsumed = 'TIMES_CONSUMED',
   Title = 'TITLE',
   UserRating = 'USER_RATING'
 }

diff --git a/libs/generated/src/graphql/backend/types.generated.ts b/libs/generated/src/graphql/backend/types.generated.ts
@@ -1030,6 +1030,7 @@ export enum MediaSortBy {
   LastUpdated = 'LAST_UPDATED',
   ProviderRating = 'PROVIDER_RATING',
   ReleaseDate = 'RELEASE_DATE',
+  TimesConsumed = 'TIMES_CONSUMED',
   Title = 'TITLE',
   UserRating = 'USER_RATING'
 }