Start with collection collaboration (#824)

* build(backend): remove tower deps

* chore: change the domain name of application

* feat(database): migration to change column name for collection

* chore(backend): adapt to new database schema

* fix(backend): calculate summary correctly

* fix(backend): better calculation of summary

* chore(frontend): adapt to new gql schema

* feat(frontend): add link to people page

* chore(database): change name of migration

* feat(database): migration to create `user_to_collection`

* ci: move commands to single line

* feat(database): migration to create new record entries

* fix(database): add if guard

* feat(database): change the columns around

* feat(database): store whether user is a creator

* chore(database): change name of column

* chore(backend): change the error logged

* feat(backend): create new models

* feat(*): bring back all user_id column

* feat(backend): associate collection with user on creation

* feat(backend): use new model to query for user

* feat(backend): get collection count in one go

* dev: change names of containers

* dev: remove version from compose

* chore(backend): reduce visibility

* feat(backend): return username of creator

* chore(docs): remove double quotes from env file

* fix(backend): query collections instead of user_to_collection

* feat(backend): return names correctly

* feat(frontend): how collections are displayed

* feat(backend): save creator id when changing association

* feat(frontend): do not allow updating custom media

* feat(frontend): start new collection schema changes

* feat(frontend): get media monitoring button working

* chore(backend): change name of gql objects

* feat(backend): get user id for collection

* feat(frontend): remove from correct collection

* feat(frontend): flow collection data correctly

* chore(ts-utils): export utility function

* feat(frontend): allow adding to collection

* chore(frontend): change wording

* chore(frontend): change name of param

* fix(backend): fetch all collections for entity

* fix(backend): associate with collections correctly

* fix(backend): merge media should be done in a txn

* fix(backend): handle cases when media is already in dest collection

* feat(frontend): order of update btns

* build(backend): bump version

* fix(backend): timezone shenanigans

* fix(frontend): better wording

* refactor(backend): associate user with entity immediately

* docs: add back double quotes

* feat(backend): allow storing manga volume

* feat(backend): calculate manga volumes

* feat(frontend): allow setting volume

* fix(frontend): better showing of seen items

* chore(backend): add more logging

* chore(graphql): get additonal manga details

* feat(frontend): display more unit details

* feat(frontend): allow reviewing volumes

* feat(frontend): better layout for input

Author: IgnisDa

.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 {
 	"name": "ryot",
 	"dockerComposeFile": "docker-compose.yml",
-	"service": "app",
+	"service": "ryot-app",
 	"forwardPorts": [],
 	"workspaceFolder": "/workspaces/ryot",
 	"postCreateCommand": ". ${containerWorkspaceFolder}/.devcontainer/scripts/post-create.sh",

.devcontainer/docker-compose.yml

@@ -1,7 +1,5 @@
-version: "3.9"
-
 services:
-  app:
+  ryot-app:
     build:
       context: .
       dockerfile: Dockerfile
@@ -14,7 +12,7 @@ services:
       - "5000:5000"
     user: archlinux
 
-  minio:
+  ryot-minio:
     image: minio/minio
     ports:
       - "9000:9000"
@@ -23,7 +21,7 @@ services:
       - minio_storage:/data
     command: server --console-address ":9001" /data
 
-  postgres:
+  ryot-postgres:
     image: postgres:16-alpine
     restart: unless-stopped
     volumes:

.devcontainer/scripts/post-create.sh

@@ -3,9 +3,3 @@
 # setup the git identities
 git config --global user.name "${GIT_AUTHOR_NAME}"
 git config --global user.email "${GIT_AUTHOR_EMAIL}"
-
-# These are available only in a fish environment
-fish -c '
-# setup dependencies
-moon sync projects
-'

Cargo.lock

@@ -23,7 +23,7 @@
 <p align="center">
     <a href="https://docs.ryot.io" target="_blank">Installation</a> •
     <a href="https://docs.ryot.io/configuration" target="_blank">Configuration</a> •
-    <a href="https://demo.ryot.io" target="_blank">Demo</a>
+    <a href="https://app.ryot.io" target="_blank">Hosted version</a>
 </p>
 
 <br/>

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "ryot"
-version = "5.2.6"
+version = "5.2.7"
 edition = "2021"
 repository = "https://github.com/IgnisDa/ryot"
 license = "GPL-3.0"
@@ -80,7 +80,6 @@ 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/Cargo.toml

@@ -14,7 +14,6 @@ pub struct Model {
     pub last_updated_on: DateTimeUtc,
     pub name: String,
     pub description: Option<String>,
-    #[graphql(skip)]
     pub user_id: i32,
 }
 
@@ -32,6 +31,8 @@ pub enum Relation {
         on_delete = "Cascade"
     )]
     User,
+    #[sea_orm(has_many = "super::user_to_collection::Entity")]
+    UserToCollection,
 }
 
 impl Related<super::collection_to_entity::Entity> for Entity {
@@ -52,4 +53,10 @@ impl Related<super::user::Entity> for Entity {
     }
 }
 
+impl Related<super::user_to_collection::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserToCollection.def()
+    }
+}
+
 impl ActiveModelBehavior for ActiveModel {}

apps/backend/src/entities/collection.rs

@@ -1,13 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3
 
-use async_trait::async_trait;
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-use crate::utils::associate_user_with_entity;
-
-use super::prelude::Collection;
-
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "collection_to_entity")]
 pub struct Model {
@@ -95,28 +90,4 @@ impl Related<super::exercise::Entity> for Entity {
     }
 }
 
-#[async_trait]
-impl ActiveModelBehavior for ActiveModel {
-    async fn after_save<C>(model: Model, db: &C, insert: bool) -> Result<Model, DbErr>
-    where
-        C: ConnectionTrait,
-    {
-        if insert {
-            let collection = Collection::find_by_id(model.collection_id)
-                .one(db)
-                .await?
-                .unwrap();
-            associate_user_with_entity(
-                &collection.user_id,
-                model.metadata_id,
-                model.person_id,
-                model.exercise_id.clone(),
-                model.metadata_group_id,
-                db,
-            )
-            .await
-            .ok();
-        }
-        Ok(model)
-    }
-}
+impl ActiveModelBehavior for ActiveModel {}

apps/backend/src/entities/collection_to_entity.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.15
 
 pub mod prelude;
 
@@ -19,5 +19,6 @@ pub mod review;
 pub mod seen;
 pub mod user;
 pub mod user_measurement;
+pub mod user_to_collection;
 pub mod user_to_entity;
 pub mod workout;

apps/backend/src/entities/mod.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.15
 
 pub use super::calendar_event::Entity as CalendarEvent;
 pub use super::collection::Entity as Collection;
@@ -17,5 +17,6 @@ pub use super::review::Entity as Review;
 pub use super::seen::Entity as Seen;
 pub use super::user::Entity as User;
 pub use super::user_measurement::Entity as UserMeasurement;
+pub use super::user_to_collection::Entity as UserToCollection;
 pub use super::user_to_entity::Entity as UserToEntity;
 pub use super::workout::Entity as Workout;

apps/backend/src/entities/prelude.rs

@@ -76,6 +76,8 @@ pub struct Model {
 pub enum Relation {
     #[sea_orm(has_many = "super::collection::Entity")]
     Collection,
+    #[sea_orm(has_many = "super::exercise::Entity")]
+    Exercise,
     #[sea_orm(has_many = "super::import_report::Entity")]
     ImportReport,
     #[sea_orm(has_many = "super::review::Entity")]
@@ -84,6 +86,8 @@ pub enum Relation {
     Seen,
     #[sea_orm(has_many = "super::user_measurement::Entity")]
     UserMeasurement,
+    #[sea_orm(has_many = "super::user_to_collection::Entity")]
+    UserToCollection,
     #[sea_orm(has_many = "super::user_to_entity::Entity")]
     UserToEntity,
     #[sea_orm(has_many = "super::workout::Entity")]
@@ -96,6 +100,12 @@ impl Related<super::collection::Entity> for Entity {
     }
 }
 
+impl Related<super::exercise::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Exercise.def()
+    }
+}
+
 impl Related<super::import_report::Entity> for Entity {
     fn to() -> RelationDef {
         Relation::ImportReport.def()
@@ -120,6 +130,12 @@ impl Related<super::user_measurement::Entity> for Entity {
     }
 }
 
+impl Related<super::user_to_collection::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserToCollection.def()
+    }
+}
+
 impl Related<super::user_to_entity::Entity> for Entity {
     fn to() -> RelationDef {
         Relation::UserToEntity.def()

apps/backend/src/entities/user.rs

@@ -0,0 +1,46 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.15
+
+use sea_orm::entity::prelude::*;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[sea_orm(table_name = "user_to_collection")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub collection_id: i32,
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub user_id: i32,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::collection::Entity",
+        from = "Column::CollectionId",
+        to = "super::collection::Column::Id",
+        on_update = "Cascade",
+        on_delete = "Cascade"
+    )]
+    Collection,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "Cascade",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::collection::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Collection.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}

apps/backend/src/entities/user_to_collection.rs

@@ -796,6 +796,7 @@ impl ExerciseService {
             &self.db,
             user_id,
             ChangeCollectionToEntityInput {
+                creator_user_id: user_id,
                 collection_name: DefaultCollection::Custom.to_string(),
                 exercise_id: Some(exercise.id.clone()),
                 ..Default::default()

apps/backend/src/fitness/resolver.rs

@@ -396,6 +396,7 @@ impl ImporterService {
                             podcast_episode_number: seen.podcast_episode_number,
                             anime_episode_number: seen.anime_episode_number,
                             manga_chapter_number: seen.manga_chapter_number,
+                            manga_volume_number:seen.manga_volume_number,
                             provider_watched_on: seen.provider_watched_on.clone(),
                             change_state: None,
                         },
@@ -440,6 +441,7 @@ impl ImporterService {
                     .add_entity_to_collection(
                         user_id,
                         ChangeCollectionToEntityInput {
+                            creator_user_id: user_id,
                             collection_name: col.to_string(),
                             metadata_id: Some(metadata.id),
                             ..Default::default()
@@ -509,6 +511,7 @@ impl ImporterService {
                     .add_entity_to_collection(
                         user_id,
                         ChangeCollectionToEntityInput {
+                            creator_user_id: user_id,
                             collection_name: col.to_string(),
                             metadata_id: Some(metadata_id),
                             ..Default::default()
@@ -564,6 +567,7 @@ impl ImporterService {
                     .add_entity_to_collection(
                         user_id,
                         ChangeCollectionToEntityInput {
+                            creator_user_id: user_id,
                             collection_name: col.to_string(),
                             person_id: Some(person.id),
                             ..Default::default()

apps/backend/src/importer/mod.rs

@@ -26,6 +26,7 @@ pub struct IntegrationMedia {
     pub podcast_episode_number: Option<i32>,
     pub anime_episode_number: Option<i32>,
     pub manga_chapter_number: Option<i32>,
+    pub manga_volume_number: Option<i32>,
     pub provider_watched_on: Option<String>,
 }
 
@@ -115,6 +116,7 @@ impl IntegrationService {
             podcast_episode_number: None,
             manga_chapter_number: None,
             anime_episode_number: None,
+            manga_volume_number: None,
         })
     }
 
@@ -244,6 +246,7 @@ impl IntegrationService {
             podcast_episode_number: None,
             anime_episode_number: None,
             manga_chapter_number: None,
+            manga_volume_number: None,
         })
     }
 
@@ -324,6 +327,7 @@ impl IntegrationService {
                     podcast_episode_number: None,
                     anime_episode_number: None,
                     manga_chapter_number: None,
+                    manga_volume_number: None,
                 });
             }
         }