test: shared factories and command builders

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

@@ -1,43 +1,18 @@
+use domain::testing::{test_movie_with_year, test_review};
 use std::sync::Arc;
 
-use chrono::Utc;
-
 use domain::{
-    models::{Movie, Review},
     ports::{MovieCommand, MovieQuery, ReviewRepository},
     testing::{
         FakeDiaryQuery, InMemoryMovieRepository, InMemoryReviewRepository, NoopEventPublisher,
     },
-    value_objects::{MovieId, MovieTitle, Rating, ReleaseYear, UserId},
+    value_objects::{MovieId, UserId},
 };
 
 use crate::{
     diary::commands::DeleteReviewCommand, diary::delete_review, diary::deps::DeleteReviewDeps,
 };
 
-fn make_movie() -> Movie {
-    Movie::new(
-        None,
-        MovieTitle::new("Terminator".into()).unwrap(),
-        ReleaseYear::new(1984).unwrap(),
-        None,
-        None,
-    )
-}
-
-fn make_review(movie_id: MovieId, user_id: UserId) -> Review {
-    Review::new(
-        movie_id,
-        user_id,
-        Rating::new(4).unwrap(),
-        None,
-        Utc::now().naive_utc(),
-        None,
-        false,
-    )
-    .unwrap()
-}
-
 #[tokio::test]
 async fn test_delete_review_removes_it() {
     let movies = InMemoryMovieRepository::new();
@@ -45,9 +20,9 @@ async fn test_delete_review_removes_it() {
     let diary = FakeDiaryQuery::new();
     let events = NoopEventPublisher::new();
 
-    let movie = make_movie();
+    let movie = test_movie_with_year("Terminator", 1984);
     let user_id = UserId::from_uuid(uuid::Uuid::new_v4());
-    let review = make_review(movie.id().clone(), user_id.clone());
+    let review = test_review(movie.id(), &user_id, 4);
 
     movies.upsert_movie(&movie).await.unwrap();
     reviews.save_review(&review).await.unwrap();
@@ -87,7 +62,7 @@ async fn test_delete_review_wrong_user_is_unauthorized() {
     let movie_id = MovieId::from_uuid(uuid::Uuid::new_v4());
     let owner_id = UserId::from_uuid(uuid::Uuid::new_v4());
     let other_id = uuid::Uuid::new_v4();
-    let review = make_review(movie_id, owner_id);
+    let review = test_review(&movie_id, &owner_id, 4);
 
     reviews.save_review(&review).await.unwrap();