diff --git a/apps/backend/src/entities/user_to_metadata.rs b/apps/backend/src/entities/user_to_metadata.rs index 2dcab108a2..3a6373e820 100644 --- a/apps/backend/src/entities/user_to_metadata.rs +++ b/apps/backend/src/entities/user_to_metadata.rs @@ -13,7 +13,6 @@ pub struct Model { #[sea_orm(primary_key, auto_increment = false)] pub metadata_id: i32, pub last_updated_on: DateTimeUtc, - pub monitored: bool, } #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] diff --git a/apps/backend/src/migrator/m20230417_000002_create_user.rs b/apps/backend/src/migrator/m20230417_000002_create_user.rs index c5743f77a6..e1dc89644a 100644 --- a/apps/backend/src/migrator/m20230417_000002_create_user.rs +++ b/apps/backend/src/migrator/m20230417_000002_create_user.rs @@ -18,14 +18,12 @@ impl MigrationName for Migration { /// - the user has it in their seen history /// - added it to a collection /// - has reviewed it -/// - added to their monitored media #[derive(Iden)] pub enum UserToMetadata { Table, UserId, MetadataId, LastUpdatedOn, - Monitored, } #[derive( @@ -101,12 +99,6 @@ impl MigrationTrait for Migration { .integer() .not_null(), ) - .col( - ColumnDef::new(UserToMetadata::Monitored) - .boolean() - .default(false) - .not_null(), - ) .primary_key( Index::create() .name("pk-user_metadata") diff --git a/apps/backend/src/migrator/m20230727_000021_add_monitored_field.rs b/apps/backend/src/migrator/m20230727_000021_add_monitored_field.rs deleted file mode 100644 index d31336cc5b..0000000000 --- a/apps/backend/src/migrator/m20230727_000021_add_monitored_field.rs +++ /dev/null @@ -1,37 +0,0 @@ -use sea_orm_migration::prelude::*; - -use crate::migrator::m20230417_000002_create_user::UserToMetadata; - -pub struct Migration; - -impl MigrationName for Migration { - fn name(&self) -> &str { - "m20230727_000021_add_monitored_field" - } -} - -#[async_trait::async_trait] -impl MigrationTrait for Migration { - async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { - if !manager.has_column("user_to_metadata", "monitored").await? { - manager - .alter_table( - Table::alter() - .table(UserToMetadata::Table) - .add_column_if_not_exists( - ColumnDef::new(UserToMetadata::Monitored) - .boolean() - .default(false) - .not_null(), - ) - .to_owned(), - ) - .await?; - } - Ok(()) - } - - async fn down(&self, _manager: &SchemaManager) -> Result<(), DbErr> { - Ok(()) - } -} diff --git a/apps/backend/src/migrator/mod.rs b/apps/backend/src/migrator/mod.rs index ab7e153a4d..9c39ba7438 100644 --- a/apps/backend/src/migrator/mod.rs +++ b/apps/backend/src/migrator/mod.rs @@ -23,7 +23,6 @@ mod m20230717_000017_change_rating_value; mod m20230717_000018_add_user_sink_integrations_field; mod m20230722_000019_add_state_field; mod m20230726_000020_rename_table; -mod m20230727_000021_add_monitored_field; mod m20230728_000022_add_user_summary_field; mod m20230728_000023_add_metadata_status_field; mod m20230728_000024_add_user_notification_field; @@ -62,7 +61,6 @@ impl MigratorTrait for Migrator { Box::new(m20230717_000018_add_user_sink_integrations_field::Migration), Box::new(m20230722_000019_add_state_field::Migration), Box::new(m20230726_000020_rename_table::Migration), - Box::new(m20230727_000021_add_monitored_field::Migration), Box::new(m20230728_000022_add_user_summary_field::Migration), Box::new(m20230728_000023_add_metadata_status_field::Migration), Box::new(m20230728_000024_add_user_notification_field::Migration), diff --git a/apps/backend/src/miscellaneous/resolver.rs b/apps/backend/src/miscellaneous/resolver.rs index edae887793..678fdf001f 100644 --- a/apps/backend/src/miscellaneous/resolver.rs +++ b/apps/backend/src/miscellaneous/resolver.rs @@ -85,9 +85,8 @@ use crate::{ UserYankIntegrationSetting, UserYankIntegrations, }, utils::{ - associate_user_with_metadata, convert_naive_to_utc, get_case_insensitive_like_query, - get_user_and_metadata_association, user_id_from_token, MemoryAuthData, MemoryDatabase, - AUTHOR, COOKIE_NAME, DOCS_LINK, PAGE_LIMIT, REPOSITORY_LINK, VERSION, + convert_naive_to_utc, get_case_insensitive_like_query, user_id_from_token, MemoryAuthData, + MemoryDatabase, AUTHOR, COOKIE_NAME, DOCS_LINK, PAGE_LIMIT, REPOSITORY_LINK, VERSION, }, }; @@ -417,7 +416,6 @@ enum MediaGeneralFilter { OnAHold, Completed, Unseen, - Monitored, } #[derive(Debug, Serialize, Deserialize, InputObject, Clone)] @@ -486,8 +484,6 @@ struct UserMediaDetails { media_details: GraphqlMediaDetails, /// The next episode of this media. next_episode: Option, - /// Whether the user is monitoring this media. - is_monitored: bool, } #[derive(SimpleObject)] @@ -1023,19 +1019,6 @@ impl MiscellaneousMutation { service.admin_account_guard(user_id).await?; service.delete_user(to_delete_user_id).await } - - /// Toggle the monitor on a media for a user. - async fn toggle_media_monitor( - &self, - gql_ctx: &Context<'_>, - to_monitor_metadata_id: i32, - ) -> Result { - let service = gql_ctx.data_unchecked::>(); - let user_id = service.user_id_from_ctx(gql_ctx).await?; - service - .toggle_media_monitor(user_id, to_monitor_metadata_id) - .await - } } pub struct MiscellaneousService { @@ -1375,7 +1358,6 @@ impl MiscellaneousService { } }); let next_episode = next_episode.filter(|ne| ne.episode_number.is_some()); - let is_monitored = self.get_monitored_status(user_id, metadata_id).await?; Ok(UserMediaDetails { collections, reviews, @@ -1383,7 +1365,6 @@ impl MiscellaneousService { in_progress, media_details, next_episode, - is_monitored, }) } @@ -1406,13 +1387,6 @@ impl MiscellaneousService { ) -> Result> { let meta = UserToMetadata::find() .filter(user_to_metadata::Column::UserId.eq(user_id)) - .apply_if( - match input.filter.as_ref().and_then(|f| f.general) { - Some(MediaGeneralFilter::Monitored) => Some(true), - _ => None, - }, - |query, v| query.filter(user_to_metadata::Column::Monitored.eq(v)), - ) .all(&self.db) .await .unwrap(); @@ -1583,7 +1557,6 @@ impl MiscellaneousService { .collect_vec() }; match s { - MediaGeneralFilter::Monitored => {} MediaGeneralFilter::All => {} MediaGeneralFilter::Rated => { main_select = main_select @@ -1982,9 +1955,7 @@ impl MiscellaneousService { .await .unwrap(); let is_in_collection = meta_ids.contains(&u.metadata_id); - // if the metadata is monitored - let is_monitored = u.monitored; - if seen_count + reviewed_count == 0 && !is_in_collection && !is_monitored { + if seen_count + reviewed_count == 0 && !is_in_collection { tracing::debug!( "Removing user_to_metadata = {id:?}", id = (u.user_id, u.metadata_id) @@ -3973,34 +3944,6 @@ impl MiscellaneousService { }; Ok(()) } - - async fn toggle_media_monitor( - &self, - user_id: i32, - to_monitor_metadata_id: i32, - ) -> Result { - let metadata = - associate_user_with_metadata(&user_id, &to_monitor_metadata_id, &self.db).await?; - let new_monitored_value = !metadata.monitored; - let mut metadata: user_to_metadata::ActiveModel = metadata.into(); - metadata.monitored = ActiveValue::Set(new_monitored_value); - metadata.save(&self.db).await?; - Ok(new_monitored_value) - } - - async fn get_monitored_status( - &self, - user_id: i32, - to_monitor_metadata_id: i32, - ) -> Result { - let metadata = - get_user_and_metadata_association(&user_id, &to_monitor_metadata_id, &self.db).await; - Ok(if let Some(m) = metadata { - m.monitored - } else { - false - }) - } } fn modify_seen_elements(all_seen: &mut [seen::Model]) { diff --git a/apps/frontend/src/pages/list.tsx b/apps/frontend/src/pages/list.tsx index 069cce9b4d..86c002b15f 100644 --- a/apps/frontend/src/pages/list.tsx +++ b/apps/frontend/src/pages/list.tsx @@ -345,10 +345,6 @@ const Page: NextPageWithLayout = () => { () => MediaGeneralFilter.InProgress, ) .with("UNSEEN", () => MediaGeneralFilter.Unseen) - .with( - "MONITORED", - () => MediaGeneralFilter.Monitored, - ) .otherwise((_v) => { throw new Error("Invalid filter selected"); }); diff --git a/apps/frontend/src/pages/media/index.tsx b/apps/frontend/src/pages/media/index.tsx index e70b67ddc4..50b5d4e7af 100644 --- a/apps/frontend/src/pages/media/index.tsx +++ b/apps/frontend/src/pages/media/index.tsx @@ -54,8 +54,6 @@ import { type RemoveMediaFromCollectionMutationVariables, type ReviewItem, SeenState, - ToggleMediaMonitorDocument, - type ToggleMediaMonitorMutationVariables, UserMediaDetailsDocument, } from "@ryot/generated/graphql/backend/graphql"; import { changeCase, getInitials } from "@ryot/utilities"; @@ -448,18 +446,6 @@ const Page: NextPageWithLayout = () => { userMediaDetails.refetch(); }, }); - const toggleMediaMonitor = useMutation({ - mutationFn: async (variables: ToggleMediaMonitorMutationVariables) => { - const { toggleMediaMonitor } = await gqlClient.request( - ToggleMediaMonitorDocument, - variables, - ); - return toggleMediaMonitor; - }, - onSuccess: () => { - userMediaDetails.refetch(); - }, - }); const deleteSeenItem = useMutation({ mutationFn: async (variables: DeleteSeenItemMutationVariables) => { const { deleteSeenItem } = await gqlClient.request( @@ -1060,17 +1046,6 @@ const Page: NextPageWithLayout = () => { /> ) : null} -