PenaSide/customer
3
0
Fork 0
generated from PenaSide/GolangTemplate
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor: wallet deps

Browse Source
This commit is contained in:
Kirill 2023-06-13 22:33:40 +03:00
parent b63d508746
commit 4ac89ee3c4
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/initialize/services.go
View File

@ -53,7 +53,7 @@ func NewServices(deps *ServicesDeps) *Services {
Logger: deps.Logger, Logger: deps.Logger,
Repository: deps.Repositories.CurrencyRepository, Repository: deps.Repositories.CurrencyRepository,
}), }),
CartService: cart.New(&cart.Deps{ CartService: cart.New(cart.Deps{
Logger: deps.Logger, Logger: deps.Logger,
Repository: deps.Repositories.AccountRepository, Repository: deps.Repositories.AccountRepository,
HubadminClient: deps.Clients.HubadminClient, HubadminClient: deps.Clients.HubadminClient,

6
internal/service/cart/cart.go
View File

@ -52,11 +52,7 @@ type Service struct {
walletService walletService walletService walletService
} }
func New(deps *Deps) *Service { func New(deps Deps) *Service {
if deps == nil {
log.Panicln("deps is nil on <New (cart service)>")
}
if deps.Logger == nil { if deps.Logger == nil {
log.Panicln("logger is nil on <New (cart service)>") log.Panicln("logger is nil on <New (cart service)>")
} }

22
internal/service/wallet/wallet.go
View File

@ -22,10 +22,6 @@ type currencyClient interface {
Translate(context.Context, *models.TranslateCurrency) (int64, errors.Error) Translate(context.Context, *models.TranslateCurrency) (int64, errors.Error)
} }
type paymentService interface {
GetPaymentLink(ctx context.Context, request *models.GetPaymentLinkRequest) (string, errors.Error)
}
type Deps struct { type Deps struct {
Logger *zap.Logger Logger *zap.Logger
Repository accountRepository Repository accountRepository
@ -76,7 +72,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo
}) })
if translateErr != nil { if translateErr != nil {
receiver.logger.Error("failed to translate cash on <ReplenishAccountWallet> of <WalletService>", receiver.logger.Error("failed to translate cash on <ReplenishAccountWallet> of <WalletService>",
zap.Error(translateerr()), zap.Error(translateErr.Extract()),
) )
return nil, translateErr return nil, translateErr
@ -95,7 +91,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo
}) })
if changeErr != nil { if changeErr != nil {
receiver.logger.Error("failed to replenish wallet on <ReplenishAccountWallet> of <WalletService>", receiver.logger.Error("failed to replenish wallet on <ReplenishAccountWallet> of <WalletService>",
zap.Error(changeerr()), zap.Error(changeErr.Extract()),
zap.String("Currency", request.Account.Wallet.Currency), zap.String("Currency", request.Account.Wallet.Currency),
zap.Int64("Money", request.Account.Wallet.Money+request.Cash), zap.Int64("Money", request.Account.Wallet.Money+request.Cash),
zap.Int64("Cash", request.Account.Wallet.Cash+cash), zap.Int64("Cash", request.Account.Wallet.Cash+cash),
@ -115,7 +111,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo
}) })
if err != nil { if err != nil {
receiver.logger.Error("failed to translate money on <ReplenishAccountWallet> of <WalletService>", receiver.logger.Error("failed to translate money on <ReplenishAccountWallet> of <WalletService>",
zap.Error(err()), zap.Error(err.Extract()),
) )
return nil, err return nil, err
@ -131,7 +127,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo
}) })
if err != nil { if err != nil {
receiver.logger.Error("failed to replenish wallet on <ReplenishAccountWallet> of <WalletService>", receiver.logger.Error("failed to replenish wallet on <ReplenishAccountWallet> of <WalletService>",
zap.Error(err()), zap.Error(err.Extract()),
zap.String("Currency", request.Account.Wallet.Currency), zap.String("Currency", request.Account.Wallet.Currency),
zap.Int64("Money", request.Account.Wallet.Money+request.Cash), zap.Int64("Money", request.Account.Wallet.Money+request.Cash),
zap.Int64("Cash", request.Account.Wallet.Cash+cash), zap.Int64("Cash", request.Account.Wallet.Cash+cash),
@ -159,7 +155,7 @@ func (receiver *Service) WithdrawAccountWalletMoney(ctx context.Context, request
}) })
if err != nil { if err != nil {
receiver.logger.Error("failed to translate money on <WithdrawAccountWalletMoney> of <WalletService>", receiver.logger.Error("failed to translate money on <WithdrawAccountWalletMoney> of <WalletService>",
zap.Error(err()), zap.Error(err.Extract()),
) )
return nil, err return nil, err
@ -174,7 +170,7 @@ func (receiver *Service) WithdrawAccountWalletMoney(ctx context.Context, request
}) })
if err != nil { if err != nil {
receiver.logger.Error("failed to replenish wallet on <ReplenishAccountWallet> of <WalletService>", receiver.logger.Error("failed to replenish wallet on <ReplenishAccountWallet> of <WalletService>",
zap.Error(err()), zap.Error(err.Extract()),
zap.String("Currency", request.Account.Wallet.Currency), zap.String("Currency", request.Account.Wallet.Currency),
zap.Int64("Money", request.Account.Wallet.Money-request.Money), zap.Int64("Money", request.Account.Wallet.Money-request.Money),
zap.Int64("Cash", request.Account.Wallet.Cash+cash), zap.Int64("Cash", request.Account.Wallet.Cash+cash),
@ -190,7 +186,7 @@ func (receiver *Service) ChangeCurrency(ctx context.Context, userID string, curr
account, err := receiver.repository.FindByUserID(ctx, userID) account, err := receiver.repository.FindByUserID(ctx, userID)
if err != nil { if err != nil {
receiver.logger.Error("failed to find account on <ChangeCurrency> of <WalletService>", receiver.logger.Error("failed to find account on <ChangeCurrency> of <WalletService>",
zap.Error(err()), zap.Error(err.Extract()),
zap.String("userID", userID), zap.String("userID", userID),
zap.Any("currency", currency), zap.Any("currency", currency),
) )
@ -205,7 +201,7 @@ func (receiver *Service) ChangeCurrency(ctx context.Context, userID string, curr
}) })
if err != nil { if err != nil {
receiver.logger.Error("failed to translate currency on <ChangeCurrency> of <WalletService>", receiver.logger.Error("failed to translate currency on <ChangeCurrency> of <WalletService>",
zap.Error(err()), zap.Error(err.Extract()),
) )
return nil, err return nil, err
@ -218,7 +214,7 @@ func (receiver *Service) ChangeCurrency(ctx context.Context, userID string, curr
}) })
if err != nil { if err != nil {
receiver.logger.Error("failed to update wallet on <ChangeCurrency> of <WalletService>", receiver.logger.Error("failed to update wallet on <ChangeCurrency> of <WalletService>",
zap.Error(err()), zap.Error(err.Extract()),
) )
return nil, err return nil, err