refactored payment orchestration
This commit is contained in:
@@ -11,6 +11,7 @@ import (
|
||||
"github.com/tech/sendico/pkg/merrors"
|
||||
"github.com/tech/sendico/pkg/mlogger"
|
||||
pkm "github.com/tech/sendico/pkg/model"
|
||||
"github.com/tech/sendico/pkg/model/account_role"
|
||||
"github.com/tech/sendico/pkg/mservice"
|
||||
"github.com/tech/sendico/pkg/mutil/mzap"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
@@ -167,7 +168,7 @@ func (a *accountsStore) GetByAccountCode(ctx context.Context, orgRef bson.Object
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (a *accountsStore) GetByRole(ctx context.Context, orgRef bson.ObjectID, currency string, role pkm.AccountRole) (*pkm.LedgerAccount, error) {
|
||||
func (a *accountsStore) GetByRole(ctx context.Context, orgRef bson.ObjectID, currency string, role account_role.AccountRole) (*pkm.LedgerAccount, error) {
|
||||
if orgRef.IsZero() {
|
||||
a.logger.Warn("Attempt to get account with zero organization ID")
|
||||
return nil, merrors.InvalidArgument("accountsStore: zero organization ID")
|
||||
@@ -254,7 +255,7 @@ func (a *accountsStore) GetDefaultSettlement(ctx context.Context, orgRef bson.Ob
|
||||
query := repository.Query().
|
||||
Filter(repository.Field("organizationRef"), orgRef).
|
||||
Filter(repository.Field("currency"), currency).
|
||||
Filter(repository.Field("role"), pkm.AccountRoleSettlement).
|
||||
Filter(repository.Field("role"), account_role.AccountRoleSettlement).
|
||||
Limit(&limit)
|
||||
|
||||
result := &pkm.LedgerAccount{}
|
||||
|
||||
@@ -14,6 +14,7 @@ import (
|
||||
"github.com/tech/sendico/pkg/db/storable"
|
||||
"github.com/tech/sendico/pkg/merrors"
|
||||
pkm "github.com/tech/sendico/pkg/model"
|
||||
"github.com/tech/sendico/pkg/model/account_role"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
"go.mongodb.org/mongo-driver/v2/mongo"
|
||||
"go.uber.org/zap"
|
||||
@@ -253,23 +254,23 @@ func TestAccountsStore_GetByRole(t *testing.T) {
|
||||
FindOneByFilterFunc: func(ctx context.Context, _ builder.Query, result storable.Storable) error {
|
||||
account := result.(*pkm.LedgerAccount)
|
||||
account.Currency = "USD"
|
||||
account.Role = pkm.AccountRoleOperating
|
||||
account.Role = account_role.AccountRoleOperating
|
||||
return nil
|
||||
},
|
||||
}
|
||||
|
||||
store := &accountsStore{logger: logger, repo: stub}
|
||||
result, err := store.GetByRole(ctx, orgRef, "USD", pkm.AccountRoleOperating)
|
||||
result, err := store.GetByRole(ctx, orgRef, "USD", account_role.AccountRoleOperating)
|
||||
|
||||
require.NoError(t, err)
|
||||
assert.NotNil(t, result)
|
||||
assert.Equal(t, pkm.AccountRoleOperating, result.Role)
|
||||
assert.Equal(t, account_role.AccountRoleOperating, result.Role)
|
||||
assert.Equal(t, "USD", result.Currency)
|
||||
})
|
||||
|
||||
t.Run("ZeroOrganizationID", func(t *testing.T) {
|
||||
store := &accountsStore{logger: logger, repo: &repositoryStub{}}
|
||||
result, err := store.GetByRole(ctx, bson.NilObjectID, "USD", pkm.AccountRoleOperating)
|
||||
result, err := store.GetByRole(ctx, bson.NilObjectID, "USD", account_role.AccountRoleOperating)
|
||||
|
||||
require.Error(t, err)
|
||||
assert.Nil(t, result)
|
||||
@@ -278,7 +279,7 @@ func TestAccountsStore_GetByRole(t *testing.T) {
|
||||
|
||||
t.Run("EmptyCurrency", func(t *testing.T) {
|
||||
store := &accountsStore{logger: logger, repo: &repositoryStub{}}
|
||||
result, err := store.GetByRole(ctx, orgRef, "", pkm.AccountRoleOperating)
|
||||
result, err := store.GetByRole(ctx, orgRef, "", account_role.AccountRoleOperating)
|
||||
|
||||
require.Error(t, err)
|
||||
assert.Nil(t, result)
|
||||
@@ -302,7 +303,7 @@ func TestAccountsStore_GetByRole(t *testing.T) {
|
||||
}
|
||||
|
||||
store := &accountsStore{logger: logger, repo: stub}
|
||||
result, err := store.GetByRole(ctx, orgRef, "USD", pkm.AccountRoleOperating)
|
||||
result, err := store.GetByRole(ctx, orgRef, "USD", account_role.AccountRoleOperating)
|
||||
|
||||
require.Error(t, err)
|
||||
assert.Nil(t, result)
|
||||
@@ -318,7 +319,7 @@ func TestAccountsStore_GetByRole(t *testing.T) {
|
||||
}
|
||||
|
||||
store := &accountsStore{logger: logger, repo: stub}
|
||||
result, err := store.GetByRole(ctx, orgRef, "USD", pkm.AccountRoleOperating)
|
||||
result, err := store.GetByRole(ctx, orgRef, "USD", account_role.AccountRoleOperating)
|
||||
|
||||
require.Error(t, err)
|
||||
assert.Nil(t, result)
|
||||
@@ -337,7 +338,7 @@ func TestAccountsStore_GetDefaultSettlement(t *testing.T) {
|
||||
account := result.(*pkm.LedgerAccount)
|
||||
account.SetID(bson.NewObjectID())
|
||||
account.Currency = "USD"
|
||||
account.Role = pkm.AccountRoleSettlement
|
||||
account.Role = account_role.AccountRoleSettlement
|
||||
return nil
|
||||
},
|
||||
}
|
||||
@@ -347,7 +348,7 @@ func TestAccountsStore_GetDefaultSettlement(t *testing.T) {
|
||||
|
||||
require.NoError(t, err)
|
||||
assert.NotNil(t, result)
|
||||
assert.Equal(t, pkm.AccountRoleSettlement, result.Role)
|
||||
assert.Equal(t, account_role.AccountRoleSettlement, result.Role)
|
||||
assert.Equal(t, "USD", result.Currency)
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user