GKaszewski/movies-diary
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

restructure

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-06-29 23:38:53 +02:00
parent 7faf14fb2f
commit bb17beb80d
68 changed files with 1202 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/adapters/activitypub/src/event_handler.rs
View File

@@ -138,7 +138,7 @@ impl ActivityPubEventHandler {
.federation_settings
.get_federation_flags(user_id)
.await
.unwrap_or(domain::ports::FederationFlags {
.unwrap_or(domain::models::FederationFlags {
goals: true,
reviews: true,
watchlist: true,
@@ -204,7 +204,7 @@ impl ActivityPubEventHandler {
.federation_settings
.get_federation_flags(user_id)
.await
.unwrap_or(domain::ports::FederationFlags {
.unwrap_or(domain::models::FederationFlags {
goals: true,
reviews: true,
watchlist: true,
@@ -283,7 +283,7 @@ impl ActivityPubEventHandler {
.federation_settings
.get_federation_flags(user_id)
.await
.unwrap_or(domain::ports::FederationFlags {
.unwrap_or(domain::models::FederationFlags {
goals: true,
reviews: true,
watchlist: true,
@@ -363,7 +363,7 @@ impl ActivityPubEventHandler {
.federation_settings
.get_federation_flags(user_id)
.await
.unwrap_or(domain::ports::FederationFlags {
.unwrap_or(domain::models::FederationFlags {
goals: true,
reviews: true,
watchlist: true,
@@ -403,7 +403,7 @@ impl ActivityPubEventHandler {
.federation_settings
.get_federation_flags(user_id)
.await
.unwrap_or(domain::ports::FederationFlags {
.unwrap_or(domain::models::FederationFlags {
goals: true,
reviews: true,
watchlist: true,
@@ -448,7 +448,7 @@ impl ActivityPubEventHandler {
.federation_settings
.get_federation_flags(user_id)
.await
.unwrap_or(domain::ports::FederationFlags {
.unwrap_or(domain::models::FederationFlags {
goals: true,
reviews: true,
watchlist: true,
@@ -486,7 +486,7 @@ impl ActivityPubEventHandler {
.federation_settings
.get_federation_flags(user_id)
.await
.unwrap_or(domain::ports::FederationFlags {
.unwrap_or(domain::models::FederationFlags {
goals: true,
reviews: true,
watchlist: true,

3
crates/adapters/auth/src/lib.rs
View File

@@ -11,7 +11,8 @@ use uuid::Uuid;
use domain::{
errors::DomainError,
ports::{AuthService, GeneratedToken, PasswordHasher},
models::GeneratedToken,
ports::{AuthService, PasswordHasher},
value_objects::{PasswordHash, UserId},
};

4
crates/adapters/metadata/src/lib.rs
View File

@@ -1,8 +1,8 @@
use async_trait::async_trait;
use domain::{
errors::DomainError,
models::Movie,
ports::{MetadataClient, MetadataSearchCriteria},
models::{MetadataSearchCriteria, Movie},
ports::MetadataClient,
value_objects::{ExternalMetadataId, MovieTitle, PosterUrl, ReleaseYear},
};

2
crates/adapters/metadata/src/omdb.rs
View File

@@ -1,7 +1,7 @@
use async_trait::async_trait;
use domain::{
errors::DomainError,
ports::MetadataSearchCriteria,
models::MetadataSearchCriteria,
value_objects::{ExternalMetadataId, MovieTitle, PosterUrl, ReleaseYear},
};
use serde::Deserialize;

2
crates/adapters/metadata/src/tmdb.rs
View File

@@ -1,7 +1,7 @@
use async_trait::async_trait;
use domain::{
errors::DomainError,
ports::MetadataSearchCriteria,
models::MetadataSearchCriteria,
value_objects::{ExternalMetadataId, MovieTitle, PosterUrl, ReleaseYear},
};
use serde::Deserialize;

8
crates/adapters/postgres-federation/src/lib.rs
View File

@@ -740,7 +740,7 @@ impl domain::ports::SocialQueryPort for PostgresFederationRepository {
async fn list_all_followed_remote_actors(
&self,
) -> Result<Vec<domain::ports::RemoteActorInfo>, domain::errors::DomainError> {
) -> Result<Vec<domain::models::RemoteActorInfo>, domain::errors::DomainError> {
let rows = sqlx::query_as::<_, (String, String, Option<String>)>(
"SELECT DISTINCT ar.url, ar.handle, ar.display_name
FROM ap_remote_actors ar
@@ -753,7 +753,7 @@ impl domain::ports::SocialQueryPort for PostgresFederationRepository {
Ok(rows
.into_iter()
.map(
|(url, handle, display_name)| domain::ports::RemoteActorInfo {
|(url, handle, display_name)| domain::models::RemoteActorInfo {
url,
handle,
display_name,
@@ -795,7 +795,7 @@ impl domain::ports::SocialQueryPort for PostgresFederationRepository {
async fn get_pending_followers(
&self,
user_id: uuid::Uuid,
) -> Result<Vec<domain::ports::PendingFollowerInfo>, domain::errors::DomainError> {
) -> Result<Vec<domain::models::PendingFollowerInfo>, domain::errors::DomainError> {
let uid = user_id.to_string();
let rows = sqlx::query_as::<_, (String, String, Option<String>, Option<String>)>(
"SELECT ar.url, ar.handle, ar.display_name, ar.avatar_url
@@ -810,7 +810,7 @@ impl domain::ports::SocialQueryPort for PostgresFederationRepository {
Ok(rows
.into_iter()
.map(
|(url, handle, display_name, avatar_url)| domain::ports::PendingFollowerInfo {
|(url, handle, display_name, avatar_url)| domain::models::PendingFollowerInfo {
url,
handle,
display_name,

8
crates/adapters/postgres/src/diary.rs
View File

@@ -242,18 +242,18 @@ impl DiaryRepository for PostgresDiaryRepository {
&self,
page: &PageParams,
) -> Result<Paginated<FeedEntry>, DomainError> {
self.query_activity_feed_filtered(page, &domain::ports::FeedSortBy::Date, None, None)
self.query_activity_feed_filtered(page, &domain::models::FeedSortBy::Date, None, None)
.await
}
async fn query_activity_feed_filtered(
&self,
page: &PageParams,
sort_by: &domain::ports::FeedSortBy,
sort_by: &domain::models::FeedSortBy,
search: Option<&str>,
following: Option<&domain::ports::FollowingFilter>,
following: Option<&domain::models::FollowingFilter>,
) -> Result<Paginated<FeedEntry>, DomainError> {
use domain::ports::FeedSortBy;
use domain::models::FeedSortBy;
let limit = page.limit as i64;
let offset = page.offset as i64;

4
crates/adapters/postgres/src/user_settings.rs
View File

@@ -1,8 +1,8 @@
use async_trait::async_trait;
use domain::{
errors::DomainError,
models::UserSettings,
ports::{FederationFlags, UserFederationSettingsQuery, UserSettingsRepository},
models::{FederationFlags, UserSettings},
ports::{UserFederationSettingsQuery, UserSettingsRepository},
value_objects::UserId,
};
use sqlx::{PgPool, Row};

6
crates/adapters/postgres/src/wrapup.rs
View File

@@ -4,8 +4,10 @@ use async_trait::async_trait;
use chrono::NaiveDate;
use domain::{
errors::DomainError,
models::wrapup::{DateRange, WrapUpRecord, WrapUpReport, WrapUpScope, WrapUpStatus},
ports::{WrapUpMovieRow, WrapUpRepository, WrapUpStatsQuery},
models::wrapup::{
DateRange, WrapUpMovieRow, WrapUpRecord, WrapUpReport, WrapUpScope, WrapUpStatus,
},
ports::{WrapUpRepository, WrapUpStatsQuery},
value_objects::WrapUpId,
};
use sqlx::{PgPool, Row};

8
crates/adapters/sqlite-federation/src/lib.rs
View File

@@ -927,7 +927,7 @@ impl domain::ports::SocialQueryPort for SqliteFederationRepository {
async fn list_all_followed_remote_actors(
&self,
) -> Result<Vec<domain::ports::RemoteActorInfo>, domain::errors::DomainError> {
) -> Result<Vec<domain::models::RemoteActorInfo>, domain::errors::DomainError> {
let rows = sqlx::query_as::<_, (String, String, Option<String>)>(
"SELECT DISTINCT ar.url, ar.handle, ar.display_name
FROM ap_remote_actors ar
@@ -941,7 +941,7 @@ impl domain::ports::SocialQueryPort for SqliteFederationRepository {
Ok(rows
.into_iter()
.map(
|(url, handle, display_name)| domain::ports::RemoteActorInfo {
|(url, handle, display_name)| domain::models::RemoteActorInfo {
url,
handle,
display_name,
@@ -983,7 +983,7 @@ impl domain::ports::SocialQueryPort for SqliteFederationRepository {
async fn get_pending_followers(
&self,
user_id: uuid::Uuid,
) -> Result<Vec<domain::ports::PendingFollowerInfo>, domain::errors::DomainError> {
) -> Result<Vec<domain::models::PendingFollowerInfo>, domain::errors::DomainError> {
let uid = user_id.to_string();
let rows = sqlx::query_as::<_, (String, String, Option<String>, Option<String>)>(
"SELECT ar.url, ar.handle, ar.display_name, ar.avatar_url
@@ -998,7 +998,7 @@ impl domain::ports::SocialQueryPort for SqliteFederationRepository {
Ok(rows
.into_iter()
.map(
|(url, handle, display_name, avatar_url)| domain::ports::PendingFollowerInfo {
|(url, handle, display_name, avatar_url)| domain::models::PendingFollowerInfo {
url,
handle,
display_name,

8
crates/adapters/sqlite/src/diary.rs
View File

@@ -223,18 +223,18 @@ impl DiaryRepository for SqliteDiaryRepository {
&self,
page: &PageParams,
) -> Result<Paginated<FeedEntry>, DomainError> {
self.query_activity_feed_filtered(page, &domain::ports::FeedSortBy::Date, None, None)
self.query_activity_feed_filtered(page, &domain::models::FeedSortBy::Date, None, None)
.await
}
async fn query_activity_feed_filtered(
&self,
page: &PageParams,
sort_by: &domain::ports::FeedSortBy,
sort_by: &domain::models::FeedSortBy,
search: Option<&str>,
following: Option<&domain::ports::FollowingFilter>,
following: Option<&domain::models::FollowingFilter>,
) -> Result<Paginated<FeedEntry>, DomainError> {
use domain::ports::FeedSortBy;
use domain::models::FeedSortBy;
let limit = page.limit as i64;
let offset = page.offset as i64;

3
crates/adapters/sqlite/src/tests/diary.rs
View File

@@ -1,7 +1,8 @@
use super::*;
use domain::{
models::collections::PageParams,
ports::{DiaryRepository, FeedSortBy, FollowingFilter},
models::{FeedSortBy, FollowingFilter},
ports::DiaryRepository,
};
use sqlx::SqlitePool;

4
crates/adapters/sqlite/src/user_settings.rs
View File

@@ -1,8 +1,8 @@
use async_trait::async_trait;
use domain::{
errors::DomainError,
models::UserSettings,
ports::{FederationFlags, UserFederationSettingsQuery, UserSettingsRepository},
models::{FederationFlags, UserSettings},
ports::{UserFederationSettingsQuery, UserSettingsRepository},
value_objects::UserId,
};
use sqlx::{Row, SqlitePool};

6
crates/adapters/sqlite/src/wrapup.rs
View File

@@ -4,8 +4,10 @@ use async_trait::async_trait;
use chrono::NaiveDate;
use domain::{
errors::DomainError,
models::wrapup::{DateRange, WrapUpRecord, WrapUpReport, WrapUpScope, WrapUpStatus},
ports::{WrapUpMovieRow, WrapUpRepository, WrapUpStatsQuery},
models::wrapup::{
DateRange, WrapUpMovieRow, WrapUpRecord, WrapUpReport, WrapUpScope, WrapUpStatus,
},
ports::{WrapUpRepository, WrapUpStatsQuery},
value_objects::WrapUpId,
};
use sqlx::{Row, SqlitePool};