From 3404251c1426a30bad72367a6ac7d1b0b5b022c8 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Mon, 31 Mar 2025 16:46:49 -0700
Subject: [PATCH] nats: rename events
---
pkg/service/submissions.go | 2 +-
validation/src/main.rs | 2 +-
validation/src/message_handler.rs | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/service/submissions.go b/pkg/service/submissions.go
index 8583675..430e6d0 100644
--- a/pkg/service/submissions.go
+++ b/pkg/service/submissions.go
@@ -411,7 +411,7 @@ func (svc *Service) ActionSubmissionTriggerUpload(ctx context.Context, params ap
return err
}
- svc.Nats.Publish("maptest.submissions.uploadnew", []byte(j))
+ svc.Nats.Publish("maptest.submissions.upload", []byte(j))
} else {
// refuse to operate
return ErrUploadedAssetIDAlreadyExists
diff --git a/validation/src/main.rs b/validation/src/main.rs
index 2ee02e1..0ee2e2b 100644
--- a/validation/src/main.rs
+++ b/validation/src/main.rs
@@ -52,7 +52,7 @@ async fn main()->Result<(),StartupError>{
.get_or_create_consumer("validation",async_nats::jetstream::consumer::pull::Config{
name:Some("validation".to_owned()),
durable_name:Some("validation".to_owned()),
- filter_subject:"maptest.submissions.>".to_owned(),
+ filter_subject:"maptest.>".to_owned(),
..Default::default()
}).await.map_err(StartupError::NatsConsumer)?
.messages().await.map_err(StartupError::NatsStream)
diff --git a/validation/src/message_handler.rs b/validation/src/message_handler.rs
index c0a5dc2..519baf7 100644
--- a/validation/src/message_handler.rs
+++ b/validation/src/message_handler.rs
@@ -44,8 +44,8 @@ impl MessageHandler{
let message=message_result.map_err(HandleMessageError::Messages)?;
message.double_ack().await.map_err(HandleMessageError::DoubleAck)?;
match message.subject.as_str(){
- "maptest.submissions.uploadnew"=>self.upload_new.upload(from_slice(&message.payload)?).await.map_err(HandleMessageError::UploadNew),
- "maptest.submissions.uploadfix"=>self.upload_fix.upload(from_slice(&message.payload)?).await.map_err(HandleMessageError::UploadFix),
+ "maptest.mapfixes.upload"=>self.upload_fix.upload(from_slice(&message.payload)?).await.map_err(HandleMessageError::UploadFix),
+ "maptest.submissions.upload"=>self.upload_new.upload(from_slice(&message.payload)?).await.map_err(HandleMessageError::UploadNew),
"maptest.submissions.validate"=>self.validator.validate(from_slice(&message.payload)?).await.map_err(HandleMessageError::Validation),
other=>Err(HandleMessageError::UnknownSubject(other.to_owned()))
}