fix subscription without qgroup (#38)

Co-authored-by: Radu Popovici <rpopovici@totalsoft.ro>
osstotalsoft · Aug 4, 2022 · e0f9bf3 · e0f9bf3
1 parent ec04090
commit e0f9bf3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/pkg/messaging/nats/nats.go b/pkg/messaging/nats/nats.go
@@ -397,10 +397,14 @@ func mergeGlobalAndSubscriptionOptions(globalOptions options, subscriptionOption
 	}
 
 	if subscriptionOptions.QGroup != nil {
-		if *subscriptionOptions.QGroup == false {
+		if *subscriptionOptions.QGroup {
+			if mergedOptions.natsQueueGroupName == "" {
+				return mergedOptions, errors.New("nats-streaming error: missing queue group name")
+			}
+			mergedOptions.subscriptionType = subscriptionTypeQueueGroup
+		} else {
 			mergedOptions.natsQueueGroupName = ""
-		} else if mergedOptions.natsQueueGroupName == "" {
-			return mergedOptions, errors.New("nats-streaming error: missing queue group name")
+			mergedOptions.subscriptionType = subscriptionTypeTopic
 		}
 	}
 	if subscriptionOptions.MaxConcurrentMessages != nil {

diff --git a/pkg/messaging/nats/nats_test.go b/pkg/messaging/nats/nats_test.go
@@ -412,10 +412,13 @@ func TestMergeGlobalAndSubscriptionOptions(t *testing.T) {
 		{"test subscription options with qGroup false", args{globalSubscriptionOptions, &messaging.SubscriptionOptions{QGroup: &qGroupFalse}}, func() options {
 			result := globalSubscriptionOptions
 			result.natsQueueGroupName = ""
+			result.subscriptionType = subscriptionTypeTopic
 			return result
 		}, false},
 		{"test subscription options with qGroup true and global options qGroupName set", args{globalSubscriptionOptions, &messaging.SubscriptionOptions{QGroup: &qGroupTrue}}, func() options {
-			return globalSubscriptionOptions
+			result := globalSubscriptionOptions
+			result.subscriptionType = subscriptionTypeQueueGroup
+			return result
 		}, false},
 		{"test subscription options with qGroup true and global options qGroupName not set", args{options{natsQueueGroupName: ""}, &messaging.SubscriptionOptions{QGroup: &qGroupTrue}}, func() options {
 			return options{}