Merge pull request #176 from LerianStudio/fix/MZ-608

Fix/MZ-608
LerianStudio · Oct 30, 2024 · 33108bb · 33108bb
2 parents 038aae0 + 61991fc
commit 33108bb
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 51 deletions.
diff --git a/components/ledger/internal/adapters/database/postgres/account.postgresql.go b/components/ledger/internal/adapters/database/postgres/account.postgresql.go
@@ -228,15 +228,15 @@ func (r *AccountPostgreSQLRepository) Find(ctx context.Context, organizationID,
 	return account.ToEntity(), nil
 }
 
-// FindByAlias find account from the database using Organization and Ledger id and Alias.
-func (r *AccountPostgreSQLRepository) FindByAlias(ctx context.Context, organizationID, ledgerID, portfolioID uuid.UUID, alias string) (bool, error) {
+// FindByAlias find account from the database using Organization and Ledger id and Alias. Returns true and ErrAliasUnavailability error if the alias is already taken.
+func (r *AccountPostgreSQLRepository) FindByAlias(ctx context.Context, organizationID, ledgerID uuid.UUID, alias string) (bool, error) {
 	db, err := r.connection.GetDB()
 	if err != nil {
 		return false, err
 	}
 
-	rows, err := db.QueryContext(ctx, "SELECT * FROM account WHERE organization_id = $1 AND ledger_id = $2 AND portfolio_id = $3 AND alias LIKE $4 AND deleted_at IS NULL ORDER BY created_at DESC",
-		organizationID, ledgerID, portfolioID, alias)
+	rows, err := db.QueryContext(ctx, "SELECT * FROM account WHERE organization_id = $1 AND ledger_id = $2 AND alias LIKE $3 AND deleted_at IS NULL ORDER BY created_at DESC",
+		organizationID, ledgerID, alias)
 	if err != nil {
 		return false, err
 	}

diff --git a/components/ledger/internal/app/command/create-account.go b/components/ledger/internal/app/command/create-account.go
@@ -63,7 +63,7 @@ func (uc *UseCase) CreateAccount(ctx context.Context, organizationID, ledgerID,
 	}
 
 	if !common.IsNilOrEmpty(cai.Alias) {
-		_, err := uc.AccountRepo.FindByAlias(ctx, organizationID, ledgerID, portfolioID, *cai.Alias)
+		_, err := uc.AccountRepo.FindByAlias(ctx, organizationID, ledgerID, *cai.Alias)
 		if err != nil {
 			return nil, err
 		}

diff --git a/components/ledger/internal/app/command/update-account.go b/components/ledger/internal/app/command/update-account.go
@@ -21,6 +21,11 @@ func (uc *UseCase) UpdateAccount(ctx context.Context, organizationID, ledgerID,
 
 	if common.IsNilOrEmpty(uai.Alias) {
 		uai.Alias = nil
+	} else {
+		_, err := uc.AccountRepo.FindByAlias(ctx, organizationID, ledgerID, *uai.Alias)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	account := &a.Account{

diff --git a/components/ledger/internal/domain/portfolio/account/account_repository.go b/components/ledger/internal/domain/portfolio/account/account_repository.go
@@ -13,7 +13,7 @@ type Repository interface {
 	Create(ctx context.Context, acc *Account) (*Account, error)
 	FindAll(ctx context.Context, organizationID, ledgerID uuid.UUID, portfolioID *uuid.UUID, limit, page int) ([]*Account, error)
 	Find(ctx context.Context, organizationID, ledgerID uuid.UUID, portfolioID *uuid.UUID, id uuid.UUID) (*Account, error)
-	FindByAlias(ctx context.Context, organizationID, ledgerID, portfolioID uuid.UUID, alias string) (bool, error)
+	FindByAlias(ctx context.Context, organizationID, ledgerID uuid.UUID, alias string) (bool, error)
 	ListByIDs(ctx context.Context, organizationID, ledgerID uuid.UUID, portfolioID *uuid.UUID, ids []uuid.UUID) ([]*Account, error)
 	ListByAlias(ctx context.Context, organizationID, ledgerID, portfolioID uuid.UUID, alias []string) ([]*Account, error)
 	Update(ctx context.Context, organizationID, ledgerID, portfolioID, id uuid.UUID, acc *Account) (*Account, error)

diff --git a/components/ledger/internal/gen/mock/account/account_mock.go b/components/ledger/internal/gen/mock/account/account_mock.go