From 169206b190d5621cd80eb52014dbf7fed83046af Mon Sep 17 00:00:00 2001 From: Rex Date: Tue, 5 Nov 2024 11:31:49 +0000 Subject: [PATCH 1/3] fix bug: adding back prefix in service group creation --- async-nats/src/service/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/async-nats/src/service/mod.rs b/async-nats/src/service/mod.rs index c1dcdc25f..63924ca40 100644 --- a/async-nats/src/service/mod.rs +++ b/async-nats/src/service/mod.rs @@ -639,7 +639,7 @@ impl Group { queue_group: Z, ) -> Group { Group { - prefix: prefix.to_string(), + prefix: format!("{}.{}", self.prefix.to_string(), prefix.to_string()), stats: self.stats.clone(), client: self.client.clone(), shutdown_tx: self.shutdown_tx.clone(), From 55bededd2fe32097dc40c196c33c0a4d3c49808b Mon Sep 17 00:00:00 2001 From: Rex Fong Date: Tue, 12 Nov 2024 15:47:04 +0000 Subject: [PATCH 2/3] adding test case --- async-nats/src/service/mod.rs | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/async-nats/src/service/mod.rs b/async-nats/src/service/mod.rs index 63924ca40..03ed39ebc 100644 --- a/async-nats/src/service/mod.rs +++ b/async-nats/src/service/mod.rs @@ -639,7 +639,7 @@ impl Group { queue_group: Z, ) -> Group { Group { - prefix: format!("{}.{}", self.prefix.to_string(), prefix.to_string()), + prefix: format!("{}.{}", self.prefix, prefix.to_string()), stats: self.stats.clone(), client: self.client.clone(), shutdown_tx: self.shutdown_tx.clone(), @@ -891,3 +891,29 @@ impl std::fmt::Debug for StatsHandler { write!(f, "Stats handler") } } + +#[cfg(test)] +mod tests { + use super::*; + + #[tokio::test] + async fn test_group_with_queue_group() { + let server = nats_server::run_basic_server(); + let client = crate::connect(server.client_url()).await.unwrap(); + + let group = Group { + prefix: "test".to_string(), + stats: Arc::new(Mutex::new(Endpoints { endpoints: HashMap::new() })), + client, + shutdown_tx: tokio::sync::broadcast::channel(1).0, + subjects: Arc::new(Mutex::new(vec![])), + queue_group: "default".to_string(), + }; + + let new_group = group.group_with_queue_group("v1", "custom_queue"); + + assert_eq!(new_group.prefix, "test.v1"); + assert_eq!(new_group.queue_group, "custom_queue"); + } +} + From f0280bc09b44963eef08568dd3e81596c134b59f Mon Sep 17 00:00:00 2001 From: Rex Fong Date: Wed, 13 Nov 2024 08:28:03 +0000 Subject: [PATCH 3/3] apply cargo fmt --- async-nats/src/service/mod.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/async-nats/src/service/mod.rs b/async-nats/src/service/mod.rs index 03ed39ebc..fc9589542 100644 --- a/async-nats/src/service/mod.rs +++ b/async-nats/src/service/mod.rs @@ -903,7 +903,9 @@ mod tests { let group = Group { prefix: "test".to_string(), - stats: Arc::new(Mutex::new(Endpoints { endpoints: HashMap::new() })), + stats: Arc::new(Mutex::new(Endpoints { + endpoints: HashMap::new(), + })), client, shutdown_tx: tokio::sync::broadcast::channel(1).0, subjects: Arc::new(Mutex::new(vec![])), @@ -916,4 +918,3 @@ mod tests { assert_eq!(new_group.queue_group, "custom_queue"); } } -