remove C_AggregateID from CommandBase

Signed-off-by: Jerry Bai <chinaren_bjr@163.com>

Author: berkaroad

commanding/commanding.go

@@ -5,7 +5,6 @@ import (
 	"log/slog"
 	"strings"
 
-	"github.com/berkaroad/squat/domain"
 	"github.com/berkaroad/squat/messaging"
 	"github.com/berkaroad/squat/serialization"
 )
@@ -61,31 +60,23 @@ type CommandHandlerGroup interface {
 
 type CommandHandlerProxy messaging.MessageHandlerProxy[CommandData]
 
-func NewCommandBase(commandID string, aggregateID string) CommandBase {
+func NewCommandBase(commandID string) CommandBase {
 	if commandID == "" {
 		panic(ErrEmptyCommandID)
 	}
-	if aggregateID == "" {
-		panic(domain.ErrEmptyAggregateID)
-	}
 	return CommandBase{
-		C_ID:          commandID,
-		C_AggregateID: aggregateID,
+		C_ID: commandID,
 	}
 }
 
 // Base of command, should override method 'TypeName()' and 'AggregateTypeName()'
 type CommandBase struct {
-	C_ID          string `json:"c_id"`
-	C_AggregateID string `json:"c_aggregate_id"`
+	C_ID string `json:"c_id"`
 }
 
 func (c CommandBase) CommandID() string {
 	return c.C_ID
 }
-func (c CommandBase) AggregateID() string {
-	return c.C_AggregateID
-}
 
 func CreateCommandMail(data *CommandData) messaging.Mail[CommandData] {
 	return &commandMail{

tests/benchmark_test.go

@@ -135,7 +135,8 @@ func BenchmarkAccount(b *testing.B) {
 		for i := 0; i < b.N; i++ {
 			wg.Add(1)
 			cmd := &CreateAccountCommand{
-				CommandBase: commanding.NewCommandBase(NewUUID(), fmt.Sprintf("acc-%d", i)),
+				CommandBase: commanding.NewCommandBase(NewUUID()),
+				AccountId:   fmt.Sprintf("acc-%d", i),
 				Name:        fmt.Sprintf("Account %d", i),
 			}
 			go processCmdResult(wg, cmd, time.Second*30)
@@ -153,7 +154,8 @@ func BenchmarkAccount(b *testing.B) {
 		for i := 0; i < b.N; i++ {
 			wg.Add(1)
 			cmd := &DepositCommand{
-				CommandBase: commanding.NewCommandBase(NewUUID(), fmt.Sprintf("acc-%d", i)),
+				CommandBase: commanding.NewCommandBase(NewUUID()),
+				AccountId:   fmt.Sprintf("acc-%d", i),
 				Amount:      1.1,
 			}
 			go processCmdResult(wg, cmd, time.Second*30)
@@ -171,7 +173,8 @@ func BenchmarkAccount(b *testing.B) {
 		for i := 0; i < b.N; i++ {
 			wg.Add(1)
 			cmd := &WithdrawCommand{
-				CommandBase: commanding.NewCommandBase(NewUUID(), fmt.Sprintf("acc-%d", i)),
+				CommandBase: commanding.NewCommandBase(NewUUID()),
+				AccountId:   fmt.Sprintf("acc-%d", i),
 				Amount:      1.1,
 			}
 			go processCmdResult(wg, cmd, time.Second*30)
@@ -189,7 +192,8 @@ func BenchmarkAccount(b *testing.B) {
 		for i := 0; i < b.N; i++ {
 			wg.Add(1)
 			cmd := &RemoveAccountCommand{
-				CommandBase: commanding.NewCommandBase(NewUUID(), fmt.Sprintf("acc-%d", i)),
+				CommandBase: commanding.NewCommandBase(NewUUID()),
+				AccountId:   fmt.Sprintf("acc-%d", i),
 			}
 			go processCmdResult(wg, cmd, time.Second*30)
 		}

tests/commandhandlers.go

@@ -29,14 +29,14 @@ func (ch *AccountCommandHandler) handleCreateAccount(ctx context.Context, data c
 	data.SetCustomExtension(ctx, "create", "false")
 	cmd := data.Command.(*CreateAccountCommand)
 
-	accountData, err := ch.Repo.Get(ctx, cmd.C_AggregateID)
+	accountData, err := ch.Repo.Get(ctx, cmd.AggregateID())
 	if err != nil {
 		logger.Error(err.Error())
 		return err
 	}
 
 	newAccountData, err := CreateAccount(accountData, AccountInfo{
-		ID:   cmd.C_AggregateID,
+		ID:   cmd.AggregateID(),
 		Name: cmd.Name,
 	})
 	if err != nil {
@@ -57,13 +57,13 @@ func (ch *AccountCommandHandler) handleDeposit(ctx context.Context, data command
 	data.SetCustomExtension(ctx, "update", "true")
 	cmd := data.Command.(*DepositCommand)
 
-	accountData, err := ch.Repo.Get(ctx, cmd.C_AggregateID)
+	accountData, err := ch.Repo.Get(ctx, cmd.AggregateID())
 	if err != nil {
 		logger.Error(err.Error())
 		return err
 	}
 	if accountData == nil {
-		return fmt.Errorf("%w: %s", ErrAccounteNotExists, cmd.C_AggregateID)
+		return fmt.Errorf("%w: %s", ErrAccounteNotExists, cmd.AggregateID())
 	}
 
 	err = accountData.Deposit(cmd.Amount)
@@ -85,13 +85,13 @@ func (ch *AccountCommandHandler) handleWithdraw(ctx context.Context, data comman
 	data.SetCustomExtension(ctx, "update", "true")
 	cmd := data.Command.(*WithdrawCommand)
 
-	accountData, err := ch.Repo.Get(ctx, cmd.C_AggregateID)
+	accountData, err := ch.Repo.Get(ctx, cmd.AggregateID())
 	if err != nil {
 		logger.Error(err.Error())
 		return err
 	}
 	if accountData == nil {
-		return fmt.Errorf("%w: %s", ErrAccounteNotExists, cmd.C_AggregateID)
+		return fmt.Errorf("%w: %s", ErrAccounteNotExists, cmd.AggregateID())
 	}
 
 	err = accountData.WithDraw(cmd.Amount)
@@ -113,7 +113,7 @@ func (ch *AccountCommandHandler) handleRemoveAccount(ctx context.Context, data c
 	data.SetCustomExtension(ctx, "delete", "true")
 	cmd := data.Command.(*RemoveAccountCommand)
 
-	accountData, err := ch.Repo.Get(ctx, cmd.C_AggregateID)
+	accountData, err := ch.Repo.Get(ctx, cmd.AggregateID())
 	if err != nil {
 		logger.Error(err.Error())
 		return err

tests/commands.go

@@ -15,14 +15,18 @@ var _ commanding.Command = (*CreateAccountCommand)(nil)
 
 type CreateAccountCommand struct {
 	commanding.CommandBase
-
-	Name string
+	AccountId string
+	Name      string
 }
 
 func (c CreateAccountCommand) TypeName() string {
 	return Command_CreateAccount
 }
 
+func (c CreateAccountCommand) AggregateID() string {
+	return c.AccountId
+}
+
 func (c CreateAccountCommand) AggregateTypeName() string {
 	return AggregateTypeName
 }
@@ -31,14 +35,18 @@ var _ commanding.Command = (*DepositCommand)(nil)
 
 type DepositCommand struct {
 	commanding.CommandBase
-
-	Amount float64
+	AccountId string
+	Amount    float64
 }
 
 func (c DepositCommand) TypeName() string {
 	return Command_Deposit
 }
 
+func (c DepositCommand) AggregateID() string {
+	return c.AccountId
+}
+
 func (c DepositCommand) AggregateTypeName() string {
 	return AggregateTypeName
 }
@@ -47,14 +55,18 @@ var _ commanding.Command = (*WithdrawCommand)(nil)
 
 type WithdrawCommand struct {
 	commanding.CommandBase
-
-	Amount float64
+	AccountId string
+	Amount    float64
 }
 
 func (c WithdrawCommand) TypeName() string {
 	return Command_Withdraw
 }
 
+func (c WithdrawCommand) AggregateID() string {
+	return c.AccountId
+}
+
 func (c WithdrawCommand) AggregateTypeName() string {
 	return AggregateTypeName
 }
@@ -63,12 +75,17 @@ var _ commanding.Command = (*RemoveAccountCommand)(nil)
 
 type RemoveAccountCommand struct {
 	commanding.CommandBase
+	AccountId string
 }
 
 func (c RemoveAccountCommand) TypeName() string {
 	return Command_RemoveAccount
 }
 
+func (c RemoveAccountCommand) AggregateID() string {
+	return c.AccountId
+}
+
 func (c RemoveAccountCommand) AggregateTypeName() string {
 	return AggregateTypeName
 }