update: deprecate namespace and switch to multi-tenancy

captcha/captcha.go

@@ -9,34 +9,15 @@ import (
 )
 
 type Captcha struct {
-	Namespace string
-	RDb       *redis.Client
+	RDb *redis.Client
 }
 
-func New(options ...Option) *Captcha {
-	x := new(Captcha)
-	for _, v := range options {
-		v(x)
-	}
-	return x
-}
-
-type Option func(x *Captcha)
-
-func SetNamespace(v string) Option {
-	return func(x *Captcha) {
-		x.Namespace = v
-	}
-}
-
-func SetRedis(v *redis.Client) Option {
-	return func(x *Captcha) {
-		x.RDb = v
-	}
+func New(rdb *redis.Client) *Captcha {
+	return &Captcha{RDb: rdb}
 }
 
 func (x *Captcha) Key(name string) string {
-	return fmt.Sprintf(`%s:captcha:%s`, x.Namespace, name)
+	return fmt.Sprintf(`captcha:%s`, name)
 }
 
 func (x *Captcha) Create(ctx context.Context, name string, code string, ttl time.Duration) string {

captcha/captcha_test.go

@@ -14,15 +14,11 @@ import (
 var x *captcha.Captcha
 
 func TestMain(m *testing.M) {
-	namespace := os.Getenv("NAMESPACE")
 	opts, err := redis.ParseURL(os.Getenv("DATABASE_REDIS"))
 	if err != nil {
 		log.Fatalln(err)
 	}
-	x = captcha.New(
-		captcha.SetNamespace(namespace),
-		captcha.SetRedis(redis.NewClient(opts)),
-	)
+	x = captcha.New(redis.NewClient(opts))
 	os.Exit(m.Run())
 }
 

locker/locker.go

@@ -9,34 +9,15 @@ import (
 )
 
 type Locker struct {
-	Namespace string
-	RDb       *redis.Client
+	RDb *redis.Client
 }
 
-func New(options ...Option) *Locker {
-	x := new(Locker)
-	for _, v := range options {
-		v(x)
-	}
-	return x
-}
-
-type Option func(x *Locker)
-
-func SetNamespace(v string) Option {
-	return func(x *Locker) {
-		x.Namespace = v
-	}
-}
-
-func SetRedis(v *redis.Client) Option {
-	return func(x *Locker) {
-		x.RDb = v
-	}
+func New(rdb *redis.Client) *Locker {
+	return &Locker{RDb: rdb}
 }
 
 func (x *Locker) Key(name string) string {
-	return fmt.Sprintf(`%s:locker:%s`, x.Namespace, name)
+	return fmt.Sprintf(`locker:%s`, name)
 }
 
 func (x *Locker) Update(ctx context.Context, name string, ttl time.Duration) int64 {

locker/locker_test.go

@@ -14,15 +14,11 @@ import (
 var x *locker.Locker
 
 func TestMain(m *testing.M) {
-	namespace := os.Getenv("NAMESPACE")
 	opts, err := redis.ParseURL(os.Getenv("DATABASE_REDIS"))
 	if err != nil {
 		log.Fatalln(err)
 	}
-	x = locker.New(
-		locker.SetNamespace(namespace),
-		locker.SetRedis(redis.NewClient(opts)),
-	)
+	x = locker.New(redis.NewClient(opts))
 	os.Exit(m.Run())
 }
 

rest/common.go

@@ -19,12 +19,6 @@ func New(options ...Option) *Service {
 
 type Option func(x *Service)
 
-func SetNamespace(v string) Option {
-	return func(x *Service) {
-		x.Namespace = v
-	}
-}
-
 func SetMongoClient(v *mongo.Client) Option {
 	return func(x *Service) {
 		x.Mgo = v

rest/common_test.go

@@ -87,10 +87,8 @@ func TestMain(m *testing.M) {
 	if err := UseNats(ctx); err != nil {
 		panic(err)
 	}
-	namespace := os.Getenv("NAMESPACE")
 	xcipher, _ := cipher.New("6ixSiEXaqxsJTozbnxQ76CWdZXB2JazK")
 	service = rest.New(
-		rest.SetNamespace(namespace),
 		rest.SetMongoClient(mgo),
 		rest.SetDatabase(db),
 		rest.SetRedis(rdb),

rest/controller.go

@@ -9,7 +9,6 @@ import (
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo/options"
-	"net/http"
 	"strconv"
 	"strings"
 	"time"
@@ -55,7 +54,7 @@ func (x *Controller) Create(ctx context.Context, c *app.RequestContext) {
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		c.Status(204)
 		return
 	}
 
@@ -65,7 +64,7 @@ func (x *Controller) Create(ctx context.Context, c *app.RequestContext) {
 		return
 	}
 
-	c.JSON(http.StatusCreated, r)
+	c.JSON(201, r)
 }
 
 type BulkCreateDto struct {
@@ -108,7 +107,7 @@ func (x *Controller) BulkCreate(ctx context.Context, c *app.RequestContext) {
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		c.Status(204)
 		return
 	}
 
@@ -118,7 +117,7 @@ func (x *Controller) BulkCreate(ctx context.Context, c *app.RequestContext) {
 		return
 	}
 
-	c.JSON(http.StatusCreated, r)
+	c.JSON(201, r)
 }
 
 type SizeDto struct {
@@ -151,7 +150,7 @@ func (x *Controller) Size(ctx context.Context, c *app.RequestContext) {
 	}
 
 	c.Header("x-total", strconv.Itoa(int(size)))
-	c.Status(http.StatusNoContent)
+	c.Status(204)
 }
 
 type FindDto struct {
@@ -220,7 +219,7 @@ func (x *Controller) Find(ctx context.Context, c *app.RequestContext) {
 	}
 
 	c.Header("x-total", strconv.Itoa(int(size)))
-	c.JSON(http.StatusOK, data)
+	c.JSON(200, data)
 }
 
 type FindOneDto struct {
@@ -256,7 +255,7 @@ func (x *Controller) FindOne(ctx context.Context, c *app.RequestContext) {
 		return
 	}
 
-	c.JSON(http.StatusOK, data)
+	c.JSON(200, data)
 }
 
 type FindByIdDto struct {
@@ -287,7 +286,7 @@ func (x *Controller) FindById(ctx context.Context, c *app.RequestContext) {
 		return
 	}
 
-	c.JSON(http.StatusOK, data)
+	c.JSON(200, data)
 }
 
 type UpdateDto struct {
@@ -335,7 +334,7 @@ func (x *Controller) Update(ctx context.Context, c *app.RequestContext) {
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		c.Status(204)
 		return
 	}
 
@@ -345,7 +344,7 @@ func (x *Controller) Update(ctx context.Context, c *app.RequestContext) {
 		return
 	}
 
-	c.JSON(http.StatusOK, r)
+	c.JSON(200, r)
 }
 
 type UpdateByIdDto struct {
@@ -389,7 +388,7 @@ func (x *Controller) UpdateById(ctx context.Context, c *app.RequestContext) {
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		c.Status(204)
 		return
 	}
 
@@ -399,7 +398,7 @@ func (x *Controller) UpdateById(ctx context.Context, c *app.RequestContext) {
 		return
 	}
 
-	c.JSON(http.StatusOK, r)
+	c.JSON(200, r)
 }
 
 type ReplaceDto struct {
@@ -441,7 +440,7 @@ func (x *Controller) Replace(ctx context.Context, c *app.RequestContext) {
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		c.Status(204)
 		return
 	}
 
@@ -451,7 +450,7 @@ func (x *Controller) Replace(ctx context.Context, c *app.RequestContext) {
 		return
 	}
 
-	c.JSON(http.StatusOK, r)
+	c.JSON(200, r)
 }
 
 type DeleteDto struct {
@@ -484,7 +483,7 @@ func (x *Controller) Delete(ctx context.Context, c *app.RequestContext) {
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		c.Status(204)
 		return
 	}
 
@@ -494,7 +493,7 @@ func (x *Controller) Delete(ctx context.Context, c *app.RequestContext) {
 		return
 	}
 
-	c.JSON(http.StatusOK, r)
+	c.JSON(200, r)
 }
 
 type BulkDeleteDto struct {
@@ -531,7 +530,7 @@ func (x *Controller) BulkDelete(ctx context.Context, c *app.RequestContext) {
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		c.Status(204)
 		return
 	}
 
@@ -541,7 +540,7 @@ func (x *Controller) BulkDelete(ctx context.Context, c *app.RequestContext) {
 		return
 	}
 
-	c.JSON(http.StatusOK, r)
+	c.JSON(200, r)
 }
 
 type SortDto struct {
@@ -577,7 +576,7 @@ func (x *Controller) Sort(ctx context.Context, c *app.RequestContext) {
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		c.Status(204)
 		return
 	}
 
@@ -587,13 +586,13 @@ func (x *Controller) Sort(ctx context.Context, c *app.RequestContext) {
 		return
 	}
 
-	c.Status(http.StatusNoContent)
+	c.Status(204)
 }
 
 func (x *Controller) Transaction(ctx context.Context, c *app.RequestContext) {
 	txn := help.Uuid()
 	x.Service.Transaction(ctx, txn)
-	c.JSON(http.StatusCreated, utils.H{
+	c.JSON(201, utils.H{
 		"txn": txn,
 	})
 }
@@ -615,5 +614,5 @@ func (x *Controller) Commit(ctx context.Context, c *app.RequestContext) {
 		return
 	}
 
-	c.JSON(http.StatusOK, r)
+	c.JSON(200, r)
 }

rest/service.go

@@ -20,7 +20,6 @@ import (
 )
 
 type Service struct {
-	Namespace string
 	Mgo       *mongo.Client
 	Db        *mongo.Database
 	RDb       *redis.Client
@@ -209,7 +208,7 @@ func (x *Service) Sort(ctx context.Context, name string, key string, ids []primi
 }
 
 func (x *Service) Transaction(ctx context.Context, txn string) {
-	key := fmt.Sprintf(`%s:transaction:%s`, x.Namespace, txn)
+	key := fmt.Sprintf(`transaction:%s`, txn)
 	x.RDb.LPush(ctx, key, time.Now().Format(time.RFC3339)).Val()
 	x.RDb.Expire(ctx, key, time.Hour*5).Val()
 }
@@ -234,7 +233,7 @@ func (x *Service) TxnNotExists(ctx context.Context, key string) (err error) {
 }
 
 func (x *Service) Pending(ctx context.Context, txn string, dto PendingDto) (err error) {
-	key := fmt.Sprintf(`%s:transaction:%s`, x.Namespace, txn)
+	key := fmt.Sprintf(`transaction:%s`, txn)
 	if err = x.TxnNotExists(ctx, key); err != nil {
 		return
 	}
@@ -249,7 +248,7 @@ func (x *Service) Pending(ctx context.Context, txn string, dto PendingDto) (err
 }
 
 func (x *Service) Commit(ctx context.Context, txn string) (_ interface{}, err error) {
-	key := fmt.Sprintf(`%s:transaction:%s`, x.Namespace, txn)
+	key := fmt.Sprintf(`transaction:%s`, txn)
 	if err = x.TxnNotExists(ctx, key); err != nil {
 		return
 	}
@@ -461,7 +460,7 @@ func (x *Service) Publish(ctx context.Context, name string, dto PublishDto) (err
 		}
 
 		b, _ := sonic.Marshal(dto)
-		subject := fmt.Sprintf(`%s.events.%s`, x.Namespace, name)
+		subject := fmt.Sprintf(`events.%s`, name)
 		if _, err = x.JetStream.Publish(subject, b, nats.Context(ctx)); err != nil {
 			return
 		}