feat(backend): move all background jobs into one

Author: IgnisDa

Cargo.lock

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

apps/backend/Cargo.toml

@@ -33,19 +33,11 @@ impl Job for ScheduledJob {
     const NAME: &'static str = "apalis::ScheduledJob";
 }
 
-pub async fn media_jobs(
+pub async fn background_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,
-    misc_service: Data<Arc<MiscellaneousService>>,
-) -> Result<(), Error> {
-    misc_service.perform_user_jobs().await.unwrap();
+    misc_service.perform_background_jobs().await.unwrap();
     Ok(())
 }
 
@@ -156,8 +148,7 @@ pub async fn perform_application_job(
             misc_service.recalculate_calendar_events().await.is_ok()
         }
         ApplicationJob::PerformBackgroundTasks => {
-            misc_service.perform_user_jobs().await.unwrap();
-            misc_service.perform_media_jobs().await.is_ok()
+            misc_service.perform_background_jobs().await.is_ok()
         }
         ApplicationJob::AssociateGroupWithMetadata(lot, source, identifier) => misc_service
             .commit_metadata_group(CommitMediaInput {

apps/backend/src/background.rs

@@ -42,7 +42,7 @@ use utils::TEMP_DIR;
 
 use crate::{
     background::{
-        media_jobs, perform_application_job, perform_core_application_job, user_jobs,
+        background_jobs, perform_application_job, perform_core_application_job,
         yank_integrations_data,
     },
     entities::prelude::Exercise,
@@ -92,7 +92,6 @@ async fn main() -> Result<()> {
         .map(|f| f.parse().unwrap())
         .collect_vec();
     let rate_limit_count = config.scheduler.rate_limit_num;
-    let user_cleanup_every = config.scheduler.user_cleanup_every;
     let pull_every = config.integration.pull_every;
     let max_file_size = config.server.max_file_size;
     let disable_background_jobs = config.server.disable_background_jobs;
@@ -237,7 +236,6 @@ async fn main() -> Result<()> {
 
     let importer_service_1 = app_services.importer_service.clone();
     let exporter_service_1 = app_services.exporter_service.clone();
-    let media_service_1 = app_services.media_service.clone();
     let media_service_2 = app_services.media_service.clone();
     let media_service_3 = app_services.media_service.clone();
     let media_service_4 = app_services.media_service.clone();
@@ -246,25 +244,9 @@ async fn main() -> Result<()> {
 
     let monitor = async {
         Monitor::<TokioExecutor>::new()
-            // cron jobs
             .register_with_count(
                 1,
-                WorkerBuilder::new("general_user_cleanup")
-                    .stream(
-                        CronStream::new_with_timezone(
-                            Schedule::from_str(&format!("0 0 */{} ? * *", user_cleanup_every))
-                                .unwrap(),
-                            tz,
-                        )
-                        .into_stream(),
-                    )
-                    .layer(ApalisTraceLayer::new())
-                    .data(media_service_1.clone())
-                    .build_fn(user_jobs),
-            )
-            .register_with_count(
-                1,
-                WorkerBuilder::new("general_media_cleanup_job")
+                WorkerBuilder::new("background_jobs")
                     .stream(
                         // every day
                         CronStream::new_with_timezone(
@@ -275,7 +257,7 @@ async fn main() -> Result<()> {
                     )
                     .layer(ApalisTraceLayer::new())
                     .data(media_service_2.clone())
-                    .build_fn(media_jobs),
+                    .build_fn(background_jobs),
             )
             .register_with_count(
                 1,

apps/backend/src/main.rs

@@ -7061,20 +7061,8 @@ GROUP BY m.id;
         Ok(())
     }
 
-    pub async fn perform_user_jobs(&self) -> Result<()> {
-        tracing::debug!("Starting user jobs...");
-
-        tracing::trace!("Cleaning up user and metadata association");
-        self.cleanup_user_and_metadata_association().await?;
-        tracing::trace!("Removing old user summaries and regenerating them");
-        self.regenerate_user_summaries().await?;
-
-        tracing::debug!("Completed user jobs...");
-        Ok(())
-    }
-
-    pub async fn perform_media_jobs(&self) -> Result<()> {
-        tracing::debug!("Starting media jobs...");
+    pub async fn perform_background_jobs(&self) -> Result<()> {
+        tracing::debug!("Starting background jobs...");
 
         tracing::trace!("Invalidating invalid media import jobs");
         self.invalidate_import_jobs().await.unwrap();
@@ -7098,10 +7086,14 @@ GROUP BY m.id;
         self.queue_notifications_for_released_media().await.unwrap();
         tracing::trace!("Sending all pending notifications");
         self.send_pending_notifications().await.unwrap();
+        tracing::trace!("Cleaning up user and metadata association");
+        self.cleanup_user_and_metadata_association().await?;
+        tracing::trace!("Removing old user summaries and regenerating them");
+        self.regenerate_user_summaries().await?;
         tracing::trace!("Removing useless data");
         self.remove_useless_data().await?;
 
-        tracing::debug!("Completed media jobs...");
+        tracing::debug!("Completed background jobs...");
         Ok(())
     }
 

apps/backend/src/miscellaneous/resolver.rs

@@ -155,11 +155,6 @@ scheduler:
   # @envvar SCHEDULER_RATE_LIMIT_NUM
   rate_limit_num: 5
 
-  # Deploy a job every x hours that performs user cleanup and summary
-  # calculation.
-  # @envvar SCHEDULER_USER_CLEANUP_EVERY
-  user_cleanup_every: 12
-
 # Settings related to server.
 server:
   # The path where the config file will be written once the server boots up.

docs/includes/backend-config-schema.yaml

@@ -313,10 +313,6 @@ pub struct SchedulerConfig {
     /// the background.
     #[setting(default = 5)]
     pub rate_limit_num: u64,
-    /// Deploy a job every x hours that performs user cleanup and summary
-    /// calculation.
-    #[setting(default = 12)]
-    pub user_cleanup_every: i32,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Config)]