From 799dee2888664cb0362a2f881e965d6c8636e99f Mon Sep 17 00:00:00 2001
From: Dmitry Ponomarev <demdxx@gmail.com>
Date: Fri, 29 Mar 2024 13:00:54 +0100
Subject: [PATCH] Improve account registration resolver

---
 .../account/delivery/graphql/base_resolver.go      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/repository/account/delivery/graphql/base_resolver.go b/repository/account/delivery/graphql/base_resolver.go
index cd0f888..a7e2aad 100644
--- a/repository/account/delivery/graphql/base_resolver.go
+++ b/repository/account/delivery/graphql/base_resolver.go
@@ -27,12 +27,14 @@ var (
 
 // QueryResolver implements GQL API methods
 type QueryResolver struct {
+	userRepo *userrepo.Repository
 	accounts account.Usecase
 }
 
 // NewQueryResolver returns new API resolver
 func NewQueryResolver() *QueryResolver {
 	return &QueryResolver{
+		userRepo: userrepo.New(),
 		accounts: usecase.NewAccountUsecase(userrepo.New(), repository.New()),
 	}
 }
@@ -85,22 +87,22 @@ func (r *QueryResolver) RegisterAccount(ctx context.Context, input *gqlmodels.Ac
 
 	if _, err := r.accounts.Register(ctx, userObj, accObj, input.Password); err != nil {
 		return nil, err
+	} else {
+		userObj, _ = r.userRepo.Get(ctx, userObj.ID)
 	}
 
 	// Send message to the account owner about the account creation (welcome message)
-	err := messanger.Get(ctx).Send(ctx,
-		"account.register",
-		[]string{userObj.Email},
-		map[string]any{
+	err := messanger.Get(ctx).Send(ctx, "account.register",
+		[]string{userObj.Email}, map[string]any{
 			"id":      accObj.ID,
 			"account": accObj,
 			"owner":   userObj,
 		})
 	if err != nil {
+		// Log error if message sending failed but do not return error to the client
 		ctxlogger.Get(ctx).Error("Failed to send message",
-			zap.String("template", "account.created"),
+			zap.String("template", "account.register"),
 			zap.Error(err))
-		return nil, err
 	}
 
 	return &gqlmodels.AccountCreatePayload{