test: shared factories and command builders

crates/application/src/watchlist/tests/add.rs

@@ -1,16 +1,13 @@
+use crate::test_support::{add_to_watchlist_command, movie_input_manual};
+use domain::testing::test_movie_with_year;
 use std::sync::Arc;
 
 use domain::{
-    models::Movie,
     ports::MovieCommand,
     testing::{InMemoryMovieRepository, InMemoryWatchlistRepository, NoopEventPublisher},
-    value_objects::{MovieTitle, ReleaseYear},
 };
 
-use crate::{
-    diary::commands::MovieInput,
-    watchlist::{add, commands::AddToWatchlistCommand, deps::WatchlistAddDeps},
-};
+use crate::watchlist::{add, commands::AddToWatchlistCommand, deps::WatchlistAddDeps};
 
 fn make_deps(
     movies: Arc<InMemoryMovieRepository>,
@@ -30,28 +27,13 @@ async fn test_add_to_watchlist_resolves_and_saves() {
     let movies = InMemoryMovieRepository::new();
     let watchlist = InMemoryWatchlistRepository::new();
 
-    let movie = Movie::new(
-        None,
-        MovieTitle::new("The Thing".into()).unwrap(),
-        ReleaseYear::new(1982).unwrap(),
-        None,
-        None,
-    );
+    let movie = test_movie_with_year("The Thing", 1982);
     let movie_uuid = movie.id().value();
     movies.upsert_movie(&movie).await.unwrap();
 
     let deps = make_deps(Arc::clone(&movies), Arc::clone(&watchlist));
 
-    let cmd = AddToWatchlistCommand {
-        user_id: uuid::Uuid::new_v4(),
-        input: MovieInput {
-            movie_id: Some(movie_uuid),
-            external_metadata_id: None,
-            manual_title: None,
-            manual_release_year: None,
-            manual_director: None,
-        },
-    };
+    let cmd = add_to_watchlist_command(uuid::Uuid::new_v4(), movie_uuid);
 
     add::execute(&deps, cmd).await.unwrap();
 
@@ -63,29 +45,14 @@ async fn test_add_to_watchlist_already_present_is_idempotent() {
     let movies = InMemoryMovieRepository::new();
     let watchlist = InMemoryWatchlistRepository::new();
 
-    let movie = Movie::new(
-        None,
-        MovieTitle::new("RoboCop".into()).unwrap(),
-        ReleaseYear::new(1987).unwrap(),
-        None,
-        None,
-    );
+    let movie = test_movie_with_year("RoboCop", 1987);
     let movie_uuid = movie.id().value();
     let user_id = uuid::Uuid::new_v4();
     movies.upsert_movie(&movie).await.unwrap();
 
     let deps = make_deps(Arc::clone(&movies), Arc::clone(&watchlist));
 
-    let make_cmd = || AddToWatchlistCommand {
-        user_id,
-        input: MovieInput {
-            movie_id: Some(movie_uuid),
-            external_metadata_id: None,
-            manual_title: None,
-            manual_release_year: None,
-            manual_director: None,
-        },
-    };
+    let make_cmd = || add_to_watchlist_command(user_id, movie_uuid);
 
     add::execute(&deps, make_cmd()).await.unwrap();
     add::execute(&deps, make_cmd()).await.unwrap();
@@ -102,13 +69,7 @@ async fn test_add_to_watchlist_with_manual_movie() {
 
     let cmd = AddToWatchlistCommand {
         user_id: uuid::Uuid::new_v4(),
-        input: MovieInput {
-            movie_id: None,
-            external_metadata_id: None,
-            manual_title: Some("New Manual Movie".into()),
-            manual_release_year: Some(2024),
-            manual_director: None,
-        },
+        input: movie_input_manual("New Manual Movie", 2024),
     };
 
     add::execute(&deps, cmd).await.unwrap();
@@ -124,16 +85,7 @@ async fn test_add_to_watchlist_movie_not_found_by_id() {
 
     let deps = make_deps(Arc::clone(&movies), Arc::clone(&watchlist));
 
-    let cmd = AddToWatchlistCommand {
-        user_id: uuid::Uuid::new_v4(),
-        input: MovieInput {
-            movie_id: Some(uuid::Uuid::new_v4()),
-            external_metadata_id: None,
-            manual_title: None,
-            manual_release_year: None,
-            manual_director: None,
-        },
-    };
+    let cmd = add_to_watchlist_command(uuid::Uuid::new_v4(), uuid::Uuid::new_v4());
 
     assert!(add::execute(&deps, cmd).await.is_err());
 }

crates/application/src/watchlist/tests/get_watchlist_for_owner.rs

@@ -1,15 +1,14 @@
+use crate::test_support::register_command;
 use std::sync::Arc;
 
 use uuid::Uuid;
 
-use domain::models::UserRole;
 use domain::testing::{
     InMemoryRemoteWatchlistRepository, InMemoryUserRepository, InMemoryWatchlistRepository,
     PanicRemoteWatchlistRepository, PanicWatchlistRepository,
 };
 use domain::value_objects::Email;
 
-use crate::auth::commands::RegisterCommand;
 use crate::auth::deps::RegisterDeps;
 use crate::auth::register;
 use crate::test_helpers::TestContextBuilder;
@@ -22,17 +21,9 @@ async fn setup_user(b: &TestContextBuilder, email: &str, username: &str) {
         password_hasher: b.password_hasher.clone(),
         config: b.config.clone(),
     };
-    register::execute(
-        &deps,
-        RegisterCommand {
-            email: email.into(),
-            username: username.into(),
-            password: "password123".into(),
-            role: UserRole::Standard,
-        },
-    )
-    .await
-    .unwrap();
+    register::execute(&deps, register_command(email, username))
+        .await
+        .unwrap();
 }
 
 #[tokio::test]