From 175d6f87c796796a87af231a7c14a2e5f5d7d52c Mon Sep 17 00:00:00 2001
From: Nam Huynh <namhq.1989@gmail.com>
Date: Sun, 4 Dec 2022 22:30:46 +0700
Subject: [PATCH] remove server and service in config

---
 config.go | 10 ----------
 utils.go  |  7 ++++---
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/config.go b/config.go
index d084b3c..26ce58e 100644
--- a/config.go
+++ b/config.go
@@ -24,12 +24,6 @@ type Config struct {
 
 	// Stream name
 	StreamName string
-
-	// Server
-	Server string
-
-	// Service
-	Service string
 }
 
 func (c Config) validate() error {
@@ -37,10 +31,6 @@ func (c Config) validate() error {
 		return errors.New("connect URL is required")
 	}
 
-	if c.Server == "" || c.Service == "" {
-		return errors.New("server and service name is required")
-	}
-
 	return nil
 }
 
diff --git a/utils.go b/utils.go
index 9a8ab42..16e75b5 100644
--- a/utils.go
+++ b/utils.go
@@ -29,7 +29,8 @@ func combineStreamAndSubjectName(stream, subject string) string {
 	return fmt.Sprintf("%s.%s", stream, subject)
 }
 
-// GenerateSubjectByClientType ...
-func GenerateSubjectByClientType(subject string) string {
-	return fmt.Sprintf("%s.%s.%s.%s", globalConfig.StreamName, globalConfig.Server, globalConfig.Service, subject)
+// GenerateSubject ...
+// GenerateSubject("admin", "help_center", "get_ticket_by_id")
+func GenerateSubject(server, service, subject string) string {
+	return fmt.Sprintf("%s.%s.%s.%s", globalConfig.StreamName, server, service, subject)
 }