Change primary key structures (pass: 1)

Cargo.toml

@@ -4,14 +4,15 @@ resolver = "2"
 
 [workspace.dependencies]
 anyhow = "1.0.82"
-async-graphql = { version = "7.0.3", features = [
+async-graphql = { version = "7.0.5", features = [
     "chrono",
     "decimal",
     "log",
     "tracing",
     "uuid",
 ] }
 chrono = "0.4.38"
+nanoid = "0.4.0"
 schematic = { version = "0.16", features = [
     "config",
     "json",
@@ -24,7 +25,7 @@ schematic = { version = "0.16", features = [
     "renderer_template",
     "yaml",
 ], default-features = false }
-sea-orm = { version = "0.12.15", features = [
+sea-orm = { version = "1.0.0-rc.5", features = [
     "debug-print",
     "postgres-array",
     "macros",
@@ -35,7 +36,7 @@ sea-orm = { version = "0.12.15", features = [
     "with-rust_decimal",
     "with-uuid",
 ], default-features = false }
-sea-orm-migration = "0.12.15"
+sea-orm-migration = "1.0.0-rc.5"
 serde = { version = "1.0.202", features = ["derive"] }
 serde_json = "1.0.116"
 strum = { version = "0.26.2", features = ["derive"] }

apps/backend/Cargo.toml

@@ -1,19 +1,13 @@
 [package]
 name = "ryot"
-version = "5.4.7"
+version = "5.5.0"
 edition = "2021"
 repository = "https://github.com/IgnisDa/ryot"
 license = "GPL-3.0"
 
 [dependencies]
 anyhow = { workspace = true }
-# TODO: Upgrade when https://github.com/geofmureithi/apalis/issues/301 is fixed
-apalis = { version = "0.4.9", features = [
-    "cron",
-    "extensions",
-    "limit",
-    "sqlite",
-] }
+apalis = { version = "0.5.3", features = ["cron", "limit"] }
 argon2 = "0.5.3"
 async-graphql = { workspace = true }
 async-graphql-axum = "7.0.3"
@@ -54,7 +48,7 @@ lettre = { version = "0.11.6", features = [
     "builder",
 ], default-features = false }
 markdown = "1.0.0-alpha.15"
-nanoid = "0.4.0"
+nanoid = { workspace = true }
 openidconnect = "3.5.0"
 paginate = "1.1.11"
 rand = "0.8.5"
@@ -67,19 +61,19 @@ schematic = { workspace = true }
 scraper = "0.19.0"
 sea-orm = { workspace = true }
 sea-orm-migration = { workspace = true }
-sea-query = "0.30.7"
+sea-query = "0.31.0-rc.6"
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_with = { version = "3.7.0", features = ["chrono_0_4"] }
 serde-xml-rs = "0.6.0"
 slug = "0.1.5"
-sqlx = { version = "0.7.4", default-features = false }
 strum = { workspace = true }
 struson = { version = "0.5.0", features = ["serde"] }
 surf = { version = "2.3.2", features = [
     "h1-client-rustls",
 ], default-features = false }
 tokio = { version = "1.37.0", features = ["full"] }
+tower = { version = "0.4.13", features = ["buffer"] }
 tower-http = { version = "0.5.2", features = ["catch-panic", "cors", "trace"] }
 tracing = { workspace = true }
 tracing-subscriber = "0.3.18"

apps/backend/src/background.rs

@@ -33,23 +33,26 @@ impl Job for ScheduledJob {
     const NAME: &'static str = "apalis::ScheduledJob";
 }
 
-pub async fn media_jobs(_information: ScheduledJob, ctx: JobContext) -> Result<(), JobError> {
-    let misc_service = ctx.data::<Arc<MiscellaneousService>>().unwrap();
+pub async fn media_jobs(
+    _information: ScheduledJob,
+    misc_service: Data<Arc<MiscellaneousService>>,
+) -> Result<(), Error> {
     misc_service.perform_media_jobs().await.unwrap();
     Ok(())
 }
 
-pub async fn user_jobs(_information: ScheduledJob, ctx: JobContext) -> Result<(), JobError> {
-    let misc_service = ctx.data::<Arc<MiscellaneousService>>().unwrap();
+pub async fn user_jobs(
+    _information: ScheduledJob,
+    misc_service: Data<Arc<MiscellaneousService>>,
+) -> Result<(), Error> {
     misc_service.perform_user_jobs().await.unwrap();
     Ok(())
 }
 
 pub async fn yank_integrations_data(
     _information: ScheduledJob,
-    ctx: JobContext,
-) -> Result<(), JobError> {
-    let misc_service = ctx.data::<Arc<MiscellaneousService>>().unwrap();
+    misc_service: Data<Arc<MiscellaneousService>>,
+) -> Result<(), Error> {
     tracing::trace!("Getting data from yanked integrations for all users");
     misc_service.yank_integrations_data().await.unwrap();
     Ok(())
@@ -64,15 +67,14 @@ pub enum CoreApplicationJob {
     BulkProgressUpdate(i32, Vec<ProgressUpdateInput>),
 }
 
-impl Job for CoreApplicationJob {
+impl Message for CoreApplicationJob {
     const NAME: &'static str = "apalis::CoreApplicationJob";
 }
 
 pub async fn perform_core_application_job(
     information: CoreApplicationJob,
-    ctx: JobContext,
-) -> Result<(), JobError> {
-    let misc_service = ctx.data::<Arc<MiscellaneousService>>().unwrap();
+    misc_service: Data<Arc<MiscellaneousService>>,
+) -> Result<(), Error> {
     let name = information.to_string();
     tracing::trace!("Started job: {:#?}", name);
     let start = Instant::now();
@@ -100,9 +102,9 @@ pub async fn perform_core_application_job(
 pub enum ApplicationJob {
     ImportFromExternalSource(i32, Box<DeployImportJobInput>),
     ReEvaluateUserWorkouts(i32),
-    UpdateMetadata(i32),
+    UpdateMetadata(String),
     UpdateGithubExerciseJob(Exercise),
-    UpdatePerson(i32),
+    UpdatePerson(String),
     RecalculateCalendarEvents,
     AssociateGroupWithMetadata(MediaLot, MediaSource, String),
     ReviewPosted(ReviewPostedEvent),
@@ -111,18 +113,17 @@ pub enum ApplicationJob {
     PerformBackgroundTasks,
 }
 
-impl Job for ApplicationJob {
+impl Message for ApplicationJob {
     const NAME: &'static str = "apalis::ApplicationJob";
 }
 
 pub async fn perform_application_job(
     information: ApplicationJob,
-    ctx: JobContext,
-) -> Result<(), JobError> {
-    let importer_service = ctx.data::<Arc<ImporterService>>().unwrap();
-    let exporter_service = ctx.data::<Arc<ExporterService>>().unwrap();
-    let misc_service = ctx.data::<Arc<MiscellaneousService>>().unwrap();
-    let exercise_service = ctx.data::<Arc<ExerciseService>>().unwrap();
+    misc_service: Data<Arc<MiscellaneousService>>,
+    importer_service: Data<Arc<ImporterService>>,
+    exporter_service: Data<Arc<ExporterService>>,
+    exercise_service: Data<Arc<ExerciseService>>,
+) -> Result<(), Error> {
     let name = information.to_string();
     tracing::trace!("Started job: {:#?}", name);
     let start = Instant::now();
@@ -140,7 +141,7 @@ pub async fn perform_application_job(
             .await
             .is_ok(),
         ApplicationJob::UpdateMetadata(metadata_id) => misc_service
-            .update_metadata_and_notify_users(metadata_id)
+            .update_metadata_and_notify_users(&metadata_id)
             .await
             .is_ok(),
         ApplicationJob::UpdatePerson(person_id) => misc_service

apps/backend/src/entities/calendar_event.rs

@@ -1,18 +1,20 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
+use async_trait::async_trait;
 use chrono::NaiveDate;
-use sea_orm::entity::prelude::*;
+use nanoid::nanoid;
+use sea_orm::{entity::prelude::*, ActiveValue};
 use serde::{Deserialize, Serialize};
 
 use crate::models::media::{SeenPodcastExtraInformation, SeenShowExtraInformation};
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "calendar_event")]
 pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: i32,
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
     pub date: NaiveDate,
-    pub metadata_id: Option<i32>,
+    pub metadata_id: Option<String>,
     pub metadata_show_extra_information: Option<SeenShowExtraInformation>,
     pub metadata_podcast_extra_information: Option<SeenPodcastExtraInformation>,
 }
@@ -35,4 +37,15 @@ impl Related<super::metadata::Entity> for Entity {
     }
 }
 
-impl ActiveModelBehavior for ActiveModel {}
+#[async_trait]
+impl ActiveModelBehavior for ActiveModel {
+    async fn before_save<C>(mut self, _db: &C, insert: bool) -> Result<Self, DbErr>
+    where
+        C: ConnectionTrait,
+    {
+        if insert {
+            self.id = ActiveValue::Set(format!("cal_{}", nanoid!(12)));
+        }
+        Ok(self)
+    }
+}

apps/backend/src/entities/collection.rs

@@ -1,7 +1,10 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use async_graphql::SimpleObject;
+use async_trait::async_trait;
+use nanoid::nanoid;
 use sea_orm::entity::prelude::*;
+use sea_orm::ActiveValue;
 use serde::{Deserialize, Serialize};
 
 use crate::miscellaneous::CollectionExtraInformation;
@@ -10,8 +13,8 @@ use crate::miscellaneous::CollectionExtraInformation;
 #[sea_orm(table_name = "collection")]
 #[graphql(name = "Collection")]
 pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: i32,
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
     pub created_on: DateTimeUtc,
     pub last_updated_on: DateTimeUtc,
     pub name: String,
@@ -63,4 +66,15 @@ impl Related<super::user_to_collection::Entity> for Entity {
     }
 }
 
-impl ActiveModelBehavior for ActiveModel {}
+#[async_trait]
+impl ActiveModelBehavior for ActiveModel {
+    async fn before_save<C>(mut self, _db: &C, insert: bool) -> Result<Self, DbErr>
+    where
+        C: ConnectionTrait,
+    {
+        if insert {
+            self.id = ActiveValue::Set(format!("col_{}", nanoid!(12)));
+        }
+        Ok(self)
+    }
+}

apps/backend/src/entities/collection_to_entity.rs

@@ -9,10 +9,10 @@ pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
     pub last_updated_on: DateTimeUtc,
-    pub collection_id: i32,
-    pub metadata_id: Option<i32>,
-    pub person_id: Option<i32>,
-    pub metadata_group_id: Option<i32>,
+    pub collection_id: String,
+    pub metadata_id: Option<String>,
+    pub person_id: Option<String>,
+    pub metadata_group_id: Option<String>,
     pub exercise_id: Option<String>,
     pub information: Option<serde_json::Value>,
 }

apps/backend/src/entities/genre.rs

@@ -1,13 +1,15 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.2
 
-use sea_orm::entity::prelude::*;
+use async_trait::async_trait;
+use nanoid::nanoid;
+use sea_orm::{entity::prelude::*, ActiveValue};
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "genre")]
 pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: i32,
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
     #[sea_orm(unique)]
     pub name: String,
 }
@@ -33,4 +35,15 @@ impl Related<super::metadata_to_genre::Entity> for Entity {
     }
 }
 
-impl ActiveModelBehavior for ActiveModel {}
+#[async_trait]
+impl ActiveModelBehavior for ActiveModel {
+    async fn before_save<C>(mut self, _db: &C, insert: bool) -> Result<Self, DbErr>
+    where
+        C: ConnectionTrait,
+    {
+        if insert {
+            self.id = ActiveValue::Set(format!("gen_{}", nanoid!(12)));
+        }
+        Ok(self)
+    }
+}

apps/backend/src/entities/import_report.rs

@@ -1,8 +1,10 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use async_graphql::SimpleObject;
+use async_trait::async_trait;
 use database::ImportSource;
-use sea_orm::entity::prelude::*;
+use nanoid::nanoid;
+use sea_orm::{entity::prelude::*, ActiveValue};
 use serde::{Deserialize, Serialize};
 
 use crate::importer::ImportResultResponse;
@@ -11,8 +13,8 @@ use crate::importer::ImportResultResponse;
 #[sea_orm(table_name = "import_report")]
 #[graphql(name = "ImportReport")]
 pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: i32,
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
     pub user_id: i32,
     pub source: ImportSource,
     pub started_on: DateTimeUtc,
@@ -39,4 +41,15 @@ impl Related<super::user::Entity> for Entity {
     }
 }
 
-impl ActiveModelBehavior for ActiveModel {}
+#[async_trait]
+impl ActiveModelBehavior for ActiveModel {
+    async fn before_save<C>(mut self, _db: &C, insert: bool) -> Result<Self, DbErr>
+    where
+        C: ConnectionTrait,
+    {
+        if insert {
+            self.id = ActiveValue::Set(format!("imp_{}", nanoid!(12)));
+        }
+        Ok(self)
+    }
+}

apps/backend/src/entities/metadata.rs

@@ -1,9 +1,11 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
+use async_trait::async_trait;
 use chrono::NaiveDate;
 use database::{MediaLot, MediaSource};
+use nanoid::nanoid;
 use rust_decimal::Decimal;
-use sea_orm::entity::prelude::*;
+use sea_orm::{entity::prelude::*, ActiveValue};
 use serde::{Deserialize, Serialize};
 
 use crate::models::media::{
@@ -15,8 +17,8 @@ use crate::models::media::{
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize, Default)]
 #[sea_orm(table_name = "metadata")]
 pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: i32,
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
     pub created_on: DateTimeUtc,
     pub lot: MediaLot,
     pub last_updated_on: DateTimeUtc,
@@ -141,4 +143,15 @@ impl Related<super::metadata_group::Entity> for Entity {
     }
 }
 
-impl ActiveModelBehavior for ActiveModel {}
+#[async_trait]
+impl ActiveModelBehavior for ActiveModel {
+    async fn before_save<C>(mut self, _db: &C, insert: bool) -> Result<Self, DbErr>
+    where
+        C: ConnectionTrait,
+    {
+        if insert {
+            self.id = ActiveValue::Set(format!("met_{}", nanoid!(12)));
+        }
+        Ok(self)
+    }
+}