♻️ refactor: updated codebase #6 #8

sivaosorg · Jan 7, 2024 · 072280f · 072280f
1 parent b147590
commit 072280f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/example/redisconn_test.go b/example/redisconn_test.go
@@ -80,8 +80,8 @@ func TestPublish(t *testing.T) {
 
 func TestConsume(t *testing.T) {
 	r, _ := createConn()
-	svc := redisconn.NewRedisPubSub(r.GetConn())
-	subs, err := svc.Subscribe("channel_1")
+	svc := redisconn.NewRedisService(r.GetConn())
+	subs, err := svc.SyncPubSub().Subscribe("channel_1")
 	if err != nil {
 		logger.Errorf("Subscribing message on redis got an error", err)
 		return
@@ -102,12 +102,12 @@ func TestConsume(t *testing.T) {
 	}()
 
 	// Unsubscribe from multiple channels and close the connection
-	err = svc.Unsubscribe("channel_1")
+	err = svc.SyncPubSub().Unsubscribe("channel_1")
 	if err != nil {
 		logger.Errorf("Unsubscribing message on redis got an error", err)
 		return
 	}
-	err = svc.Close()
+	err = svc.SyncPubSub().Close()
 	if err != nil {
 		logger.Errorf("Closing message on redis got an error", err)
 		return

diff --git a/redisconn_model.go b/redisconn_model.go
@@ -9,8 +9,8 @@ import (
 )
 
 type RedisPubSubClient struct {
-	redisConn       *redis.Client            `json:"-"`
-	subscriptionMap map[string]*redis.PubSub `json:"-"`
+	redisConn       *redis.Client
+	subscriptionMap map[string]*redis.PubSub
 }
 
 type RedisMutex struct {

diff --git a/redisconn_service.go b/redisconn_service.go
@@ -21,21 +21,26 @@ type RedisService interface {
 	Lock(key string, value interface{}, expiration time.Duration) error
 	Unlock(key string, value interface{}) error
 	Handler() *redis.Client
+
+	// sync pubsub hook
+	SyncPubSub() RedisPubSubService
 }
 
 type redisServiceImpl struct {
 	redisConn *redis.Client
 	mutex     *RedisMutex
+	pubsub    RedisPubSubService
 }
 
-func NewRedisMutex() *RedisMutex {
+func newRedisMutex() *RedisMutex {
 	return &RedisMutex{make(map[string]*sync.Mutex)}
 }
 
 func NewRedisService(redisConn *redis.Client) RedisService {
 	s := &redisServiceImpl{
 		redisConn: redisConn,
-		mutex:     NewRedisMutex(),
+		mutex:     newRedisMutex(),
+		pubsub:    NewRedisPubSub(redisConn),
 	}
 	return s
 }
@@ -212,3 +217,7 @@ func (r *redisServiceImpl) Unlock(key string, value interface{}) error {
 func (r *redisServiceImpl) Handler() *redis.Client {
 	return r.redisConn
 }
+
+func (r *redisServiceImpl) SyncPubSub() RedisPubSubService {
+	return r.pubsub
+}