improve context for micro controller

unusualcodeorg · Jun 30, 2024 · f72c38c · f72c38c
1 parent 273624d
commit f72c38c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/arch/micro/context.go b/arch/micro/context.go
@@ -4,16 +4,22 @@ import (
 	"context"
 )
 
-type NatsContext struct {
+type Context struct {
 	context.Context
-	Client  *NatsClient
-	Subject string
+	NatsClient  *NatsClient
+	NatsSubject string
 }
 
-func NewNatsContext(client *NatsClient, baseSub string) *NatsContext {
-	return &NatsContext{
+func EmptyContext() *Context {
+	return &Context{
 		Context: context.Background(),
-		Client:  client,
-		Subject: baseSub,
+	}
+}
+
+func NewContext(natsClient *NatsClient, baseSub string) *Context {
+	return &Context{
+		Context:     context.Background(),
+		NatsClient:  natsClient,
+		NatsSubject: baseSub,
 	}
 }
diff --git a/arch/micro/controller.go b/arch/micro/controller.go
@@ -6,19 +6,16 @@ import (
 
 type baseController struct {
 	network.BaseController
-	natsCtx *NatsContext
+	context *Context
 }
 
 func NewBaseController(basePath string, authProvider network.AuthenticationProvider, authorizeProvider network.AuthorizationProvider) BaseController {
 	return &baseController{
 		BaseController: network.NewBaseController(basePath, authProvider, authorizeProvider),
+		context:        EmptyContext(),
 	}
 }
 
-func (c *baseController) SetNatsContext(ctx *NatsContext) {
-	c.natsCtx = ctx
-}
-
-func (c *baseController) NatsContext() *NatsContext {
-	return c.natsCtx
+func (c *baseController) Context() *Context {
+	return c.context
 }
diff --git a/arch/micro/interfaces.go b/arch/micro/interfaces.go
@@ -11,8 +11,7 @@ type NatsRequest = micro.Request
 
 type BaseController interface {
 	network.BaseController
-	SetNatsContext(ctx *NatsContext)
-	NatsContext() *NatsContext
+	Context() *Context
 }
 
 type Controller interface {

diff --git a/arch/micro/request.go b/arch/micro/request.go
@@ -3,22 +3,20 @@ package micro
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 )
 
 func Respond[T any](req NatsRequest, data *T, err error) {
 	req.RespondJSON(NewMessage(data, err))
 }
 
-func Request[T any, V any](ctx *NatsContext, sub string, send *T, receive *V) (*V, error) {
+func Request[T any, V any](ctx *Context, subject string, send *T, receive *V) (*V, error) {
 	sendMsg := NewMessage(send, nil)
 	sendPayload, err := json.Marshal(sendMsg)
 	if err != nil {
 		return nil, err
 	}
 
-	subject := fmt.Sprintf(`%s.%s`, ctx.Subject, sub)
-	msg, err := ctx.Client.Conn.Request(subject, sendPayload, ctx.Client.Timeout)
+	msg, err := ctx.NatsClient.Conn.Request(subject, sendPayload, ctx.NatsClient.Timeout)
 	if err != nil {
 		return nil, err
 	}

diff --git a/arch/micro/router.go b/arch/micro/router.go
@@ -48,8 +48,8 @@ func (r *router) LoadControllers(controllers []Controller) {
 	for _, c := range controllers {
 		baseSub := fmt.Sprintf(`%s.%s`, r.natsClient.Service.Info().Name, strings.ReplaceAll(c.Path(), "/", ""))
 
-		ctx := NewNatsContext(r.natsClient, baseSub)
-		c.SetNatsContext(ctx)
+		c.Context().NatsClient = r.natsClient
+		c.Context().NatsSubject = baseSub
 
 		ng := r.natsClient.Service.AddGroup(baseSub)
 		c.MountNats(ng)