Address 845 (#877)

* feat(frontend): display user ID in profile page

* fix(frontend): do not include stuff

* feat(*): return creator as nested object

* feat(backend): change name of subquery

* feat(backend): return collaborators for collections

* refactor(backend): use aliased entity where suitable

* fix(backend): remove admin account guard

* chore(backend): remove useless variable

* feat(backend): do not ignore issuer id

* feat(backend): empty array when no collaborators

* fix(frontend): display num collaborators

* fix(frontend): do not display if no items

* chore(frontend): change order of stuff to display

* refactor(backend): use aliased table where necessary

* chore(backend): add comment

* feat(backend): add log statement after registering user

* ci: do not draft an update release

* docs: make installation clearer

* chore(backend): add separators

* feat(backend): do not unwrap background jobs completely

* feat(frontend): display edit btn only for collection creator

* feat(landing): update links to new page

* feat(database): migration to remove seen from array

* feat(backend): change name of enum

* feat(backend): fn to get finished status

* refactor(backend): use new function to get whether show is complete

* feat(backend): go through history to determine if media is complete

* refactor(backend): change name of variables to be more meaningful

* fix(database): update correct array element

* fix(backend): append finished to media_reason correctly

* chore(*): remove refs to features page

* chore(graphql): change types

* chore(frontend): adjust to new gql schema

* refactor(frontend): extract function to type correctly

* feat(backend): change name of filter

* fix(frontend): make collections searchable

* feat(backend): handle cases when media is in collection

* feat(backend): if metadata is finished

* feat(backend): store whether seen at least once

* feat(backend): change name of enum element

* fix(backend): remove calendar event when it does not exist

* refactor(backend): reverse logic for deleting invalid calendar events

* chore(backend): remove development mutation

* refactor(backend): change name of associated func

* feat(backend): add trait for ok with tracing

* feat(backend): log traces when certain operations fail

* feat(backend): do not allow information template in input

* chore(database): add comment

* build(backend): upgrade deps

* build: upgrade typescript deps

* feat(frontend): show message when both disabled

* ci: extract startup script

* Revert "ci: extract startup script"

This reverts commit 9936f2c.

* feat(backend): add env variable to sleep server before startup

* ci: add health endpoint

* docs: change health endpoint

* ci: remove extra endpoint from health

Author: IgnisDa

.github/workflows/release.yml

@@ -42,7 +42,8 @@ jobs:
                   ...repo,
                   release_id: existingRelease.id,
                   tag_name: tag,
-                  body: newBody
+                  body: newBody,
+                  draft: false,
                 });
                 console.log("Release updated to associate with new tag.");
               } else {

Cargo.lock

@@ -12,7 +12,7 @@ argon2 = "=0.6.0-pre.0"
 async-graphql = { workspace = true }
 async-graphql-axum = "=7.0.6"
 async-trait = "=0.1.80"
-aws-sdk-s3 = { version = "=1.36.0", features = ["behavior-version-latest"] }
+aws-sdk-s3 = { version = "=1.37.0", features = ["behavior-version-latest"] }
 axum = { version = "=0.7.5", features = ["macros", "multipart"] }
 boilermates = "=0.3.0"
 cached = { version = "=0.51.4", features = ["disk_store"] }

apps/backend/Cargo.toml

@@ -51,7 +51,10 @@ pub struct Model {
 
 #[async_trait]
 impl GraphqlRepresentation for Model {
-    async fn graphql_repr(self, file_storage_service: &Arc<FileStorageService>) -> Result<Self> {
+    async fn graphql_representation(
+        self,
+        file_storage_service: &Arc<FileStorageService>,
+    ) -> Result<Self> {
         let mut converted_exercise = self.clone();
         let mut images = vec![];
         for image in self.attributes.internal_images.iter() {
@@ -78,7 +81,10 @@ pub struct ExerciseListItem {
 
 #[async_trait]
 impl GraphqlRepresentation for ExerciseListItem {
-    async fn graphql_repr(self, file_storage_service: &Arc<FileStorageService>) -> Result<Self> {
+    async fn graphql_representation(
+        self,
+        file_storage_service: &Arc<FileStorageService>,
+    ) -> Result<Self> {
         let mut converted_exercise = self.clone();
         if let Some(img) = self.attributes.internal_images.first() {
             converted_exercise.image =

apps/backend/src/entities/exercise.rs

@@ -39,7 +39,7 @@ pub struct Model {
 
 #[async_trait]
 impl GraphqlRepresentation for Model {
-    async fn graphql_repr(self, file_storage_service: &Arc<FileStorageService>) -> Result<Self> {
+    async fn graphql_representation(self, file_storage_service: &Arc<FileStorageService>) -> Result<Self> {
         let mut cnv_workout = self.clone();
         for image in cnv_workout.information.assets.images.iter_mut() {
             *image = file_storage_service.get_presigned_url(image.clone()).await;

apps/backend/src/entities/workout.rs

@@ -358,7 +358,7 @@ impl ExerciseService {
         let maybe_exercise = Exercise::find_by_id(exercise_id).one(&self.db).await?;
         match maybe_exercise {
             None => Err(Error::new("Exercise with the given ID could not be found.")),
-            Some(e) => Ok(e.graphql_repr(&self.file_storage_service).await?),
+            Some(e) => Ok(e.graphql_representation(&self.file_storage_service).await?),
         }
     }
 
@@ -375,7 +375,7 @@ impl ExerciseService {
             None => Err(Error::new(
                 "Workout with the given ID could not be found for this user.",
             )),
-            Some(e) => Ok(e.graphql_repr(&self.file_storage_service).await?),
+            Some(e) => Ok(e.graphql_representation(&self.file_storage_service).await?),
         }
     }
 
@@ -542,7 +542,7 @@ impl ExerciseService {
                 query.filter(
                     Condition::any()
                         .add(
-                            Expr::col((AliasedExercise::Table, exercise::Column::Id))
+                            Expr::col((AliasedExercise::Table, AliasedExercise::Id))
                                 .ilike(ilike_sql(&v)),
                         )
                         .add(Expr::col(exercise::Column::Identifier).ilike(slugify(v))),
@@ -570,7 +570,9 @@ impl ExerciseService {
             .fetch_page((input.search.page.unwrap() - 1).try_into().unwrap())
             .await?
         {
-            let gql_repr = ex.graphql_repr(&self.file_storage_service).await?;
+            let gql_repr = ex
+                .graphql_representation(&self.file_storage_service)
+                .await?;
             items.push(gql_repr);
         }
         let next_page =

apps/backend/src/fitness/resolver.rs

@@ -23,6 +23,7 @@ use crate::{
         StringIdObject,
     },
     providers::google_books::GoogleBooksService,
+    traits::TraceOk,
     utils::get_base_http_client,
 };
 
@@ -134,7 +135,7 @@ where
                                     ..Default::default()
                                 })
                                 .await
-                                .ok();
+                                .trace_ok();
                                 if let Ok(Some(pe)) =
                                     itunes_podcast_episode_by_name(&episode.title, &itunes_id, db)
                                         .await

apps/backend/src/importer/audiobookshelf.rs

@@ -29,7 +29,7 @@ use crate::{
         },
         BackgroundJob, ChangeCollectionToEntityInput, StringIdObject,
     },
-    traits::AuthProvider,
+    traits::{AuthProvider, TraceOk},
     users::{UserPreferences, UserReviewScale},
     utils::partial_user_by_id,
 };
@@ -626,7 +626,7 @@ impl ImporterService {
         self.media_service
             .deploy_background_job(&user_id, BackgroundJob::CalculateSummary)
             .await
-            .ok();
+            .trace_ok();
         Ok(())
     }
 

apps/backend/src/importer/mod.rs

@@ -16,6 +16,7 @@ use crate::{
     miscellaneous::{audiobookshelf_models, itunes_podcast_episode_by_name},
     models::{media::CommitMediaInput, StringIdObject},
     providers::google_books::GoogleBooksService,
+    traits::TraceOk,
     utils::{get_base_http_client, ilike_sql},
 };
 
@@ -330,7 +331,7 @@ impl IntegrationService {
                                 ..Default::default()
                             })
                             .await
-                            .ok();
+                            .trace_ok();
                             match itunes_podcast_episode_by_name(&pe.title, &itunes_id, &self.db)
                                 .await
                             {

apps/backend/src/integrations.rs

@@ -31,7 +31,11 @@ use sea_orm::{
     ConnectOptions, ConnectionTrait, Database, DatabaseConnection, EntityTrait, PaginatorTrait,
 };
 use sea_orm_migration::MigratorTrait;
-use tokio::{join, net::TcpListener};
+use tokio::{
+    join,
+    net::TcpListener,
+    time::{sleep, Duration as TokioDuration},
+};
 use tower::buffer::BufferLayer;
 use tower_http::{
     catch_panic::CatchPanicLayer as TowerCatchPanicLayer, cors::CorsLayer as TowerCorsLayer,
@@ -85,6 +89,11 @@ async fn main() -> Result<()> {
     tracing::info!("Running version: {}", VERSION);
 
     let config = Arc::new(config::load_app_config()?);
+    if config.server.sleep_before_startup_seconds > 0 {
+        let duration = TokioDuration::from_secs(config.server.sleep_before_startup_seconds);
+        tracing::info!("Sleeping for {:?} before starting up...", duration);
+        sleep(duration).await;
+    }
     let cors_origins = config
         .server
         .cors_origins