test: cascading in-memory store

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

@@ -3,9 +3,7 @@ use std::sync::Arc;
 
 use domain::{
     ports::{MovieCommand, MovieQuery, ReviewRepository},
-    testing::{
-        FakeDiaryQuery, InMemoryMovieRepository, InMemoryReviewRepository, NoopEventPublisher,
-    },
+    testing::{FakeDiaryQuery, InMemoryStore, NoopEventPublisher},
     value_objects::{MovieId, UserId},
 };
 
@@ -15,8 +13,8 @@ use crate::{
 
 #[tokio::test]
 async fn test_delete_review_removes_it() {
-    let movies = InMemoryMovieRepository::new();
-    let reviews = InMemoryReviewRepository::new();
+    let movies = InMemoryStore::new();
+    let reviews = Arc::clone(&movies);
     let diary = FakeDiaryQuery::new();
     let events = NoopEventPublisher::new();
 
@@ -45,7 +43,7 @@ async fn test_delete_review_removes_it() {
     .await
     .unwrap();
 
-    assert_eq!(reviews.count(), 0, "review should be deleted");
+    assert_eq!(reviews.review_count(), 0, "review should be deleted");
     assert!(
         movies.get_movie_by_id(movie.id()).await.unwrap().is_none(),
         "movie should be deleted when no reviews remain"
@@ -54,9 +52,9 @@ async fn test_delete_review_removes_it() {
 
 #[tokio::test]
 async fn test_delete_review_wrong_user_is_unauthorized() {
-    let reviews = InMemoryReviewRepository::new();
+    let reviews = InMemoryStore::new();
     let diary = FakeDiaryQuery::new();
-    let movies = InMemoryMovieRepository::new();
+    let movies = Arc::clone(&reviews);
     let events = NoopEventPublisher::new();
 
     let movie_id = MovieId::from_uuid(uuid::Uuid::new_v4());
@@ -83,5 +81,5 @@ async fn test_delete_review_wrong_user_is_unauthorized() {
     .await;
 
     assert!(result.is_err(), "wrong user should not be able to delete");
-    assert_eq!(reviews.count(), 1, "review should still exist");
+    assert_eq!(reviews.review_count(), 1, "review should still exist");
 }

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

@@ -4,19 +4,19 @@ use std::sync::Arc;
 use domain::{
     models::ReviewEdit,
     ports::ReviewRepository,
-    testing::{InMemoryReviewRepository, NoopEventPublisher, test_review},
+    testing::{InMemoryStore, NoopEventPublisher, test_review},
     value_objects::{Comment, MovieId, ReviewId, UserId, WatchMedium},
 };
 
 use crate::diary::{commands::EditReviewCommand, deps::EditReviewDeps, edit_review};
 
 async fn setup() -> (
-    Arc<InMemoryReviewRepository>,
+    Arc<InMemoryStore>,
     Arc<NoopEventPublisher>,
     ReviewId,
     UserId,
 ) {
-    let reviews = InMemoryReviewRepository::new();
+    let reviews = InMemoryStore::new();
     let events = NoopEventPublisher::new();
     let user_id = UserId::generate();
     let review = test_review(&MovieId::generate(), &user_id, 3).apply_edit(ReviewEdit {
@@ -29,10 +29,7 @@ async fn setup() -> (
     (reviews, events, review_id, user_id)
 }
 
-fn deps(
-    reviews: &Arc<InMemoryReviewRepository>,
-    events: &Arc<NoopEventPublisher>,
-) -> EditReviewDeps {
+fn deps(reviews: &Arc<InMemoryStore>, events: &Arc<NoopEventPublisher>) -> EditReviewDeps {
     EditReviewDeps {
         review: Arc::clone(reviews) as _,
         event_publisher: Arc::clone(events) as _,
@@ -62,7 +59,7 @@ async fn edit_own_review_updates_rating() {
 
 #[tokio::test]
 async fn edit_nonexistent_review_returns_not_found() {
-    let reviews = InMemoryReviewRepository::new();
+    let reviews = InMemoryStore::new();
     let events = NoopEventPublisher::new();
 
     let err = edit_review::execute(&deps(&reviews, &events), edit_review_command(5))

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

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use domain::errors::DomainError;
-use domain::testing::InMemorySocialRepository;
+use domain::testing::InMemoryStore;
 use domain::value_objects::{FollowRelation, SocialActor, SocialIdentity, UserId};
 
 use crate::{
@@ -13,7 +13,7 @@ use crate::{
 fn default_deps() -> GetActivityFeedDeps {
     GetActivityFeedDeps {
         diary: domain::testing::FakeDiaryQuery::new() as _,
-        social_query: InMemorySocialRepository::new() as _,
+        social_query: InMemoryStore::new() as _,
         config: TestContextBuilder::new().config,
     }
 }

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

@@ -5,7 +5,7 @@ use uuid::Uuid;
 
 use domain::{
     ports::MovieCommand,
-    testing::{FakeDiaryQuery, InMemoryMovieProfileRepository, InMemoryMovieRepository},
+    testing::{FakeDiaryQuery, InMemoryStore},
 };
 
 use crate::{
@@ -16,9 +16,9 @@ use crate::{
 #[tokio::test]
 async fn fails_when_movie_not_found() {
     let deps = GetMovieSocialPageDeps {
-        movie_query: InMemoryMovieRepository::new(),
+        movie_query: InMemoryStore::new(),
         diary: FakeDiaryQuery::new() as _,
-        movie_profile: InMemoryMovieProfileRepository::new(),
+        movie_profile: InMemoryStore::new(),
     };
 
     let result = get_movie_social_page::execute(
@@ -36,7 +36,7 @@ async fn fails_when_movie_not_found() {
 
 #[tokio::test]
 async fn returns_movie_social_page() {
-    let movies = InMemoryMovieRepository::new();
+    let movies = InMemoryStore::new();
 
     let movie = test_movie_with_year("Social Movie", 2024);
     let movie_uuid = movie.id().value();
@@ -45,7 +45,7 @@ async fn returns_movie_social_page() {
     let deps = GetMovieSocialPageDeps {
         movie_query: Arc::clone(&movies) as _,
         diary: FakeDiaryQuery::new() as _,
-        movie_profile: InMemoryMovieProfileRepository::new(),
+        movie_profile: InMemoryStore::new(),
     };
 
     let result = get_movie_social_page::execute(

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

@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use domain::ports::MovieCommand;
 
-use domain::testing::{InMemoryMovieRepository, InMemoryReviewRepository, NoopEventPublisher};
+use domain::testing::{InMemoryStore, NoopEventPublisher};
 
 use crate::{
     diary::commands::LogReviewCommand, diary::log_review,
@@ -12,8 +12,8 @@ use crate::{
 };
 
 fn build_logger(
-    movies: &Arc<InMemoryMovieRepository>,
-    reviews: &Arc<InMemoryReviewRepository>,
+    movies: &Arc<InMemoryStore>,
+    reviews: &Arc<InMemoryStore>,
     events: &Arc<NoopEventPublisher>,
 ) -> Arc<dyn crate::ports::ReviewLogger> {
     Arc::new(DefaultReviewLogger::new(
@@ -28,8 +28,8 @@ fn build_logger(
 
 #[tokio::test]
 async fn test_log_review_creates_movie_and_review() {
-    let movies = InMemoryMovieRepository::new();
-    let reviews = InMemoryReviewRepository::new();
+    let movies = InMemoryStore::new();
+    let reviews = Arc::clone(&movies);
     let events = NoopEventPublisher::new();
     let logger = build_logger(&movies, &reviews, &events);
 
@@ -38,14 +38,14 @@ async fn test_log_review_creates_movie_and_review() {
 
     log_review::execute(&logger, cmd).await.unwrap();
 
-    assert_eq!(reviews.count(), 1, "review should be saved");
+    assert_eq!(reviews.review_count(), 1, "review should be saved");
     assert!(!events.published().is_empty(), "events should be published");
 }
 
 #[tokio::test]
 async fn test_log_review_reuses_existing_movie() {
-    let movies = InMemoryMovieRepository::new();
-    let reviews = InMemoryReviewRepository::new();
+    let movies = InMemoryStore::new();
+    let reviews = Arc::clone(&movies);
 
     let existing_movie = test_movie_with_year("Alien", 1979);
     let movie_uuid = existing_movie.id().value();
@@ -61,14 +61,14 @@ async fn test_log_review_reuses_existing_movie() {
 
     log_review::execute(&logger, cmd).await.unwrap();
 
-    assert_eq!(movies.count(), 1, "no duplicate movie");
-    assert_eq!(reviews.count(), 1);
+    assert_eq!(movies.movie_count(), 1, "no duplicate movie");
+    assert_eq!(reviews.review_count(), 1);
 }
 
 #[tokio::test]
 async fn test_log_review_with_invalid_rating_fails() {
-    let movies = InMemoryMovieRepository::new();
-    let reviews = InMemoryReviewRepository::new();
+    let movies = InMemoryStore::new();
+    let reviews = Arc::clone(&movies);
     let events = NoopEventPublisher::new();
     let logger = build_logger(&movies, &reviews, &events);
 

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

@@ -8,10 +8,7 @@ use domain::{
     models::WatchlistEntry,
     models::{MetadataSearchCriteria, Movie},
     ports::{MetadataClient, MovieCommand, WatchlistRepository},
-    testing::{
-        FakeMetadataClient, InMemoryMovieRepository, InMemoryReviewRepository,
-        InMemoryWatchlistRepository, NoopEventPublisher,
-    },
+    testing::{FakeMetadataClient, InMemoryStore, NoopEventPublisher},
     value_objects::{ExternalMetadataId, MovieId, PosterUrl, UserId},
 };
 use uuid::Uuid;
@@ -21,9 +18,9 @@ use crate::diary::review_logger::DefaultReviewLogger;
 use crate::ports::ReviewLogger;
 
 fn make_logger(
-    movies: &Arc<InMemoryMovieRepository>,
-    reviews: &Arc<InMemoryReviewRepository>,
-    watchlist: &Arc<InMemoryWatchlistRepository>,
+    movies: &Arc<InMemoryStore>,
+    reviews: &Arc<InMemoryStore>,
+    watchlist: &Arc<InMemoryStore>,
     events: &Arc<NoopEventPublisher>,
 ) -> DefaultReviewLogger {
     DefaultReviewLogger::new(
@@ -38,9 +35,9 @@ fn make_logger(
 
 #[tokio::test]
 async fn logs_review_with_manual_movie() {
-    let movies = InMemoryMovieRepository::new();
-    let reviews = InMemoryReviewRepository::new();
-    let watchlist = InMemoryWatchlistRepository::new();
+    let movies = InMemoryStore::new();
+    let reviews = Arc::clone(&movies);
+    let watchlist = Arc::clone(&movies);
     let events = NoopEventPublisher::new();
     let logger = make_logger(&movies, &reviews, &watchlist, &events);
 
@@ -49,15 +46,15 @@ async fn logs_review_with_manual_movie() {
 
     logger.log_review(cmd).await.unwrap();
 
-    assert_eq!(movies.count(), 1);
-    assert_eq!(reviews.count(), 1);
+    assert_eq!(movies.movie_count(), 1);
+    assert_eq!(reviews.review_count(), 1);
 }
 
 #[tokio::test]
 async fn removes_from_watchlist_on_review() {
-    let movies = InMemoryMovieRepository::new();
-    let reviews = InMemoryReviewRepository::new();
-    let watchlist = InMemoryWatchlistRepository::new();
+    let movies = InMemoryStore::new();
+    let reviews = Arc::clone(&movies);
+    let watchlist = Arc::clone(&movies);
     let events = NoopEventPublisher::new();
     let logger = make_logger(&movies, &reviews, &watchlist, &events);
 
@@ -72,7 +69,7 @@ async fn removes_from_watchlist_on_review() {
     // Add to watchlist
     let entry = WatchlistEntry::new(user_id.clone(), MovieId::from_uuid(movie_id));
     watchlist.add(&entry).await.unwrap();
-    assert_eq!(watchlist.count(), 1);
+    assert_eq!(watchlist.watchlist_count(), 1);
 
     // Log review for same movie
     let cmd = LogReviewCommand {
@@ -82,14 +79,14 @@ async fn removes_from_watchlist_on_review() {
 
     logger.log_review(cmd).await.unwrap();
 
-    assert_eq!(watchlist.count(), 0);
+    assert_eq!(watchlist.watchlist_count(), 0);
 }
 
 #[tokio::test]
 async fn logs_review_with_existing_movie_by_id() {
-    let movies = InMemoryMovieRepository::new();
-    let reviews = InMemoryReviewRepository::new();
-    let watchlist = InMemoryWatchlistRepository::new();
+    let movies = InMemoryStore::new();
+    let reviews = Arc::clone(&movies);
+    let watchlist = Arc::clone(&movies);
     let events = NoopEventPublisher::new();
     let logger = make_logger(&movies, &reviews, &watchlist, &events);
 
@@ -104,15 +101,15 @@ async fn logs_review_with_existing_movie_by_id() {
 
     logger.log_review(cmd).await.unwrap();
 
-    assert_eq!(movies.count(), 1);
-    assert_eq!(reviews.count(), 1);
+    assert_eq!(movies.movie_count(), 1);
+    assert_eq!(reviews.review_count(), 1);
 }
 
 #[tokio::test]
 async fn existing_movie_not_found_returns_error() {
-    let movies = InMemoryMovieRepository::new();
-    let reviews = InMemoryReviewRepository::new();
-    let watchlist = InMemoryWatchlistRepository::new();
+    let movies = InMemoryStore::new();
+    let reviews = Arc::clone(&movies);
+    let watchlist = Arc::clone(&movies);
     let events = NoopEventPublisher::new();
     let logger = make_logger(&movies, &reviews, &watchlist, &events);
 
@@ -123,9 +120,9 @@ async fn existing_movie_not_found_returns_error() {
 
 #[tokio::test]
 async fn invalid_rating_returns_error() {
-    let movies = InMemoryMovieRepository::new();
-    let reviews = InMemoryReviewRepository::new();
-    let watchlist = InMemoryWatchlistRepository::new();
+    let movies = InMemoryStore::new();
+    let reviews = Arc::clone(&movies);
+    let watchlist = Arc::clone(&movies);
     let events = NoopEventPublisher::new();
     let logger = make_logger(&movies, &reviews, &watchlist, &events);
 
@@ -137,15 +134,15 @@ async fn invalid_rating_returns_error() {
     let result = logger.log_review(cmd).await;
     assert!(result.is_err());
     // No repo calls should have happened
-    assert_eq!(movies.count(), 0);
-    assert_eq!(reviews.count(), 0);
+    assert_eq!(movies.movie_count(), 0);
+    assert_eq!(reviews.review_count(), 0);
 }
 
 #[tokio::test]
 async fn watchlist_not_present_does_not_publish_removed() {
-    let movies = InMemoryMovieRepository::new();
-    let reviews = InMemoryReviewRepository::new();
-    let watchlist = InMemoryWatchlistRepository::new();
+    let movies = InMemoryStore::new();
+    let reviews = Arc::clone(&movies);
+    let watchlist = Arc::clone(&movies);
     let events = NoopEventPublisher::new();
     let logger = make_logger(&movies, &reviews, &watchlist, &events);
 
@@ -187,9 +184,9 @@ impl MetadataClient for MetadataClientWithExternalId {
 
 #[tokio::test]
 async fn publishes_movie_discovered_for_new_movie_with_external_id() {
-    let movies = InMemoryMovieRepository::new();
-    let reviews = InMemoryReviewRepository::new();
-    let watchlist = InMemoryWatchlistRepository::new();
+    let movies = InMemoryStore::new();
+    let reviews = Arc::clone(&movies);
+    let watchlist = Arc::clone(&movies);
     let events = NoopEventPublisher::new();
 
     let logger = DefaultReviewLogger::new(