Gabriel Kaszewski
d1f9f55d4f
FederationEventBridge silently dropped DeliveryRequested events from k-ap, so no Create/Delete/Accept activities were pushed to follower inboxes. Reviews only reached remote instances via outbox backfill (pull), and deletes never propagated. Bridge now publishes FederationDeliveryRequested domain events through the event bus; worker calls ap_service.deliver_to_inbox() to send them.
334 lines
12 KiB
Rust
334 lines
12 KiB
Rust
use chrono::NaiveDateTime;
|
|
use domain::{
|
|
errors::DomainError,
|
|
events::DomainEvent,
|
|
value_objects::{ExternalMetadataId, MovieId, PosterPath, Rating, ReviewId, UserId},
|
|
};
|
|
use serde::{Deserialize, Serialize};
|
|
use uuid::Uuid;
|
|
|
|
#[derive(Debug, Serialize, Deserialize, PartialEq)]
|
|
#[serde(tag = "type", content = "data")]
|
|
pub enum EventPayload {
|
|
ReviewLogged {
|
|
review_id: String,
|
|
movie_id: String,
|
|
user_id: String,
|
|
rating: u8,
|
|
watched_at: i64,
|
|
},
|
|
ReviewUpdated {
|
|
review_id: String,
|
|
movie_id: String,
|
|
user_id: String,
|
|
rating: u8,
|
|
watched_at: i64,
|
|
},
|
|
MovieDiscovered {
|
|
movie_id: String,
|
|
external_metadata_id: String,
|
|
},
|
|
MovieDeleted {
|
|
movie_id: String,
|
|
poster_path: Option<String>,
|
|
},
|
|
UserUpdated {
|
|
user_id: String,
|
|
},
|
|
ReviewDeleted {
|
|
review_id: String,
|
|
user_id: String,
|
|
},
|
|
MovieEnrichmentRequested {
|
|
movie_id: String,
|
|
external_metadata_id: String,
|
|
},
|
|
ImageStored {
|
|
key: String,
|
|
},
|
|
WatchlistEntryAdded {
|
|
user_id: String,
|
|
movie_id: String,
|
|
movie_title: String,
|
|
release_year: u16,
|
|
external_metadata_id: Option<String>,
|
|
added_at: i64,
|
|
},
|
|
WatchlistEntryRemoved {
|
|
user_id: String,
|
|
movie_id: String,
|
|
},
|
|
FollowAccepted {
|
|
local_user_id: String,
|
|
remote_actor_url: String,
|
|
outbox_url: String,
|
|
},
|
|
BackfillFollower {
|
|
owner_user_id: String,
|
|
follower_inbox_url: String,
|
|
},
|
|
FederationDeliveryRequested {
|
|
inbox_url: String,
|
|
activity_json: String,
|
|
signing_actor_id: String,
|
|
},
|
|
}
|
|
|
|
impl EventPayload {
|
|
pub fn event_type(&self) -> &'static str {
|
|
match self {
|
|
EventPayload::ReviewLogged { .. } => "ReviewLogged",
|
|
EventPayload::ReviewUpdated { .. } => "ReviewUpdated",
|
|
EventPayload::MovieDiscovered { .. } => "MovieDiscovered",
|
|
EventPayload::MovieDeleted { .. } => "MovieDeleted",
|
|
EventPayload::UserUpdated { .. } => "UserUpdated",
|
|
EventPayload::ReviewDeleted { .. } => "ReviewDeleted",
|
|
EventPayload::MovieEnrichmentRequested { .. } => "MovieEnrichmentRequested",
|
|
EventPayload::ImageStored { .. } => "ImageStored",
|
|
EventPayload::WatchlistEntryAdded { .. } => "WatchlistEntryAdded",
|
|
EventPayload::WatchlistEntryRemoved { .. } => "WatchlistEntryRemoved",
|
|
EventPayload::FollowAccepted { .. } => "FollowAccepted",
|
|
EventPayload::BackfillFollower { .. } => "BackfillFollower",
|
|
EventPayload::FederationDeliveryRequested { .. } => "FederationDeliveryRequested",
|
|
}
|
|
}
|
|
}
|
|
|
|
fn parse_uuid(s: &str, field: &str) -> Result<Uuid, DomainError> {
|
|
Uuid::parse_str(s).map_err(|e| DomainError::InfrastructureError(format!("{field}: {e}")))
|
|
}
|
|
|
|
fn parse_ts(ts: i64) -> Result<NaiveDateTime, DomainError> {
|
|
chrono::DateTime::from_timestamp(ts, 0)
|
|
.map(|dt| dt.naive_utc())
|
|
.ok_or_else(|| DomainError::InfrastructureError(format!("invalid timestamp: {ts}")))
|
|
}
|
|
|
|
impl From<&DomainEvent> for EventPayload {
|
|
fn from(event: &DomainEvent) -> Self {
|
|
match event {
|
|
DomainEvent::ReviewLogged {
|
|
review_id,
|
|
movie_id,
|
|
user_id,
|
|
rating,
|
|
watched_at,
|
|
} => EventPayload::ReviewLogged {
|
|
review_id: review_id.value().to_string(),
|
|
movie_id: movie_id.value().to_string(),
|
|
user_id: user_id.value().to_string(),
|
|
rating: rating.value(),
|
|
watched_at: watched_at.and_utc().timestamp(),
|
|
},
|
|
DomainEvent::ReviewUpdated {
|
|
review_id,
|
|
movie_id,
|
|
user_id,
|
|
rating,
|
|
watched_at,
|
|
} => EventPayload::ReviewUpdated {
|
|
review_id: review_id.value().to_string(),
|
|
movie_id: movie_id.value().to_string(),
|
|
user_id: user_id.value().to_string(),
|
|
rating: rating.value(),
|
|
watched_at: watched_at.and_utc().timestamp(),
|
|
},
|
|
DomainEvent::MovieDiscovered {
|
|
movie_id,
|
|
external_metadata_id,
|
|
} => EventPayload::MovieDiscovered {
|
|
movie_id: movie_id.value().to_string(),
|
|
external_metadata_id: external_metadata_id.value().to_owned(),
|
|
},
|
|
DomainEvent::MovieDeleted {
|
|
movie_id,
|
|
poster_path,
|
|
} => EventPayload::MovieDeleted {
|
|
movie_id: movie_id.value().to_string(),
|
|
poster_path: poster_path.as_ref().map(|p| p.value().to_string()),
|
|
},
|
|
DomainEvent::UserUpdated { user_id } => EventPayload::UserUpdated {
|
|
user_id: user_id.value().to_string(),
|
|
},
|
|
DomainEvent::ReviewDeleted { review_id, user_id } => EventPayload::ReviewDeleted {
|
|
review_id: review_id.value().to_string(),
|
|
user_id: user_id.value().to_string(),
|
|
},
|
|
DomainEvent::MovieEnrichmentRequested {
|
|
movie_id,
|
|
external_metadata_id,
|
|
} => EventPayload::MovieEnrichmentRequested {
|
|
movie_id: movie_id.value().to_string(),
|
|
external_metadata_id: external_metadata_id.clone(),
|
|
},
|
|
DomainEvent::ImageStored { key } => EventPayload::ImageStored { key: key.clone() },
|
|
DomainEvent::WatchlistEntryAdded {
|
|
user_id,
|
|
movie_id,
|
|
movie_title,
|
|
release_year,
|
|
external_metadata_id,
|
|
added_at,
|
|
} => EventPayload::WatchlistEntryAdded {
|
|
user_id: user_id.value().to_string(),
|
|
movie_id: movie_id.value().to_string(),
|
|
movie_title: movie_title.clone(),
|
|
release_year: *release_year,
|
|
external_metadata_id: external_metadata_id.clone(),
|
|
added_at: added_at.and_utc().timestamp(),
|
|
},
|
|
DomainEvent::WatchlistEntryRemoved { user_id, movie_id } => {
|
|
EventPayload::WatchlistEntryRemoved {
|
|
user_id: user_id.value().to_string(),
|
|
movie_id: movie_id.value().to_string(),
|
|
}
|
|
}
|
|
DomainEvent::FollowAccepted {
|
|
local_user_id,
|
|
remote_actor_url,
|
|
outbox_url,
|
|
} => EventPayload::FollowAccepted {
|
|
local_user_id: local_user_id.value().to_string(),
|
|
remote_actor_url: remote_actor_url.clone(),
|
|
outbox_url: outbox_url.clone(),
|
|
},
|
|
DomainEvent::BackfillFollower {
|
|
owner_user_id,
|
|
follower_inbox_url,
|
|
} => EventPayload::BackfillFollower {
|
|
owner_user_id: owner_user_id.value().to_string(),
|
|
follower_inbox_url: follower_inbox_url.clone(),
|
|
},
|
|
DomainEvent::FederationDeliveryRequested {
|
|
inbox_url,
|
|
activity_json,
|
|
signing_actor_id,
|
|
} => EventPayload::FederationDeliveryRequested {
|
|
inbox_url: inbox_url.clone(),
|
|
activity_json: activity_json.clone(),
|
|
signing_actor_id: signing_actor_id.to_string(),
|
|
},
|
|
}
|
|
}
|
|
}
|
|
|
|
impl TryFrom<EventPayload> for DomainEvent {
|
|
type Error = DomainError;
|
|
fn try_from(payload: EventPayload) -> Result<Self, DomainError> {
|
|
match payload {
|
|
EventPayload::ReviewLogged {
|
|
review_id,
|
|
movie_id,
|
|
user_id,
|
|
rating,
|
|
watched_at,
|
|
} => Ok(DomainEvent::ReviewLogged {
|
|
review_id: ReviewId::from_uuid(parse_uuid(&review_id, "review_id")?),
|
|
movie_id: MovieId::from_uuid(parse_uuid(&movie_id, "movie_id")?),
|
|
user_id: UserId::from_uuid(parse_uuid(&user_id, "user_id")?),
|
|
rating: Rating::new(rating)?,
|
|
watched_at: parse_ts(watched_at)?,
|
|
}),
|
|
EventPayload::ReviewUpdated {
|
|
review_id,
|
|
movie_id,
|
|
user_id,
|
|
rating,
|
|
watched_at,
|
|
} => Ok(DomainEvent::ReviewUpdated {
|
|
review_id: ReviewId::from_uuid(parse_uuid(&review_id, "review_id")?),
|
|
movie_id: MovieId::from_uuid(parse_uuid(&movie_id, "movie_id")?),
|
|
user_id: UserId::from_uuid(parse_uuid(&user_id, "user_id")?),
|
|
rating: Rating::new(rating)?,
|
|
watched_at: parse_ts(watched_at)?,
|
|
}),
|
|
EventPayload::MovieDiscovered {
|
|
movie_id,
|
|
external_metadata_id,
|
|
} => Ok(DomainEvent::MovieDiscovered {
|
|
movie_id: MovieId::from_uuid(parse_uuid(&movie_id, "movie_id")?),
|
|
external_metadata_id: ExternalMetadataId::new(external_metadata_id)?,
|
|
}),
|
|
EventPayload::MovieDeleted {
|
|
movie_id,
|
|
poster_path,
|
|
} => {
|
|
let movie_id = MovieId::from_uuid(parse_uuid(&movie_id, "movie_id")?);
|
|
let poster_path = poster_path
|
|
.map(PosterPath::new)
|
|
.transpose()
|
|
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?;
|
|
Ok(DomainEvent::MovieDeleted {
|
|
movie_id,
|
|
poster_path,
|
|
})
|
|
}
|
|
EventPayload::UserUpdated { user_id } => Ok(DomainEvent::UserUpdated {
|
|
user_id: UserId::from_uuid(parse_uuid(&user_id, "user_id")?),
|
|
}),
|
|
EventPayload::ReviewDeleted { review_id, user_id } => Ok(DomainEvent::ReviewDeleted {
|
|
review_id: ReviewId::from_uuid(parse_uuid(&review_id, "review_id")?),
|
|
user_id: UserId::from_uuid(parse_uuid(&user_id, "user_id")?),
|
|
}),
|
|
EventPayload::MovieEnrichmentRequested {
|
|
movie_id,
|
|
external_metadata_id,
|
|
} => Ok(DomainEvent::MovieEnrichmentRequested {
|
|
movie_id: MovieId::from_uuid(parse_uuid(&movie_id, "movie_id")?),
|
|
external_metadata_id,
|
|
}),
|
|
EventPayload::ImageStored { key } => Ok(DomainEvent::ImageStored { key }),
|
|
EventPayload::WatchlistEntryAdded {
|
|
user_id,
|
|
movie_id,
|
|
movie_title,
|
|
release_year,
|
|
external_metadata_id,
|
|
added_at,
|
|
} => Ok(DomainEvent::WatchlistEntryAdded {
|
|
user_id: UserId::from_uuid(parse_uuid(&user_id, "user_id")?),
|
|
movie_id: MovieId::from_uuid(parse_uuid(&movie_id, "movie_id")?),
|
|
movie_title,
|
|
release_year,
|
|
external_metadata_id,
|
|
added_at: parse_ts(added_at)?,
|
|
}),
|
|
EventPayload::WatchlistEntryRemoved { user_id, movie_id } => {
|
|
Ok(DomainEvent::WatchlistEntryRemoved {
|
|
user_id: UserId::from_uuid(parse_uuid(&user_id, "user_id")?),
|
|
movie_id: MovieId::from_uuid(parse_uuid(&movie_id, "movie_id")?),
|
|
})
|
|
}
|
|
EventPayload::FollowAccepted {
|
|
local_user_id,
|
|
remote_actor_url,
|
|
outbox_url,
|
|
} => Ok(DomainEvent::FollowAccepted {
|
|
local_user_id: UserId::from_uuid(parse_uuid(&local_user_id, "local_user_id")?),
|
|
remote_actor_url,
|
|
outbox_url,
|
|
}),
|
|
EventPayload::BackfillFollower {
|
|
owner_user_id,
|
|
follower_inbox_url,
|
|
} => Ok(DomainEvent::BackfillFollower {
|
|
owner_user_id: UserId::from_uuid(parse_uuid(&owner_user_id, "owner_user_id")?),
|
|
follower_inbox_url,
|
|
}),
|
|
EventPayload::FederationDeliveryRequested {
|
|
inbox_url,
|
|
activity_json,
|
|
signing_actor_id,
|
|
} => Ok(DomainEvent::FederationDeliveryRequested {
|
|
inbox_url,
|
|
activity_json,
|
|
signing_actor_id: parse_uuid(&signing_actor_id, "signing_actor_id")?,
|
|
}),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "tests/lib.rs"]
|
|
mod tests;
|