From 10fcc273390b0940da8295d73918f9e2500a808a Mon Sep 17 00:00:00 2001 From: Gabriel Kaszewski Date: Wed, 13 May 2026 01:38:33 +0200 Subject: [PATCH] feat: update dependencies and improve code formatting in worker tests Co-authored-by: Copilot --- Cargo.lock | 3 ++ crates/application/src/tests/worker.rs | 46 ++++++++++++++++++-------- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1fc00bb..bec9778 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,7 +29,9 @@ dependencies = [ "async-trait", "axum", "chrono", + "domain", "enum_delegate", + "reqwest 0.13.3", "serde", "serde_json", "tokio", @@ -6808,6 +6810,7 @@ dependencies = [ "activitypub", "anyhow", "application", + "async-trait", "auth", "domain", "dotenvy", diff --git a/crates/application/src/tests/worker.rs b/crates/application/src/tests/worker.rs index f5d450b..3988e54 100644 --- a/crates/application/src/tests/worker.rs +++ b/crates/application/src/tests/worker.rs @@ -1,7 +1,10 @@ use super::*; use async_trait::async_trait; -use domain::{errors::DomainError, events::{AckHandle, DomainEvent}}; use domain::value_objects::{ExternalMetadataId, MovieId}; +use domain::{ + errors::DomainError, + events::{AckHandle, DomainEvent}, +}; use futures::{stream, stream::BoxStream}; use std::sync::{Arc, Mutex}; @@ -9,8 +12,12 @@ struct NoopAck; #[async_trait] impl AckHandle for NoopAck { - async fn ack(&self) -> Result<(), DomainError> { Ok(()) } - async fn nack(&self) -> Result<(), DomainError> { Ok(()) } + async fn ack(&self) -> Result<(), DomainError> { + Ok(()) + } + async fn nack(&self) -> Result<(), DomainError> { + Ok(()) + } } struct VecConsumer { @@ -45,7 +52,10 @@ impl EventHandler for RecordingHandler { DomainEvent::UserUpdated { .. } => "user_updated", DomainEvent::MovieEnrichmentRequested { .. } => "movie_enrichment_requested", DomainEvent::ImageStored { .. } => "image_stored", - DomainEvent::WatchlistEntryAdded { .. } | DomainEvent::WatchlistEntryRemoved { .. } => "watchlist", + DomainEvent::WatchlistEntryAdded { .. } | DomainEvent::WatchlistEntryRemoved { .. } => { + "watchlist" + } + DomainEvent::FollowAccepted { .. } => "follow_accepted", }; self.calls.lock().unwrap().push(label); Ok(()) @@ -62,8 +72,12 @@ fn movie_discovered() -> DomainEvent { #[tokio::test] async fn dispatches_to_all_handlers() { let calls = Arc::new(Mutex::new(vec![])); - let consumer = VecConsumer { events: vec![movie_discovered()] }; - let handler = RecordingHandler { calls: Arc::clone(&calls) }; + let consumer = VecConsumer { + events: vec![movie_discovered()], + }; + let handler = RecordingHandler { + calls: Arc::clone(&calls), + }; WorkerService::new(Arc::new(consumer), vec![Arc::new(handler)]) .run() @@ -82,7 +96,9 @@ async fn nacks_when_handler_fails() { #[async_trait] impl AckHandle for TrackingAck { - async fn ack(&self) -> Result<(), DomainError> { Ok(()) } + async fn ack(&self) -> Result<(), DomainError> { + Ok(()) + } async fn nack(&self) -> Result<(), DomainError> { *self.nack_called.lock().unwrap() = true; Ok(()) @@ -98,7 +114,9 @@ async fn nacks_when_handler_fails() { fn consume(&self) -> BoxStream<'_, Result> { let envelope = EventEnvelope::new( self.event.clone(), - Box::new(TrackingAck { nack_called: Arc::clone(&self.nack_called) }), + Box::new(TrackingAck { + nack_called: Arc::clone(&self.nack_called), + }), ); Box::pin(stream::iter(vec![Ok(envelope)])) } @@ -139,7 +157,9 @@ async fn acks_when_all_handlers_succeed() { *self.ack_called.lock().unwrap() = true; Ok(()) } - async fn nack(&self) -> Result<(), DomainError> { Ok(()) } + async fn nack(&self) -> Result<(), DomainError> { + Ok(()) + } } struct TrackingConsumer { @@ -151,7 +171,9 @@ async fn acks_when_all_handlers_succeed() { fn consume(&self) -> BoxStream<'_, Result> { let envelope = EventEnvelope::new( self.event.clone(), - Box::new(TrackingAck { ack_called: Arc::clone(&self.ack_called) }), + Box::new(TrackingAck { + ack_called: Arc::clone(&self.ack_called), + }), ); Box::pin(stream::iter(vec![Ok(envelope)])) } @@ -162,9 +184,7 @@ async fn acks_when_all_handlers_succeed() { ack_called: Arc::clone(&ack_called), }; - WorkerService::new(Arc::new(consumer), vec![]) - .run() - .await; + WorkerService::new(Arc::new(consumer), vec![]).run().await; assert!(*ack_called.lock().unwrap()); }