Support for notifications

.moon/workspace.yml

@@ -1,7 +1,6 @@
 $schema: 'https://moonrepo.dev/schemas/workspace.json'
 
 projects:
-  exercise-app: 'apps/exercise-app'
   frontend: 'apps/frontend'
   kodi: 'apps/kodi'
   generated: 'libs/generated'

apps/backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ryot"
-version = "1.17.7"
+version = "1.18.0"
 edition = "2021"
 repository = "https://github.com/IgnisDa/ryot"
 license = "GPL-V3"

apps/backend/src/background.rs

@@ -27,29 +27,28 @@ impl Job for ScheduledJob {
     const NAME: &'static str = "apalis::ScheduledJob";
 }
 
-pub async fn general_media_cleanup_jobs(
-    _information: ScheduledJob,
-    ctx: JobContext,
-) -> Result<(), JobError> {
+pub async fn media_jobs(_information: ScheduledJob, ctx: JobContext) -> Result<(), JobError> {
     tracing::trace!("Invalidating invalid media import jobs");
     ctx.data::<Arc<ImporterService>>()
         .unwrap()
         .invalidate_import_jobs()
         .await
         .unwrap();
     tracing::trace!("Cleaning up media items without associated user activities");
-    ctx.data::<Arc<MiscellaneousService>>()
-        .unwrap()
+    let service = ctx.data::<Arc<MiscellaneousService>>().unwrap();
+    service
         .cleanup_metadata_with_associated_user_activities()
         .await
         .unwrap();
+    tracing::trace!("Checking for updates for media in Watchlist");
+    service
+        .update_watchlist_media_and_send_notifications()
+        .await
+        .unwrap();
     Ok(())
 }
 
-pub async fn general_user_cleanup(
-    _information: ScheduledJob,
-    ctx: JobContext,
-) -> Result<(), JobError> {
+pub async fn user_jobs(_information: ScheduledJob, ctx: JobContext) -> Result<(), JobError> {
     tracing::trace!("Cleaning up user and metadata association");
     ctx.data::<Arc<MiscellaneousService>>()
         .unwrap()
@@ -126,7 +125,7 @@ pub async fn user_created_job(
         .await
         .unwrap();
     service
-        .calculate_user_media_summary(&information.user_id)
+        .calculate_user_media_summary(information.user_id)
         .await
         .unwrap();
     Ok(())
@@ -148,7 +147,7 @@ pub async fn recalculate_user_summary_job(
     tracing::trace!("Calculating summary for user {:?}", information.user_id);
     ctx.data::<Arc<MiscellaneousService>>()
         .unwrap()
-        .calculate_user_media_summary(&information.user_id)
+        .calculate_user_media_summary(information.user_id)
         .await
         .unwrap();
     tracing::trace!(
@@ -173,7 +172,7 @@ pub async fn update_metadata_job(
 ) -> Result<(), JobError> {
     ctx.data::<Arc<MiscellaneousService>>()
         .unwrap()
-        .update_metadata(information.metadata)
+        .update_metadata(information.metadata.id)
         .await
         .unwrap();
     Ok(())

apps/backend/src/entities/metadata.rs

@@ -27,6 +27,7 @@ pub struct Model {
     pub creators: MetadataCreators,
     pub source: MetadataSource,
     pub specifics: MediaSpecifics,
+    pub production_status: String,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

apps/backend/src/entities/mod.rs

@@ -11,6 +11,5 @@ pub mod metadata_to_collection;
 pub mod metadata_to_genre;
 pub mod review;
 pub mod seen;
-pub mod summary;
 pub mod user;
 pub mod user_to_metadata;

apps/backend/src/entities/prelude.rs

@@ -9,6 +9,5 @@ pub use super::metadata_to_collection::Entity as MetadataToCollection;
 pub use super::metadata_to_genre::Entity as MetadataToGenre;
 pub use super::review::Entity as Review;
 pub use super::seen::Entity as Seen;
-pub use super::summary::Entity as Summary;
 pub use super::user::Entity as User;
 pub use super::user_to_metadata::Entity as UserToMetadata;

apps/backend/src/entities/user.rs

@@ -11,7 +11,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     migrator::UserLot,
-    users::{UserPreferences, UserSinkIntegrations, UserYankIntegrations},
+    models::media::UserSummary,
+    users::{UserNotifications, UserPreferences, UserSinkIntegrations, UserYankIntegrations},
 };
 
 fn get_hasher() -> Argon2<'static> {
@@ -35,6 +36,10 @@ pub struct Model {
     pub yank_integrations: Option<UserYankIntegrations>,
     #[graphql(skip)]
     pub sink_integrations: UserSinkIntegrations,
+    #[graphql(skip)]
+    pub notifications: UserNotifications,
+    #[graphql(skip)]
+    pub summary: Option<UserSummary>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -47,8 +52,6 @@ pub enum Relation {
     Review,
     #[sea_orm(has_many = "super::seen::Entity")]
     Seen,
-    #[sea_orm(has_many = "super::summary::Entity")]
-    Summary,
 }
 
 impl Related<super::collection::Entity> for Entity {
@@ -75,12 +78,6 @@ impl Related<super::seen::Entity> for Entity {
     }
 }
 
-impl Related<super::summary::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Summary.def()
-    }
-}
-
 impl Related<super::metadata::Entity> for Entity {
     fn to() -> RelationDef {
         super::user_to_metadata::Relation::Metadata.def()
@@ -96,7 +93,7 @@ impl ActiveModelBehavior for ActiveModel {
     where
         C: ConnectionTrait,
     {
-        if !self.password.is_unchanged() || self.password.is_not_set() {
+        if self.password.is_set() {
             let password = self.password.unwrap();
             let salt = SaltString::generate(&mut OsRng);
             let password_hash = get_hasher()

apps/backend/src/entities/user_to_metadata.rs

@@ -13,6 +13,7 @@ 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)]

apps/backend/src/importer/goodreads.rs

@@ -115,6 +115,7 @@ pub async fn import(input: DeployGoodreadsImportInput) -> Result<ImportResult> {
                             identifier: d.book_id.to_string(),
                             title: d.title,
                             description: Some(d.book_description),
+                            production_status: "Released".to_owned(),
                             lot: MetadataLot::Book,
                             source: MetadataSource::Custom,
                             creators: vec![MetadataCreator {

apps/backend/src/importer/media_tracker.rs

@@ -112,6 +112,13 @@ struct ItemSeen {
     episode_id: Option<i32>,
 }
 
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[serde(untagged)]
+enum ItemNumberOfPages {
+    Nothing(String),
+    Something(i32),
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
 struct ItemDetails {
@@ -126,7 +133,7 @@ struct ItemDetails {
     title: String,
     overview: Option<String>,
     authors: Option<Vec<String>>,
-    number_of_pages: Option<i32>,
+    number_of_pages: Option<ItemNumberOfPages>,
 }
 
 pub async fn import(input: DeployMediaTrackerImportInput) -> Result<ImportResult> {
@@ -252,6 +259,11 @@ pub async fn import(input: DeployMediaTrackerImportInput) -> Result<ImportResult
             }
         }
 
+        let num_pages = details.number_of_pages.and_then(|d| match d {
+            ItemNumberOfPages::Nothing(_) => None,
+            ItemNumberOfPages::Something(s) => Some(s),
+        });
+
         let item = ImportOrExportItem {
             source_id: d.id.to_string(),
             source,
@@ -262,6 +274,7 @@ pub async fn import(input: DeployMediaTrackerImportInput) -> Result<ImportResult
                     identifier,
                     title: details.title,
                     description: details.overview,
+                    production_status: "Released".to_owned(),
                     lot,
                     source: MetadataSource::Custom,
                     creators: details
@@ -278,9 +291,7 @@ pub async fn import(input: DeployMediaTrackerImportInput) -> Result<ImportResult
                     images: vec![],
                     publish_year: None,
                     publish_date: None,
-                    specifics: MediaSpecifics::Book(BookSpecifics {
-                        pages: details.number_of_pages,
-                    }),
+                    specifics: MediaSpecifics::Book(BookSpecifics { pages: num_pages }),
                 })),
                 true => ImportOrExportItemIdentifier::NeedsDetails(identifier),
             },

apps/backend/src/main.rs

@@ -38,9 +38,8 @@ use tower_http::{
 
 use crate::{
     background::{
-        general_media_cleanup_jobs, general_user_cleanup, import_media,
-        recalculate_user_summary_job, update_exercise_job, update_metadata_job, user_created_job,
-        yank_integrations_data,
+        import_media, media_jobs, recalculate_user_summary_job, update_exercise_job,
+        update_metadata_job, user_created_job, user_jobs, yank_integrations_data,
     },
     config::get_app_config,
     config::AppConfig,
@@ -64,6 +63,7 @@ mod integrations;
 mod migrator;
 mod miscellaneous;
 mod models;
+mod notification;
 mod providers;
 mod routes;
 mod traits;
@@ -258,7 +258,7 @@ async fn main() -> Result<()> {
                     )
                     .layer(ApalisTraceLayer::new())
                     .layer(ApalisExtension(media_service_1.clone()))
-                    .build_fn(general_user_cleanup)
+                    .build_fn(user_jobs)
             })
             .register_with_count(1, move |c| {
                 WorkerBuilder::new(format!("general_media_cleanup_job-{c}"))
@@ -271,7 +271,7 @@ async fn main() -> Result<()> {
                     .layer(ApalisTraceLayer::new())
                     .layer(ApalisExtension(importer_service_2.clone()))
                     .layer(ApalisExtension(media_service_2.clone()))
-                    .build_fn(general_media_cleanup_jobs)
+                    .build_fn(media_jobs)
             })
             .register_with_count(1, move |c| {
                 WorkerBuilder::new(format!("yank_integrations_data-{c}"))

apps/backend/src/migrator/m20230410_000001_create_metadata.rs

@@ -126,6 +126,8 @@ pub enum Metadata {
     PublishYear,
     // the date which this media was released. Should take precedence if present
     PublishDate,
+    // production status
+    ProductionStatus,
     // all the images for this media item
     Images,
     // the unique identifier that is returned by the metadata provider
@@ -167,6 +169,11 @@ impl MigrationTrait for Migration {
                     )
                     .col(ColumnDef::new(Metadata::Title).string().not_null())
                     .col(ColumnDef::new(Metadata::Description).text())
+                    .col(
+                        ColumnDef::new(Metadata::ProductionStatus)
+                            .string()
+                            .not_null(),
+                    )
                     .col(ColumnDef::new(Metadata::PublishYear).integer())
                     .col(ColumnDef::new(Metadata::PublishDate).date())
                     .col(ColumnDef::new(Metadata::Images).json())

apps/backend/src/migrator/m20230417_000002_create_user.rs

@@ -18,12 +18,14 @@ 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(
@@ -50,6 +52,8 @@ pub enum User {
     YankIntegrations,
     // This field can be `NULL` if the user has not enabled any sink integration
     SinkIntegrations,
+    Notifications,
+    Summary,
 }
 
 #[async_trait::async_trait]
@@ -73,6 +77,8 @@ impl MigrationTrait for Migration {
                     .col(ColumnDef::new(User::Preferences).json().not_null())
                     .col(ColumnDef::new(User::YankIntegrations).json())
                     .col(ColumnDef::new(User::SinkIntegrations).json())
+                    .col(ColumnDef::new(User::Notifications).json())
+                    .col(ColumnDef::new(User::Summary).json())
                     .to_owned(),
             )
             .await?;
@@ -95,6 +101,12 @@ 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")

apps/backend/src/migrator/m20230504_000005_create_summary.rs

@@ -1,3 +1,5 @@
+// FIXME: Remove this model completely.
+
 use sea_orm_migration::prelude::*;
 
 use crate::migrator::m20230417_000002_create_user::User;