fix: NewRemoteReview param struct, atomic review+orphan movie delete

crates/adapters/activitypub/src/lib.rs

@@ -22,7 +22,7 @@ pub use k_ap::{
 
 pub use event_handler::ActivityPubEventHandler;
 pub use federation_ports::ApServiceAdapter;
-pub use remote_review_repository::{RemoteReviewRepository, RemoteReviewUpdate};
+pub use remote_review_repository::{NewRemoteReview, RemoteReviewRepository, RemoteReviewUpdate};
 pub use review_handler::ReviewObjectHandler;
 pub use social_adapter::CompositeSocialAdapter;
 pub use user_adapter::DomainUserRepoAdapter;

crates/adapters/activitypub/src/remote_review_repository.rs

@@ -14,19 +14,20 @@ pub struct RemoteReviewUpdate<'a> {
     pub spoilers: bool,
 }
 
+/// A remote review to persist, with the events that ride the same write.
+pub struct NewRemoteReview<'a> {
+    pub review: &'a Review,
+    pub ap_id: &'a str,
+    pub movie_title: &'a str,
+    pub release_year: u16,
+    pub external_metadata_id: Option<&'a str>,
+    pub poster_url: Option<&'a str>,
+    pub events: &'a [DomainEvent],
+}
+
 #[async_trait]
 pub trait RemoteReviewRepository: Send + Sync {
-    #[allow(clippy::too_many_arguments)]
-    async fn save_remote_review(
-        &self,
-        review: &Review,
-        ap_id: &str,
-        movie_title: &str,
-        release_year: u16,
-        external_metadata_id: Option<&str>,
-        poster_url: Option<&str>,
-        events: &[DomainEvent],
-    ) -> Result<()>;
+    async fn save_remote_review(&self, new: NewRemoteReview<'_>) -> Result<()>;
 
     async fn delete_remote_review(&self, ap_id: &str, actor_url: &str) -> Result<()>;
 

crates/adapters/activitypub/src/review_handler.rs

@@ -13,7 +13,7 @@ use k_ap::{AS_PUBLIC, ApContentReader, ApObjectHandler, LocalObject};
 use url::Url;
 
 use crate::objects::{ReviewApInput, ReviewObject, review_to_ap_object};
-use crate::remote_review_repository::RemoteReviewRepository;
+use crate::remote_review_repository::{NewRemoteReview, RemoteReviewRepository};
 use crate::urls::{actor_url, review_url};
 
 pub struct ReviewObjectHandler {
@@ -174,15 +174,15 @@ impl ApObjectHandler for ReviewObjectHandler {
             .collect();
 
         self.review_store
-            .save_remote_review(
-                &review,
-                obj.id.as_str(),
-                &obj.movie_title,
-                obj.release_year,
-                obj.external_metadata_id.as_deref(),
-                obj.poster_url.as_deref(),
-                &events,
-            )
+            .save_remote_review(NewRemoteReview {
+                review: &review,
+                ap_id: obj.id.as_str(),
+                movie_title: &obj.movie_title,
+                release_year: obj.release_year,
+                external_metadata_id: obj.external_metadata_id.as_deref(),
+                poster_url: obj.poster_url.as_deref(),
+                events: &events,
+            })
             .await?;
 
         Ok(())