From 692c3f64b6f01396e280f5aa505a4b5dcb90d773 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 25 Apr 2023 01:33:47 -0700 Subject: [PATCH] two different firehose notifications --- .../src/mediators/firehose_publisher.rs | 12 +++++++++ .../common/drain_multipart_request.rs | 2 +- .../media_uploads/common/handle_upload.rs | 25 +++++++++++++------ 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs b/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs index 9451f958c5..5eef188769 100644 --- a/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs +++ b/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs @@ -36,6 +36,7 @@ enum FirehoseEvent { GenericDownloadCompleted, MediaUploaded, + DeviceMediaRecorded, CommentCreated, @@ -66,6 +67,7 @@ impl FirehoseEvent { FirehoseEvent::GenericDownloadStarted => "generic_download_started", FirehoseEvent::GenericDownloadCompleted => "generic_download_completed", FirehoseEvent::MediaUploaded => "media_uploaded", + FirehoseEvent::DeviceMediaRecorded => "device_media_recorded", FirehoseEvent::CommentCreated => "comment_created", @@ -249,6 +251,16 @@ impl FirehosePublisher { Ok(()) } + pub async fn publish_device_media_recorded(&self, maybe_user_token: Option<&UserToken>, upload_token: &MediaUploadToken) -> AnyhowResult<()> { + let _record_id = self.insert( + FirehoseEvent::DeviceMediaRecorded, + maybe_user_token.map(|u| u.as_str()), + Some(upload_token.as_str()), + Some(upload_token.as_str()), + ).await?; + Ok(()) + } + pub async fn publish_comment_created(&self, user_token: &UserToken, comment_token: &CommentToken) -> AnyhowResult<()> { let _record_id = self.insert( FirehoseEvent::CommentCreated, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/common/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/common/drain_multipart_request.rs index ec54003626..33edc6a8d6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/common/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/common/drain_multipart_request.rs @@ -14,7 +14,7 @@ pub struct UploadMediaRequest { } /// Where the frontend tells us the file came from. -#[derive(Eq, PartialEq)] +#[derive(Eq, PartialEq, Clone, Copy)] pub enum MediaSource { Unknown, UserFile, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/common/handle_upload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/common/handle_upload.rs index ddac077298..98db0caec6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/common/handle_upload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/common/handle_upload.rs @@ -267,14 +267,23 @@ pub async fn handle_upload( info!("new media upload id: {} token: {:?}", record_id, &token); - server_state.firehose_publisher.publish_media_uploaded( - maybe_user_token.as_ref(), - &token) - .await - .map_err(|e| { - warn!("error publishing event: {:?}", e); - UploadError::ServerError - })?; + let firehose_result = match media_upload_source { + MediaUploadSource::DeviceApi => { + server_state.firehose_publisher.publish_device_media_recorded( + maybe_user_token.as_ref(), + &token).await + } + _ => { + server_state.firehose_publisher.publish_media_uploaded( + maybe_user_token.as_ref(), + &token).await + } + }; + + let _r = firehose_result.map_err(|e| { + warn!("error publishing event: {:?}", e); + UploadError::ServerError + })?; Ok(SuccessCase::MediaSuccessfullyUploaded { upload_token: token,