Metadata group search (#721)

* feat(migrations): add column for metadata group id

* feat(database): dedent the constraint SQL

* feat(frontend): redirect if not authenticated

* feat(backend): generate entities for new db schema

* feat(migrations): migration data for user_to_metadata_group

* feat(backend): return only metadata groups related to user in list page

* fix(frontend): send auth details for media group list

* fix(backend): join correct table

* feat(backend): do not send version in coredetails

* fix(frontend): do not display version in frontend

* refactor(backend): allow associating user_to_entity with metadata group

* chore(frontend): adapt to new gql schema

* refactor(frontend): move media ownership modal to common action

* feat(frontend): allow creating media ownership for metadata groups

* fix(frontend): post to correct endpoint

* feat(frontend): allow owning media groups

* fix(backend): case export attributes correctly

* feat(migrations): change name of column

* feat(backend): change name of column in entity

* fix(migrations): user_to_entity will now be updated

* feat(backend): store correct media to entity reason

* fix(backend): update correctly

* fix(frontend): add correct imports

* feat(backend): return monitored and ownership details for metadata group

* feat(backend): return ownership details for metadata group

* fix(frontend): display correct data

* feat(backend): display media ownership status for metadata group

* ci: change order of tool installation

* fix(frontend): prevent infinite loop of setting cookies

* ci: update changelog

* feat(*): merge main branch

* feat(*): lowercase all cookie extractions

Also lowercase all cookie insertions. This change affects
both frontend and backend.

* refactor(frontend): remove useless application key declarations

* feat(backend): add trait for searching metadata groups

* fix(frontend): bring back common action

* fix(backend): mask server smtp credentials

* feat(frontend): allow associating reminders with groups

* refactor(frontend): change name of prop

* refactor(frontend): no useless ternary

* feat(frontend): allow monitoring groups

* fix(backend): add validation before updating dashboard elements

* fix(backend): add validation before notifications to send

* fix(backend): do not preform validation for notifs to send

* feat(backend): store config variables for other prefs

* feat(database): migrations for new user preferences

* fix(database): set to correct value for new prefs

* feat(frontend): allow updating other prefs

* feat(frontend): respect new user preferences

* feat(backend): add resolver to get metadata group search

* feat(backend): start implementing tmdb movie group search

* feat(backend): handle including nsfw in people search

* feat(backend): allow searching for tmdb movie groups

* chore(backend): change types of models

* feat(backend): allow searching for igdb collections

* feat(backend): allow committing metadata groups to database

* fix(backend): filter by correct attribute

* fix(backend): do not do an existence check for metadata groups

* build(backend): bump version

* style(frontend): change order of elements

* feat(frontend): change route location

* feat(frontend): start support for metadata group search

* chore(frontend): further search logic

* fix(frontend): correctly nest search tab

* feat(frontend): allow committing metadata groups

* refactor(backend): change name of core enum

* chore(frontend): adapt to new gql schema

* refactor(backend): change name of fn args

* fix(backend): make suggestion filter more accurate

* perf(backend): more accurate query for cleaning ute

* fix(backend): get correct frontend url

* feat(database): add migration for partial metadata groups

* feat(backend): allow saving partial metadata groups

* feat(frontend): display info about partial metadata

* fix(database): add check before rename

* style(frontend): change order of imports

* fix(frontend): new style for episodes for shows

* fix(backend): add logging when getting openlibrary books

* fix(backend): do not update person specifics

Author: IgnisDa

.devcontainer/Dockerfile

@@ -1,8 +1,8 @@
 FROM ignisda/archlinux:latest
 
+RUN npm install --global yaml-language-server@next
 RUN paru -Syy --noconfirm caddy postgresql
 RUN cargo binstall sea-orm-cli cargo-dist --locked --secure --no-confirm
 RUN curl -L https://fly.io/install.sh | sh
 RUN fish_add_path -Ua "/home/$USERNAME/.fly/bin"
-RUN proto install-global node yaml-language-server@next
 RUN curl -sSL https://install.python-poetry.org | python3 -

Cargo.lock

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

apps/backend/Cargo.toml

@@ -3,7 +3,7 @@ use std::{env, sync::Arc, time::Instant};
 use apalis::prelude::{Job, JobContext, JobError};
 use chrono::DateTime;
 use chrono_tz::Tz;
-use database::{MediaSource, MetadataLot};
+use database::{MediaLot, MediaSource};
 use serde::{Deserialize, Serialize};
 use strum::Display;
 
@@ -14,7 +14,7 @@ use crate::{
     miscellaneous::resolver::MiscellaneousService,
     models::{
         fitness::Exercise,
-        media::{ProgressUpdateInput, ReviewPostedEvent},
+        media::{CommitMediaInput, ProgressUpdateInput, ReviewPostedEvent},
         ExportItem,
     },
 };
@@ -153,7 +153,7 @@ pub enum ApplicationJob {
     UpdateExerciseJob(Exercise),
     UpdatePerson(i32),
     RecalculateCalendarEvents,
-    AssociateGroupWithMetadata(MetadataLot, MediaSource, String),
+    AssociateGroupWithMetadata(MediaLot, MediaSource, String),
     ReviewPosted(ReviewPostedEvent),
     PerformExport(i32, Vec<ExportItem>),
     RecalculateUserSummary(i32),
@@ -201,8 +201,12 @@ pub async fn perform_application_job(
         ApplicationJob::RecalculateCalendarEvents => {
             misc_service.recalculate_calendar_events().await.is_ok()
         }
-        ApplicationJob::AssociateGroupWithMetadata(lot, source, group_identifier) => misc_service
-            .associate_group_with_metadata(lot, source, group_identifier)
+        ApplicationJob::AssociateGroupWithMetadata(lot, source, identifier) => misc_service
+            .commit_metadata_group(CommitMediaInput {
+                lot,
+                source,
+                identifier,
+            })
             .await
             .is_ok(),
         ApplicationJob::ReviewPosted(event) => {

apps/backend/src/background.rs

@@ -111,6 +111,7 @@ impl ActiveModelBehavior for ActiveModel {
                 model.metadata_id,
                 model.person_id,
                 model.exercise_id.clone(),
+                model.metadata_group_id,
                 db,
             )
             .await

apps/backend/src/entities/collection_to_entity.rs

@@ -1,7 +1,7 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use chrono::NaiveDate;
-use database::{MediaSource, MetadataLot};
+use database::{MediaLot, MediaSource};
 use rust_decimal::Decimal;
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -18,7 +18,7 @@ pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
     pub created_on: DateTimeUtc,
-    pub lot: MetadataLot,
+    pub lot: MediaLot,
     pub last_updated_on: DateTimeUtc,
     pub title: String,
     pub identifier: String,

apps/backend/src/entities/metadata.rs

@@ -1,8 +1,8 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.14
 
 use async_graphql::SimpleObject;
 use boilermates::boilermates;
-use database::{MediaSource, MetadataLot};
+use database::{MediaLot, MediaSource};
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
@@ -16,17 +16,19 @@ pub struct Model {
     #[boilermates(not_in("MetadataGroupWithoutId"))]
     #[sea_orm(primary_key)]
     pub id: i32,
-    pub parts: i32,
     pub identifier: String,
+    pub lot: MediaLot,
+    pub source: MediaSource,
+    pub parts: i32,
     pub title: String,
-    pub description: Option<String>,
     #[sea_orm(column_type = "Json")]
     #[graphql(skip)]
     pub images: Vec<MetadataImage>,
     #[sea_orm(ignore)]
     pub display_images: Vec<String>,
-    pub lot: MetadataLot,
-    pub source: MediaSource,
+    #[boilermates(not_in("MetadataGroupWithoutId"))]
+    pub is_partial: Option<bool>,
+    pub description: Option<String>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -37,6 +39,8 @@ pub enum Relation {
     MetadataToMetadataGroup,
     #[sea_orm(has_many = "super::review::Entity")]
     Review,
+    #[sea_orm(has_many = "super::user_to_entity::Entity")]
+    UserToEntity,
 }
 
 impl Related<super::collection_to_entity::Entity> for Entity {
@@ -57,6 +61,12 @@ impl Related<super::review::Entity> for Entity {
     }
 }
 
+impl Related<super::user_to_entity::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserToEntity.def()
+    }
+}
+
 impl Related<super::metadata::Entity> for Entity {
     fn to() -> RelationDef {
         super::metadata_to_metadata_group::Relation::Metadata.def()

apps/backend/src/entities/metadata_group.rs

@@ -123,6 +123,7 @@ impl ActiveModelBehavior for ActiveModel {
                 model.metadata_id,
                 model.person_id,
                 None,
+                model.metadata_group_id,
                 db,
             )
             .await

apps/backend/src/entities/review.rs

@@ -93,9 +93,16 @@ impl ActiveModelBehavior for ActiveModel {
         C: ConnectionTrait,
     {
         if insert {
-            associate_user_with_entity(&model.user_id, Some(model.metadata_id), None, None, db)
-                .await
-                .ok();
+            associate_user_with_entity(
+                &model.user_id,
+                Some(model.metadata_id),
+                None,
+                None,
+                None,
+                db,
+            )
+            .await
+            .ok();
         }
         Ok(model)
     }

apps/backend/src/entities/seen.rs

@@ -23,7 +23,7 @@ use crate::models::fitness::UserMeasurementStats;
     Schematic,
 )]
 #[graphql(name = "UserMeasurement", input_name = "UserMeasurementInput")]
-#[schematic(rename = "UserMeasurement")]
+#[schematic(rename = "UserMeasurement", rename_all = "snake_case")]
 #[sea_orm(table_name = "user_measurement")]
 pub struct Model {
     /// The date and time this measurement was made.

apps/backend/src/entities/user_measurement.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.14
 
 use async_graphql::SimpleObject;
 use sea_orm::entity::prelude::*;
@@ -21,7 +21,7 @@ pub struct Model {
     pub person_id: Option<i32>,
     pub metadata_id: Option<i32>,
     pub exercise_id: Option<String>,
-    pub metadata_ownership: Option<UserMediaOwnership>,
+    pub media_ownership: Option<UserMediaOwnership>,
     pub metadata_units_consumed: Option<i32>,
     pub exercise_extra_information: Option<UserToExerciseExtraInformation>,
     pub exercise_num_times_interacted: Option<i32>,
@@ -31,6 +31,7 @@ pub struct Model {
     pub media_monitored: Option<bool>,
     #[graphql(skip)]
     pub needs_to_be_updated: Option<bool>,
+    pub metadata_group_id: Option<i32>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -51,6 +52,14 @@ pub enum Relation {
         on_delete = "Cascade"
     )]
     Metadata,
+    #[sea_orm(
+        belongs_to = "super::metadata_group::Entity",
+        from = "Column::MetadataGroupId",
+        to = "super::metadata_group::Column::Id",
+        on_update = "Cascade",
+        on_delete = "Cascade"
+    )]
+    MetadataGroup,
     #[sea_orm(
         belongs_to = "super::person::Entity",
         from = "Column::PersonId",
@@ -81,6 +90,12 @@ impl Related<super::metadata::Entity> for Entity {
     }
 }
 
+impl Related<super::metadata_group::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::MetadataGroup.def()
+    }
+}
+
 impl Related<super::person::Entity> for Entity {
     fn to() -> RelationDef {
         Relation::Person.def()

apps/backend/src/entities/user_to_entity.rs

@@ -20,7 +20,7 @@ use crate::{
 )]
 #[sea_orm(table_name = "workout")]
 #[graphql(name = "Workout")]
-#[schematic(rename = "Workout")]
+#[schematic(rename = "Workout", rename_all = "snake_case")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: String,

apps/backend/src/entities/workout.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
 use async_graphql::Result;
 use data_encoding::BASE64;
-use database::{MediaSource, MetadataLot};
+use database::{MediaLot, MediaSource};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use strum::Display;
@@ -80,7 +80,7 @@ pub async fn import(input: DeployAudiobookshelfImportInput) -> Result<ImportResu
             let metadata = item.media.unwrap().metadata.unwrap();
             match item.media_type.unwrap() {
                 MediaType::Book => {
-                    let lot = MetadataLot::AudioBook;
+                    let lot = MediaLot::AudioBook;
                     if let Some(asin) = metadata.asin {
                         media.push(ImportOrExportMediaItem {
                             internal_identifier: Some(ImportOrExportItemIdentifier::NeedsDetails {

apps/backend/src/importer/audiobookshelf.rs

@@ -4,7 +4,7 @@ use async_graphql::Result;
 use chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use convert_case::{Case, Casing};
 use csv::Reader;
-use database::{MediaSource, MetadataLot};
+use database::{MediaLot, MediaSource};
 use itertools::Itertools;
 use rust_decimal::Decimal;
 use rust_decimal_macros::dec;
@@ -43,7 +43,7 @@ pub async fn import(
     input: DeployGoodreadsImportInput,
     isbn_service: &GoogleBooksService,
 ) -> Result<ImportResult> {
-    let lot = MetadataLot::Book;
+    let lot = MediaLot::Book;
     let source = MediaSource::GoogleBooks;
     let mut media = vec![];
     let mut failed_items = vec![];

apps/backend/src/importer/goodreads.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use async_graphql::Result;
-use database::{MediaSource, MetadataLot};
+use database::{MediaLot, MediaSource};
 use flate2::bufread::GzDecoder;
 use rs_utils::{convert_naive_to_utc, convert_string_to_date};
 use rust_decimal::{prelude::FromPrimitive, Decimal};
@@ -40,7 +40,7 @@ fn get_date(date: String) -> Option<DateTimeUtc> {
     }
 }
 
-fn convert_to_format(item: Item, lot: MetadataLot) -> ImportOrExportMediaItem {
+fn convert_to_format(item: Item, lot: MediaLot) -> ImportOrExportMediaItem {
     let progress = if item.done != 0 && item.total != 0 {
         Some(item.done / item.total)
     } else {
@@ -82,10 +82,10 @@ pub async fn import(input: DeployMalImportInput) -> Result<ImportResult> {
     let manga_data = decode_data::<DataRoot>(&input.manga_path)?;
     let mut media = vec![];
     for item in anime_data.items.into_iter() {
-        media.push(convert_to_format(item, MetadataLot::Anime));
+        media.push(convert_to_format(item, MediaLot::Anime));
     }
     for item in manga_data.items.into_iter() {
-        media.push(convert_to_format(item, MetadataLot::Manga));
+        media.push(convert_to_format(item, MediaLot::Manga));
     }
     Ok(ImportResult {
         media,

apps/backend/src/importer/mal.rs

@@ -1,5 +1,5 @@
 use async_graphql::Result;
-use database::{MediaSource, MetadataLot, Visibility};
+use database::{MediaLot, MediaSource, Visibility};
 use rust_decimal::Decimal;
 use rust_decimal_macros::dec;
 use sea_orm::prelude::DateTimeUtc;
@@ -35,7 +35,7 @@ enum MediaType {
     Audiobook,
 }
 
-impl From<MediaType> for MetadataLot {
+impl From<MediaType> for MediaLot {
     fn from(value: MediaType) -> Self {
         match value {
             MediaType::Book => Self::Book,
@@ -222,7 +222,7 @@ pub async fn import(input: DeployMediaTrackerImportInput) -> Result<ImportResult
                 continue;
             }
         };
-        let lot = MetadataLot::from(media_type.clone());
+        let lot = MediaLot::from(media_type.clone());
         let mut rsp = client.get(format!("details/{}", d.id)).await.unwrap();
         let details: ItemDetails = match rsp.body_json().await {
             Ok(s) => s,

apps/backend/src/importer/media_tracker.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use apalis::prelude::Storage;
 use async_graphql::{Context, Enum, InputObject, Object, Result, SimpleObject};
 use chrono::{Duration, Utc};
-use database::{ImportSource, MetadataLot};
+use database::{ImportSource, MediaLot};
 use itertools::Itertools;
 use rust_decimal::Decimal;
 use rust_decimal_macros::dec;
@@ -149,7 +149,7 @@ pub enum ImportFailStep {
     Debug, SimpleObject, FromJsonQueryResult, Serialize, Deserialize, Eq, PartialEq, Clone,
 )]
 pub struct ImportFailedItem {
-    lot: Option<MetadataLot>,
+    lot: Option<MediaLot>,
     step: ImportFailStep,
     identifier: String,
     error: Option<String>,

apps/backend/src/importer/mod.rs

@@ -3,7 +3,7 @@ use std::fs;
 use async_graphql::Result;
 use chrono::NaiveDate;
 use csv::Reader;
-use database::{MediaSource, MetadataLot};
+use database::{MediaLot, MediaSource};
 use rs_utils::convert_naive_to_utc;
 use rust_decimal::Decimal;
 use rust_decimal_macros::dec;
@@ -48,7 +48,7 @@ pub async fn import(input: DeployMovaryImportInput) -> Result<ImportResult> {
     let ratings = fs::read_to_string(&input.ratings)?;
     let history = fs::read_to_string(&input.history)?;
     let watchlist = fs::read_to_string(&input.watchlist)?;
-    let lot = MetadataLot::Movie;
+    let lot = MediaLot::Movie;
     let source = MediaSource::Tmdb;
     let mut media = vec![];
     let mut failed_items = vec![];