Merge pull request #41 from RustyNova016/test/artist_credits

src/models/musicbrainz/artist/finds.rs

@@ -0,0 +1,22 @@
+use crate::models::shared_traits::find_by_mbid::FindByMBID;
+use crate::models::shared_traits::find_by_rowid::FindByRowID;
+
+use super::Artist;
+
+impl FindByRowID for Artist {
+    async fn find_by_rowid(
+        conn: &mut sqlx::SqliteConnection,
+        id: i64,
+    ) -> Result<Option<Self>, crate::Error> {
+        Ok(Self::find_by_id_column(conn, id).await?)
+    }
+}
+
+impl FindByMBID for Artist {
+    async fn find_by_mbid(
+        conn: &mut sqlx::SqliteConnection,
+        id: &str,
+    ) -> Result<Option<Self>, crate::Error> {
+        Ok(Self::find_by_mbid(conn, id).await?)
+    }
+}

src/models/musicbrainz/artist/mod.rs

@@ -1,3 +1,4 @@
+pub mod finds;
 use musicbrainz_db_lite_macros::{MainEntity, Upsert};
 use sqlx::prelude::FromRow;
 

src/models/musicbrainz/genre/finds.rs

@@ -0,0 +1,22 @@
+// use crate::models::shared_traits::find_by_mbid::FindByMBID;
+// use crate::models::shared_traits::find_by_rowid::FindByRowID;
+
+// use super::Genre;
+
+// impl FindByRowID for Genre {
+//     async fn find_by_rowid(
+//             conn: &mut sqlx::SqliteConnection,
+//             id: i64,
+//         ) -> Result<Option<Self>, crate::Error> {
+//         Ok(Self::find_by_id_column(conn, id).await?)
+//     }
+// }
+
+// impl FindByMBID for Genre {
+//     async fn find_by_mbid(
+//             conn: &mut sqlx::SqliteConnection,
+//             id: &str,
+//         ) -> Result<Option<Self>, crate::Error> {
+//         Ok(Self::find_by_mbid(conn, id).await?)
+//     }
+// }

src/models/musicbrainz/genre/mod.rs

@@ -1,3 +1,4 @@
+pub mod finds;
 pub mod genre_tag;
 use sqlx::prelude::FromRow;
 

src/models/musicbrainz/label/finds.rs

@@ -0,0 +1,22 @@
+use crate::models::shared_traits::find_by_mbid::FindByMBID;
+use crate::models::shared_traits::find_by_rowid::FindByRowID;
+
+use super::Label;
+
+impl FindByRowID for Label {
+    async fn find_by_rowid(
+        conn: &mut sqlx::SqliteConnection,
+        id: i64,
+    ) -> Result<Option<Self>, crate::Error> {
+        Ok(Self::find_by_id_column(conn, id).await?)
+    }
+}
+
+impl FindByMBID for Label {
+    async fn find_by_mbid(
+        conn: &mut sqlx::SqliteConnection,
+        id: &str,
+    ) -> Result<Option<Self>, crate::Error> {
+        Ok(Self::find_by_mbid(conn, id).await?)
+    }
+}

src/models/musicbrainz/label/mod.rs

@@ -1,3 +1,4 @@
+pub mod finds;
 use musicbrainz_db_lite_macros::{MainEntity, Upsert};
 use sqlx::FromRow;
 

src/models/musicbrainz/recording/finds.rs

@@ -0,0 +1,22 @@
+use crate::models::shared_traits::find_by_mbid::FindByMBID;
+use crate::models::shared_traits::find_by_rowid::FindByRowID;
+
+use super::Recording;
+
+impl FindByRowID for Recording {
+    async fn find_by_rowid(
+        conn: &mut sqlx::SqliteConnection,
+        id: i64,
+    ) -> Result<Option<Self>, crate::Error> {
+        Ok(Self::find_by_id_column(conn, id).await?)
+    }
+}
+
+impl FindByMBID for Recording {
+    async fn find_by_mbid(
+        conn: &mut sqlx::SqliteConnection,
+        id: &str,
+    ) -> Result<Option<Self>, crate::Error> {
+        Ok(Self::find_by_mbid(conn, id).await?)
+    }
+}

src/models/musicbrainz/recording/mod.rs

@@ -1,3 +1,4 @@
+pub mod finds;
 use chrono::Duration;
 use musicbrainz_db_lite_macros::{MainEntity, Upsert};
 use serde::Deserialize;

src/models/musicbrainz/release/finds.rs

@@ -0,0 +1,22 @@
+use crate::models::shared_traits::find_by_mbid::FindByMBID;
+use crate::models::shared_traits::find_by_rowid::FindByRowID;
+
+use super::Release;
+
+impl FindByRowID for Release {
+    async fn find_by_rowid(
+        conn: &mut sqlx::SqliteConnection,
+        id: i64,
+    ) -> Result<Option<Self>, crate::Error> {
+        Ok(Self::find_by_id_column(conn, id).await?)
+    }
+}
+
+impl FindByMBID for Release {
+    async fn find_by_mbid(
+        conn: &mut sqlx::SqliteConnection,
+        id: &str,
+    ) -> Result<Option<Self>, crate::Error> {
+        Ok(Self::find_by_mbid(conn, id).await?)
+    }
+}

src/models/musicbrainz/release/mod.rs

@@ -1,3 +1,4 @@
+pub mod finds;
 use musicbrainz_db_lite_macros::{MainEntity, Upsert};
 use serde::Deserialize;
 use serde::Serialize;

src/models/musicbrainz/release_group/finds.rs

@@ -0,0 +1,22 @@
+use crate::models::shared_traits::find_by_mbid::FindByMBID;
+use crate::models::shared_traits::find_by_rowid::FindByRowID;
+
+use super::ReleaseGroup;
+
+impl FindByRowID for ReleaseGroup {
+    async fn find_by_rowid(
+        conn: &mut sqlx::SqliteConnection,
+        id: i64,
+    ) -> Result<Option<Self>, crate::Error> {
+        Ok(Self::find_by_id_column(conn, id).await?)
+    }
+}
+
+impl FindByMBID for ReleaseGroup {
+    async fn find_by_mbid(
+        conn: &mut sqlx::SqliteConnection,
+        id: &str,
+    ) -> Result<Option<Self>, crate::Error> {
+        Ok(Self::find_by_mbid(conn, id).await?)
+    }
+}

src/models/musicbrainz/release_group/mod.rs

@@ -1,3 +1,4 @@
+pub mod finds;
 pub mod relations;
 use musicbrainz_db_lite_macros::{MainEntity, Upsert};
 use sqlx::FromRow;

src/models/musicbrainz/work/finds.rs

@@ -0,0 +1,22 @@
+use crate::models::shared_traits::find_by_mbid::FindByMBID;
+use crate::models::shared_traits::find_by_rowid::FindByRowID;
+
+use super::Work;
+
+impl FindByRowID for Work {
+    async fn find_by_rowid(
+        conn: &mut sqlx::SqliteConnection,
+        id: i64,
+    ) -> Result<Option<Self>, crate::Error> {
+        Ok(Self::find_by_id_column(conn, id).await?)
+    }
+}
+
+impl FindByMBID for Work {
+    async fn find_by_mbid(
+        conn: &mut sqlx::SqliteConnection,
+        id: &str,
+    ) -> Result<Option<Self>, crate::Error> {
+        Ok(Self::find_by_mbid(conn, id).await?)
+    }
+}

src/models/musicbrainz/work/mod.rs

@@ -1,3 +1,4 @@
+pub mod finds;
 use musicbrainz_db_lite_macros::{MainEntity, Upsert};
 use sqlx::FromRow;
 

src/models/shared_traits/find_by_mbid.rs

@@ -0,0 +1,29 @@
+use core::ops::Deref;
+
+use super::find_by::FindBy;
+
+pub trait FindByMBID: Sized {
+    fn find_by_mbid(
+        conn: &mut sqlx::SqliteConnection,
+        id: &str,
+    ) -> impl std::future::Future<Output = Result<Option<Self>, crate::Error>> + Send;
+}
+
+pub struct MBID(String);
+
+impl Deref for MBID {
+    type Target = str;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<T: FindByMBID> FindBy<MBID> for T {
+    async fn find_by(
+        conn: &mut sqlx::SqliteConnection,
+        id: MBID,
+    ) -> Result<Option<Self>, crate::Error> {
+        Self::find_by_mbid(conn, &id).await
+    }
+}

src/models/shared_traits/mod.rs

@@ -1,4 +1,5 @@
 pub mod find_by;
+pub mod find_by_mbid;
 pub mod find_by_rowid;
 pub mod has_genre;
 pub mod has_table;