From 7b219ea7351408cc368596264edf0f59e9e0a427 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Tue, 25 Jul 2023 16:24:42 +0000 Subject: [PATCH] Update 2 files --- internal/service/account/account.go | 4 +++- internal/service/wallet/wallet.go | 13 ++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/internal/service/account/account.go b/internal/service/account/account.go index fce6250..5b287b3 100644 --- a/internal/service/account/account.go +++ b/internal/service/account/account.go @@ -22,6 +22,8 @@ type accountRepository interface { UpdateName(ctx context.Context, userID string, name *models.Name) (*models.Account, errors.Error) } +const defaultCurrency = "RUB" + type authClient interface { GetUser(ctx context.Context, userID string) (*models.User, errors.Error) } @@ -175,7 +177,7 @@ func (receiver *Service) CreateAccountByUserID(ctx context.Context, userID strin return nil, err } - createdAccount, err := receiver.repository.Insert(ctx, &models.Account{UserID: user.ID}) + createdAccount, err := receiver.repository.Insert(ctx, &models.Account{UserID: user.ID, Wallet: models.Wallet{Currency: defaultCurrency}}) if err != nil { receiver.logger.Error("failed to create account on of ", zap.Error(err), diff --git a/internal/service/wallet/wallet.go b/internal/service/wallet/wallet.go index 41444e6..9b6b8c9 100644 --- a/internal/service/wallet/wallet.go +++ b/internal/service/wallet/wallet.go @@ -2,7 +2,6 @@ package wallet import ( "context" - "fmt" "log" "go.uber.org/zap" @@ -11,6 +10,8 @@ import ( "penahub.gitlab.yandexcloud.net/pena-services/customer/pkg/validate" ) +const defaultCurrency = "RUB" + type accountRepository interface { ChangeWallet(ctx context.Context, userID string, wallet *models.Wallet) (*models.Account, errors.Error) FindByUserID(ctx context.Context, id string) (*models.Account, errors.Error) @@ -65,10 +66,7 @@ func New(deps Deps) *Service { func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *models.ReplenishAccountWallet) (*models.Account, errors.Error) { if validate.IsStringEmpty(request.Account.Wallet.Currency) { - return nil, errors.New( - fmt.Errorf("currency of account <%s> is empty of ", request.Account.UserID), - errors.ErrInternalError, - ) + request.Account.Wallet.Currency = defaultCurrency } cash := request.Cash @@ -161,10 +159,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo func (receiver *Service) WithdrawAccountWalletMoney(ctx context.Context, request *models.WithdrawAccountWallet) (*models.Account, errors.Error) { if validate.IsStringEmpty(request.Account.Wallet.Currency) { - return nil, errors.New( - fmt.Errorf("currency of account <%s> is empty of ", request.Account.UserID), - errors.ErrInternalError, - ) + request.Account.Wallet.Currency = defaultCurrency } cash, err := receiver.currencyClient.Translate(ctx, &models.TranslateCurrency{