refactor(cqrs): use standard message in queries

Author: bastean

internal/app/server/component/page/dashboard/page.dashboard.templ

@@ -39,7 +39,7 @@ script Logout() {
     window.location.replace("/");
 }
 
-templ Page(user *user.ReadResponse) {
+templ Page(attributes *user.ReadResponseAttributes) {
 	@layout.Index(scripts.Head{}, scripts.Body{}) {
 		<div class="ui centered grid container" style="height: 100%;">
 			<div class="sixteen wide column">
@@ -56,11 +56,11 @@ templ Page(user *user.ReadResponse) {
 							<img class="ui avatar image" src="/public/static/assets/favicon.png"/>
 							<div class="content">
 								<div class="ui inverted dropdown">
-									<div class="text">{ user.Username }</div>
+									<div class="text">{ attributes.Username }</div>
 									<i class="dropdown icon"></i>
 									<div class="menu">
 										<div class="header">
-											if !user.Verified {
+											if !attributes.Verified {
 												<i class="inverted red times circle icon" data-variation="red" data-content="Unverified"></i>
 											} else {
 												<i class="inverted green check circle icon" data-variation="green" data-content="Verified"></i>
@@ -85,10 +85,10 @@ templ Page(user *user.ReadResponse) {
 				</div>
 			</div>
 			<div class="sixteen wide mobile eight wide computer column">
-				@UpdateForm(user.Email, user.Username)
+				@UpdateForm(attributes.Email, attributes.Username)
 				@DeleteForm()
 			</div>
-			if !user.Verified {
+			if !attributes.Verified {
 				<div class="ui looping pulsating transition blue bottom fixed nag">
 					<div class="title">
 						<i class="check circle icon"></i>

internal/app/server/component/page/dashboard/page.dashboard_templ.go

@@ -7,9 +7,9 @@ import (
 	"github.com/bastean/codexgo/v4/internal/app/server/service/errs"
 	"github.com/bastean/codexgo/v4/internal/app/server/service/format"
 	"github.com/bastean/codexgo/v4/internal/app/server/service/key"
-	"github.com/bastean/codexgo/v4/internal/pkg/service/communication"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/errors"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/module/user"
+	"github.com/bastean/codexgo/v4/internal/pkg/service/query"
 )
 
 func Dashboard(c *gin.Context) {
@@ -20,18 +20,22 @@ func Dashboard(c *gin.Context) {
 		return
 	}
 
-	query := new(user.ReadQuery)
+	attributes := new(user.ReadQueryAttributes)
 
-	query.Id = format.ToString(id)
+	attributes.Id = format.ToString(id)
 
-	response, err := communication.QueryBus.Ask(query)
+	response, err := query.Bus.Ask(query.New(
+		user.ReadQueryKey,
+		attributes,
+		new(user.ReadQueryMeta),
+	))
 
 	if err != nil {
 		errs.AbortByErrWithRedirect(c, errors.BubbleUp(err, "Dashboard"), "/")
 		return
 	}
 
-	found, ok := response.(*user.ReadResponse)
+	found, ok := response.Attributes.(*user.ReadResponseAttributes)
 
 	if !ok {
 		errs.AbortByErrWithRedirect(c, errs.Assertion("Dashboard"), "/")

internal/app/server/handler/page/dashboard.go

@@ -11,29 +11,33 @@ import (
 	"github.com/bastean/codexgo/v4/internal/app/server/service/key"
 	"github.com/bastean/codexgo/v4/internal/app/server/service/reply"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/authentication/jwt"
-	"github.com/bastean/codexgo/v4/internal/pkg/service/communication"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/errors"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/module/user"
+	"github.com/bastean/codexgo/v4/internal/pkg/service/query"
 )
 
 func Login(c *gin.Context) {
-	query := new(user.LoginQuery)
+	attributes := new(user.LoginQueryAttributes)
 
-	err := c.BindJSON(query)
+	err := c.BindJSON(attributes)
 
 	if err != nil {
 		errs.AbortByErr(c, errs.BindingJSON(err, "Login"))
 		return
 	}
 
-	response, err := communication.QueryBus.Ask(query)
+	response, err := query.Bus.Ask(query.New(
+		user.LoginQueryKey,
+		attributes,
+		new(user.LoginQueryMeta),
+	))
 
 	if err != nil {
 		errs.AbortByErr(c, errors.BubbleUp(err, "Login"))
 		return
 	}
 
-	found, ok := response.(*user.LoginResponse)
+	found, ok := response.Attributes.(*user.LoginResponseAttributes)
 
 	if !ok {
 		errs.AbortByErr(c, errs.Assertion("Login"))

internal/app/server/handler/user/login.go

@@ -1,7 +1,6 @@
 package communication
 
 import (
-	"github.com/bastean/codexgo/v4/internal/pkg/service/communication/memory"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/communication/rabbitmq"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/env"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/errors"
@@ -21,7 +20,6 @@ var Service = &struct {
 var (
 	err      error
 	RabbitMQ *rabbitmq.RabbitMQ
-	QueryBus *memory.QueryBus
 )
 
 func Up() error {

internal/pkg/service/communication/communication.go

@@ -3,10 +3,10 @@ package module
 import (
 	"github.com/bastean/codexgo/v4/internal/pkg/service/command"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/communication"
-	"github.com/bastean/codexgo/v4/internal/pkg/service/communication/memory"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/errors"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/module/user"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/persistence"
+	"github.com/bastean/codexgo/v4/internal/pkg/service/query"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/record/log"
 )
 
@@ -52,9 +52,9 @@ func Start() error {
 		return errors.BubbleUp(err, "Start")
 	}
 
-	communication.QueryBus, err = memory.NewQueryBus([]memory.QueryHandler{
-		user.ReadHandler,
-		user.LoginHandler,
+	query.Bus, err = query.NewBus(query.Mapper{
+		user.ReadQueryKey:  user.ReadHandler,
+		user.LoginQueryKey: user.LoginHandler,
 	})
 
 	if err != nil {

internal/pkg/service/communication/memory/query.go

@@ -25,13 +25,33 @@ var (
 	VerifyCommandKey = verify.CommandKey
 )
 
+var (
+	ReadQueryKey  = read.QueryKey
+	LoginQueryKey = login.QueryKey
+)
+
+var (
+	ReadResponseKey  = read.ResponseKey
+	LoginResponseKey = login.ResponseKey
+)
+
 type (
 	CreateCommandAttributes = create.CommandAttributes
 	UpdateCommandAttributes = update.CommandAttributes
 	DeleteCommandAttributes = delete.CommandAttributes
 	VerifyCommandAttributes = verify.CommandAttributes
 )
 
+type (
+	ReadQueryAttributes  = read.QueryAttributes
+	LoginQueryAttributes = login.QueryAttributes
+)
+
+type (
+	ReadResponseAttributes  = read.ResponseAttributes
+	LoginResponseAttributes = login.ResponseAttributes
+)
+
 type (
 	CreateCommandMeta = create.CommandMeta
 	UpdateCommandMeta = update.CommandMeta
@@ -40,11 +60,11 @@ type (
 )
 
 type (
-	ReadQuery  = read.Query
-	LoginQuery = login.Query
+	ReadQueryMeta  = read.QueryMeta
+	LoginQueryMeta = login.QueryMeta
 )
 
 type (
-	ReadResponse  = read.Response
-	LoginResponse = login.Response
+	ReadResponseMeta  = read.ResponseMeta
+	LoginResponseMeta = login.ResponseMeta
 )

internal/pkg/service/module/module.go

@@ -0,0 +1,24 @@
+package query
+
+import (
+	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/messages"
+	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/queries"
+	"github.com/bastean/codexgo/v4/pkg/context/shared/infrastructure/communications/memory"
+)
+
+var (
+	Bus queries.Bus
+)
+
+var (
+	NewBus = memory.NewQueryBus
+)
+
+type (
+	Mapper  = memory.QueryMapper
+	Handler = queries.Handler
+)
+
+func New(key queries.Key, attributes, meta any) *queries.Query {
+	return messages.New[queries.Query](key, attributes, meta)
+}