restructure

This commit is contained in:
2026-06-29 23:38:53 +02:00
parent 7faf14fb2f
commit bb17beb80d
68 changed files with 1202 additions and 1088 deletions

View File

@@ -1,11 +1,11 @@
use crate::diary::{deps::GetActivityFeedDeps, queries::GetActivityFeedQuery};
use domain::{
errors::DomainError,
models::FollowingFilter,
models::{
FeedEntry,
collections::{PageParams, Paginated},
},
ports::FollowingFilter,
};
pub async fn execute(

View File

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

View File

@@ -16,7 +16,7 @@ pub struct GetReviewHistoryQuery {
pub struct GetActivityFeedQuery {
pub limit: u32,
pub offset: u32,
pub sort_by: domain::ports::FeedSortBy,
pub sort_by: domain::models::FeedSortBy,
pub search: Option<String>,
pub viewer_user_id: Option<Uuid>,
pub filter_following: bool,

View File

@@ -26,7 +26,7 @@ async fn returns_empty_feed() {
GetActivityFeedQuery {
limit: 10,
offset: 0,
sort_by: domain::ports::FeedSortBy::Date,
sort_by: domain::models::FeedSortBy::Date,
search: None,
viewer_user_id: None,
filter_following: false,
@@ -50,7 +50,7 @@ async fn returns_feed_with_following_filter() {
GetActivityFeedQuery {
limit: 10,
offset: 0,
sort_by: domain::ports::FeedSortBy::Date,
sort_by: domain::models::FeedSortBy::Date,
search: None,
viewer_user_id: Some(viewer),
filter_following: true,
@@ -80,12 +80,12 @@ impl domain::ports::SocialQueryPort for FakeSocialWithFollowing {
async fn get_pending_followers(
&self,
_: uuid::Uuid,
) -> Result<Vec<domain::ports::PendingFollowerInfo>, DomainError> {
) -> Result<Vec<domain::models::PendingFollowerInfo>, DomainError> {
Ok(vec![])
}
async fn list_all_followed_remote_actors(
&self,
) -> Result<Vec<domain::ports::RemoteActorInfo>, DomainError> {
) -> Result<Vec<domain::models::RemoteActorInfo>, DomainError> {
Ok(vec![])
}
}
@@ -123,7 +123,7 @@ async fn following_filter_parses_local_and_remote_urls() {
GetActivityFeedQuery {
limit: 10,
offset: 0,
sort_by: domain::ports::FeedSortBy::Date,
sort_by: domain::models::FeedSortBy::Date,
search: None,
viewer_user_id: Some(viewer),
filter_following: true,
@@ -146,7 +146,7 @@ async fn following_filter_without_viewer_returns_none() {
GetActivityFeedQuery {
limit: 10,
offset: 0,
sort_by: domain::ports::FeedSortBy::Date,
sort_by: domain::models::FeedSortBy::Date,
search: None,
viewer_user_id: None,
filter_following: true,

View File

@@ -2,8 +2,8 @@ use super::*;
use crate::diary::commands::MovieInput;
use domain::{
errors::DomainError,
models::Movie,
ports::{MetadataSearchCriteria, MovieRepository},
models::{MetadataSearchCriteria, Movie},
ports::MovieRepository,
value_objects::{ExternalMetadataId, MovieId, MovieTitle, PosterUrl, ReleaseYear},
};

View File

@@ -4,9 +4,9 @@ use async_trait::async_trait;
use chrono::Utc;
use domain::{
errors::DomainError,
models::Movie,
models::WatchlistEntry,
ports::{MetadataClient, MetadataSearchCriteria, MovieRepository, WatchlistRepository},
models::{MetadataSearchCriteria, Movie},
ports::{MetadataClient, MovieRepository, WatchlistRepository},
testing::{
FakeMetadataClient, InMemoryMovieRepository, InMemoryReviewRepository,
InMemoryWatchlistRepository, NoopEventPublisher,

View File

@@ -74,7 +74,7 @@ struct FakeMetaWithPoster;
impl MetadataClient for FakeMetaWithPoster {
async fn fetch_movie_metadata(
&self,
_: &domain::ports::MetadataSearchCriteria,
_: &domain::models::MetadataSearchCriteria,
) -> Result<Movie, DomainError> {
unimplemented!()
}

View File

@@ -4,11 +4,11 @@ use crate::users::{
};
use domain::{
errors::DomainError,
models::FeedSortBy,
models::{
DiaryEntry, DiaryFilter, SortDirection, UserStats, UserTrends,
collections::{PageParams, Paginated},
},
ports::FeedSortBy,
value_objects::UserId,
};
@@ -143,7 +143,7 @@ mod helper_tests {
#[test]
fn feed_sort_to_direction_all_variants() {
use domain::ports::FeedSortBy;
use domain::models::FeedSortBy;
assert!(matches!(
feed_sort_to_direction(FeedSortBy::Date),
SortDirection::Descending

View File

@@ -3,8 +3,8 @@ use std::sync::Arc;
use crate::users::queries::GetUsersQuery;
use domain::{
errors::DomainError,
models::UserSummary,
ports::{RemoteActorInfo, SocialQueryPort, UserRepository},
models::{RemoteActorInfo, UserSummary},
ports::{SocialQueryPort, UserRepository},
};
pub struct UsersListData {

View File

@@ -40,7 +40,7 @@ pub struct GetUserProfileQuery {
pub view: ProfileView,
pub limit: Option<u32>,
pub offset: Option<u32>,
pub sort_by: domain::ports::FeedSortBy,
pub sort_by: domain::models::FeedSortBy,
pub search: Option<String>,
pub is_own_profile: bool,
}

View File

@@ -51,7 +51,7 @@ async fn returns_profile_with_empty_stats() {
view: ProfileView::Recent,
limit: None,
offset: None,
sort_by: domain::ports::FeedSortBy::Date,
sort_by: domain::models::FeedSortBy::Date,
search: None,
is_own_profile: true,
},
@@ -85,7 +85,7 @@ async fn returns_history_view() {
view: ProfileView::History,
limit: None,
offset: None,
sort_by: domain::ports::FeedSortBy::Date,
sort_by: domain::models::FeedSortBy::Date,
search: None,
is_own_profile: true,
},
@@ -121,7 +121,7 @@ async fn returns_trends_view() {
view: ProfileView::Trends,
limit: None,
offset: None,
sort_by: domain::ports::FeedSortBy::Date,
sort_by: domain::models::FeedSortBy::Date,
search: None,
is_own_profile: true,
},
@@ -157,7 +157,7 @@ async fn returns_ratings_view() {
view: ProfileView::Ratings,
limit: None,
offset: None,
sort_by: domain::ports::FeedSortBy::Rating,
sort_by: domain::models::FeedSortBy::Rating,
search: None,
is_own_profile: true,
},
@@ -191,7 +191,7 @@ async fn returns_recent_with_search() {
view: ProfileView::Recent,
limit: Some(10),
offset: Some(0),
sort_by: domain::ports::FeedSortBy::Date,
sort_by: domain::models::FeedSortBy::Date,
search: Some("blade".into()),
is_own_profile: true,
},
@@ -225,7 +225,7 @@ async fn non_own_profile_skips_pending_followers() {
view: ProfileView::Recent,
limit: None,
offset: None,
sort_by: domain::ports::FeedSortBy::Date,
sort_by: domain::models::FeedSortBy::Date,
search: None,
is_own_profile: false,
},

View File

@@ -1,6 +1,6 @@
use chrono::NaiveDate;
use domain::models::WrapUpMovieRow;
use domain::models::wrapup::{DateRange, WrapUpScope};
use domain::ports::WrapUpMovieRow;
use domain::testing::InMemoryWrapUpStatsQuery;
use uuid::Uuid;