restructure

crates/application/src/diary/get_activity_feed.rs

@@ -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(

crates/application/src/diary/movie_resolver.rs

@@ -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},
 };
 

crates/application/src/diary/queries.rs

@@ -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,

crates/application/src/diary/tests/get_activity_feed.rs

@@ -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,

crates/application/src/diary/tests/movie_resolver.rs

@@ -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},
 };
 

crates/application/src/diary/tests/review_logger.rs

@@ -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,