Issue 879 (#880)

* refactor(backend): extract season name into constant

* feat(backend): do not create calendar events for specials

* feat(database): delete all invalid calendar events

Author: IgnisDa

apps/backend/src/miscellaneous/resolver.rs

@@ -119,7 +119,8 @@ use crate::{
     utils::{
         add_entity_to_collection, associate_user_with_entity, entity_in_collections,
         get_current_date, get_stored_asset, get_user_to_entity_association, ilike_sql,
-        partial_user_by_id, user_by_id, user_id_from_token, AUTHOR, TEMP_DIR,
+        partial_user_by_id, user_by_id, user_id_from_token, AUTHOR, SHOW_SPECIALS_SEASON_NAME,
+        TEMP_DIR,
     },
 };
 
@@ -5832,7 +5833,7 @@ impl MiscellaneousService {
             let all_episodes = if let Some(s) = metadata.model.show_specifics {
                 s.seasons
                     .into_iter()
-                    .filter(|s| s.name != "Specials")
+                    .filter(|s| s.name != SHOW_SPECIALS_SEASON_NAME)
                     .flat_map(|s| {
                         s.episodes
                             .into_iter()
@@ -6686,6 +6687,9 @@ impl MiscellaneousService {
                 }
             } else if let Some(ss) = &meta.show_specifics {
                 for season in ss.seasons.iter() {
+                    if season.name == SHOW_SPECIALS_SEASON_NAME {
+                        continue;
+                    }
                     for episode in season.episodes.iter() {
                         if let Some(date) = episode.publish_date {
                             let event = calendar_event::ActiveModel {

apps/backend/src/providers/tmdb.rs

@@ -35,7 +35,7 @@ use crate::{
         IdObject, NamedObject, SearchDetails, SearchResults, StoredUrl,
     },
     traits::{MediaProvider, MediaProviderLanguages},
-    utils::{get_base_http_client, get_current_date, TEMP_DIR},
+    utils::{get_base_http_client, get_current_date, SHOW_SPECIALS_SEASON_NAME, TEMP_DIR},
 };
 
 static URL: &str = "https://api.themoviedb.org/3/";
@@ -1119,7 +1119,7 @@ impl MediaProvider for TmdbShowService {
             .sum();
         let seasons_without_specials = seasons
             .iter()
-            .filter(|s| s.name != "Specials")
+            .filter(|s| s.name != SHOW_SPECIALS_SEASON_NAME)
             .collect_vec();
         let total_seasons = seasons_without_specials.len();
         let total_episodes = seasons_without_specials

apps/backend/src/utils.rs

@@ -63,6 +63,7 @@ pub const USER_AGENT_STR: &str = const_str::concat!(
 pub const AVATAR_URL: &str =
     "https://raw.githubusercontent.com/IgnisDa/ryot/main/libs/assets/icon-512x512.png";
 pub const TEMP_DIR: &str = "tmp";
+pub const SHOW_SPECIALS_SEASON_NAME: &str = "Specials";
 pub static JSON: HeaderValue = HeaderValue::from_static("application/json");
 
 const FRONTEND_OAUTH_ENDPOINT: &str = "/api/auth";

libs/database/src/migrations/m20240620_delete_invalid_calendar_events.rs

@@ -0,0 +1,24 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        let db = manager.get_connection();
+        db.execute_unprepared(
+            r#"
+DELETE FROM "calendar_event" WHERE
+"metadata_show_extra_information" ->> 'season' = '0';
+"#,
+        )
+        .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, _manager: &SchemaManager) -> Result<(), DbErr> {
+        Ok(())
+    }
+}

libs/database/src/migrations/mod.rs

@@ -25,6 +25,7 @@ mod m20240607_change_user_primary_key;
 mod m20240607_create_integration;
 mod m20240608_add_created_on_column_to_collection_to_entity;
 mod m20240619_remove_seen_from_media_reason_of_user_to_entity;
+mod m20240620_delete_invalid_calendar_events;
 
 pub use m20230410_create_metadata::Metadata as AliasedMetadata;
 pub use m20230413_create_person::Person as AliasedPerson;
@@ -71,6 +72,7 @@ impl MigratorTrait for Migrator {
             Box::new(m20240607_create_integration::Migration),
             Box::new(m20240608_add_created_on_column_to_collection_to_entity::Migration),
             Box::new(m20240619_remove_seen_from_media_reason_of_user_to_entity::Migration),
+            Box::new(m20240620_delete_invalid_calendar_events::Migration),
         ]
     }
 }