New fitness analytics page

apps/backend/Cargo.toml

@@ -15,13 +15,11 @@ axum = { workspace = true }
 aws-sdk-s3 = { workspace = true }
 background = { path = "../../crates/background" }
 cache-service = { path = "../../crates/services/cache" }
-chrono = { workspace = true }
 chrono-tz = { workspace = true }
 collection-resolver = { path = "../../crates/resolvers/collection" }
 collection-service = { path = "../../crates/services/collection" }
 common-utils = { path = "../../crates/utils/common" }
 config = { path = "../../crates/config" }
-database-models = { path = "../../crates/models/database" }
 dependent-models = { path = "../../crates/models/dependent" }
 dotenvy = { workspace = true }
 env-utils = { path = "../../crates/utils/env" }
@@ -31,6 +29,7 @@ file-storage-resolver = { path = "../../crates/resolvers/file-storage" }
 file-storage-service = { path = "../../crates/services/file-storage" }
 fitness-resolver = { path = "../../crates/resolvers/fitness" }
 fitness-service = { path = "../../crates/services/fitness" }
+futures = { workspace = true }
 http = { workspace = true }
 importer-resolver = { path = "../../crates/resolvers/importer" }
 importer-service = { path = "../../crates/services/importer" }
@@ -46,9 +45,7 @@ reqwest = { workspace = true }
 router-resolver = { path = "../../crates/resolvers/router" }
 sea-orm = { workspace = true }
 sea-orm-migration = { workspace = true }
-serde = { workspace = true }
 serde_json = { workspace = true }
-serde_with = { workspace = true }
 schematic = { workspace = true }
 statistics-resolver = { path = "../../crates/resolvers/statistics" }
 statistics-service = { path = "../../crates/services/statistics" }
@@ -58,6 +55,6 @@ tower = { workspace = true }
 tower-http = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-unkey = { workspace = true }
+traits = { path = "../../crates/traits" }
 user-resolver = { path = "../../crates/resolvers/user" }
 user-service = { path = "../../crates/services/user" }

apps/backend/src/common.rs

@@ -19,8 +19,8 @@ use exporter_resolver::{ExporterMutation, ExporterQuery};
 use exporter_service::ExporterService;
 use file_storage_resolver::{FileStorageMutation, FileStorageQuery};
 use file_storage_service::FileStorageService;
-use fitness_resolver::{ExerciseMutation, ExerciseQuery};
-use fitness_service::ExerciseService;
+use fitness_resolver::{FitnessMutation, FitnessQuery};
+use fitness_service::FitnessService;
 use importer_resolver::{ImporterMutation, ImporterQuery};
 use importer_service::ImporterService;
 use integration_service::IntegrationService;
@@ -49,15 +49,14 @@ pub struct AppServices {
     pub app_router: Router,
     pub importer_service: Arc<ImporterService>,
     pub exporter_service: Arc<ExporterService>,
-    pub exercise_service: Arc<ExerciseService>,
+    pub fitness_service: Arc<FitnessService>,
     pub statistics_service: Arc<StatisticsService>,
     pub integration_service: Arc<IntegrationService>,
     pub miscellaneous_service: Arc<MiscellaneousService>,
 }
 
 #[allow(clippy::too_many_arguments)]
 pub async fn create_app_services(
-    is_pro: bool,
     db: DatabaseConnection,
     timezone: chrono_tz::Tz,
     s3_client: aws_sdk_s3::Client,
@@ -73,7 +72,6 @@ pub async fn create_app_services(
     let cache_service = CacheService::new(&db);
     let supporting_service = Arc::new(
         SupportingService::new(
-            is_pro,
             &db,
             timezone,
             cache_service,
@@ -87,7 +85,7 @@ pub async fn create_app_services(
     );
     let user_service = Arc::new(UserService(supporting_service.clone()));
     let importer_service = Arc::new(ImporterService(supporting_service.clone()));
-    let exercise_service = Arc::new(ExerciseService(supporting_service.clone()));
+    let fitness_service = Arc::new(FitnessService(supporting_service.clone()));
     let exporter_service = Arc::new(ExporterService(supporting_service.clone()));
     let collection_service = Arc::new(CollectionService(supporting_service.clone()));
     let statistics_service = Arc::new(StatisticsService(supporting_service.clone()));
@@ -104,7 +102,7 @@ pub async fn create_app_services(
     .data(user_service.clone())
     .data(importer_service.clone())
     .data(exporter_service.clone())
-    .data(exercise_service.clone())
+    .data(fitness_service.clone())
     .data(statistics_service.clone())
     .data(collection_service.clone())
     .data(file_storage_service.clone())
@@ -149,7 +147,7 @@ pub async fn create_app_services(
         app_router,
         importer_service,
         exporter_service,
-        exercise_service,
+        fitness_service,
         statistics_service,
         integration_service,
         miscellaneous_service,
@@ -192,7 +190,7 @@ pub struct QueryRoot(
     MiscellaneousQuery,
     ImporterQuery,
     ExporterQuery,
-    ExerciseQuery,
+    FitnessQuery,
     FileStorageQuery,
     StatisticsQuery,
     CollectionQuery,
@@ -204,7 +202,7 @@ pub struct MutationRoot(
     MiscellaneousMutation,
     ImporterMutation,
     ExporterMutation,
-    ExerciseMutation,
+    FitnessMutation,
     FileStorageMutation,
     CollectionMutation,
     UserMutation,

apps/backend/src/job.rs

@@ -4,27 +4,41 @@ use apalis::prelude::*;
 use background::{ApplicationJob, CoreApplicationJob, ScheduledJob};
 use common_utils::ryot_log;
 use exporter_service::ExporterService;
-use fitness_service::ExerciseService;
+use fitness_service::FitnessService;
 use importer_service::ImporterService;
 use integration_service::IntegrationService;
 use media_models::CommitMediaInput;
 use miscellaneous_service::MiscellaneousService;
 use statistics_service::StatisticsService;
+use traits::TraceOk;
 
-pub async fn background_jobs(
+pub async fn run_background_jobs(
     information: ScheduledJob,
     misc_service: Data<Arc<MiscellaneousService>>,
 ) -> Result<(), Error> {
     ryot_log!(debug, "Running job at {:#?}", information.0);
-    misc_service.perform_background_jobs().await.unwrap();
+    misc_service.perform_background_jobs().await.trace_ok();
     Ok(())
 }
 
-pub async fn sync_integrations_data(
+pub async fn run_frequent_jobs(
     _information: ScheduledJob,
+    fitness_service: Data<Arc<FitnessService>>,
+    misc_service: Data<Arc<MiscellaneousService>>,
     integration_service: Data<Arc<IntegrationService>>,
 ) -> Result<(), Error> {
-    integration_service.yank_integrations_data().await.unwrap();
+    misc_service
+        .perform_server_key_validation()
+        .await
+        .trace_ok();
+    integration_service
+        .yank_integrations_data()
+        .await
+        .trace_ok();
+    fitness_service
+        .process_users_scheduled_for_workout_revision()
+        .await
+        .trace_ok();
     Ok(())
 }
 
@@ -67,7 +81,7 @@ pub async fn perform_application_job(
     integration_service: Data<Arc<IntegrationService>>,
     importer_service: Data<Arc<ImporterService>>,
     exporter_service: Data<Arc<ExporterService>>,
-    exercise_service: Data<Arc<ExerciseService>>,
+    fitness_service: Data<Arc<FitnessService>>,
     statistics_service: Data<Arc<StatisticsService>>,
 ) -> Result<(), Error> {
     let name = information.to_string();
@@ -84,10 +98,9 @@ pub async fn perform_application_job(
                 .await
                 .is_ok()
         }
-        ApplicationJob::ReEvaluateUserWorkouts(user_id) => exercise_service
-            .re_evaluate_user_workouts(user_id)
-            .await
-            .is_ok(),
+        ApplicationJob::ReviseUserWorkouts(user_id) => {
+            fitness_service.revise_user_workouts(user_id).await.is_ok()
+        }
         ApplicationJob::UpdateMetadata(metadata_id, force_update) => misc_service
             .update_metadata_and_notify_users(&metadata_id, force_update)
             .await
@@ -104,7 +117,7 @@ pub async fn perform_application_job(
             .update_metadata_group(&metadata_group_id)
             .await
             .is_ok(),
-        ApplicationJob::UpdateGithubExerciseJob(exercise) => exercise_service
+        ApplicationJob::UpdateGithubExerciseJob(exercise) => fitness_service
             .update_github_exercise(exercise)
             .await
             .is_ok(),
@@ -126,12 +139,22 @@ pub async fn perform_application_job(
         ApplicationJob::PerformExport(user_id) => {
             exporter_service.perform_export(user_id).await.is_ok()
         }
-        ApplicationJob::UpdateExerciseLibrary => exercise_service
+        ApplicationJob::UpdateExerciseLibrary => fitness_service
             .deploy_update_exercise_library_job()
             .await
             .is_ok(),
         ApplicationJob::SyncIntegrationsData => {
-            integration_service.yank_integrations_data().await.is_ok()
+            integration_service
+                .yank_integrations_data()
+                .await
+                .trace_ok();
+            integration_service
+                .sync_integrations_data_to_owned_collection()
+                .await
+                .is_ok()
+        }
+        ApplicationJob::PerformServerKeyValidation => {
+            misc_service.perform_server_key_validation().await.is_ok()
         }
         ApplicationJob::HandleEntityAddedToCollectionEvent(collection_to_entity_id) => {
             integration_service