Merge pull request #245 from LerianStudio/refactor/MZ-632

Refactor/MZ-632
LerianStudio · Nov 13, 2024 · 3522bca · 3522bca
2 parents 7026f3b + 7cf4009
commit 3522bca
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 16 deletions.
diff --git a/components/transaction/internal/app/command/create-assetrate.go b/components/transaction/internal/app/command/create-assetrate.go
@@ -35,7 +35,7 @@ func (uc *UseCase) CreateAssetRate(ctx context.Context, organizationID, ledgerID
 	}
 
 	assetRateDB := &ar.AssetRate{
-		ID:               uuid.New().String(),
+		ID:               common.GenerateUUIDv7().String(),
 		BaseAssetCode:    cari.BaseAssetCode,
 		CounterAssetCode: cari.CounterAssetCode,
 		Amount:           cari.Amount,

diff --git a/components/transaction/internal/app/command/create-assetrate_test.go b/components/transaction/internal/app/command/create-assetrate_test.go
@@ -3,21 +3,21 @@ package command
 import (
 	"context"
 	"errors"
+	"github.com/LerianStudio/midaz/common"
 	"testing"
 
 	ar "github.com/LerianStudio/midaz/components/transaction/internal/domain/assetrate"
 	mock "github.com/LerianStudio/midaz/components/transaction/internal/gen/mock/assetrate"
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 )
 
 // TestCreateAssetRateSuccess is responsible to test CreateAssetRate with success
 func TestCreateAssetRateSuccess(t *testing.T) {
 	assetRate := &ar.AssetRate{
-		ID:             uuid.New().String(),
-		OrganizationID: uuid.New().String(),
-		LedgerID:       uuid.New().String(),
+		ID:             common.GenerateUUIDv7().String(),
+		OrganizationID: common.GenerateUUIDv7().String(),
+		LedgerID:       common.GenerateUUIDv7().String(),
 	}
 
 	uc := UseCase{
@@ -39,9 +39,9 @@ func TestCreateAssetRateSuccess(t *testing.T) {
 func TestCreateAssetRateError(t *testing.T) {
 	errMSG := "err to create asset rate on database"
 	assetRate := &ar.AssetRate{
-		ID:             uuid.New().String(),
-		OrganizationID: uuid.New().String(),
-		LedgerID:       uuid.New().String(),
+		ID:             common.GenerateUUIDv7().String(),
+		OrganizationID: common.GenerateUUIDv7().String(),
+		LedgerID:       common.GenerateUUIDv7().String(),
 	}
 
 	uc := UseCase{

diff --git a/components/transaction/internal/domain/assetrate/assetrate.go b/components/transaction/internal/domain/assetrate/assetrate.go
@@ -1,9 +1,8 @@
 package assetrate
 
 import (
+	"github.com/LerianStudio/midaz/common"
 	"time"
-
-	"github.com/google/uuid"
 )
 
 // AssetRatePostgreSQLModel represents the entity AssetRatePostgreSQLModel into SQL context in Database
@@ -64,7 +63,7 @@ func (a *AssetRatePostgreSQLModel) ToEntity() *AssetRate {
 // FromEntity converts an entity AssetRate to AssetRatePostgreSQLModel
 func (a *AssetRatePostgreSQLModel) FromEntity(assetRate *AssetRate) {
 	*a = AssetRatePostgreSQLModel{
-		ID:               uuid.New().String(),
+		ID:               common.GenerateUUIDv7().String(),
 		BaseAssetCode:    assetRate.BaseAssetCode,
 		CounterAssetCode: assetRate.CounterAssetCode,
 		Amount:           assetRate.Amount,

diff --git a/components/transaction/migrations/000000_create_extension.down.sql b/components/transaction/migrations/000000_create_extension.down.sql
diff --git a/components/transaction/migrations/000000_create_extension.up.sql b/components/transaction/migrations/000000_create_extension.up.sql
diff --git a/.../000001_create_transaction_table.down.sql → .../000000_create_transaction_table.down.sql b/.../000001_create_transaction_table.down.sql → .../000000_create_transaction_table.down.sql
diff --git a/...ns/000001_create_transaction_table.up.sql → ...ns/000000_create_transaction_table.up.sql b/...ns/000001_create_transaction_table.up.sql → ...ns/000000_create_transaction_table.up.sql
@@ -1,5 +1,5 @@
 CREATE TABLE IF NOT EXISTS "transaction" (
-    id                                  UUID PRIMARY KEY NOT NULL DEFAULT (uuid_generate_v4()),
+    id                                  UUID PRIMARY KEY NOT NULL,
     parent_transaction_id               UUID,
     description                         TEXT NOT NULL,
     template                            TEXT NOT NULL,

diff --git a/...ns/000002_create_operation_table.down.sql → ...ns/000001_create_operation_table.down.sql b/...ns/000002_create_operation_table.down.sql → ...ns/000001_create_operation_table.down.sql
diff --git a/...ions/000002_create_operation_table.up.sql → ...ions/000001_create_operation_table.up.sql b/...ions/000002_create_operation_table.up.sql → ...ions/000001_create_operation_table.up.sql
@@ -1,5 +1,5 @@
 CREATE TABLE IF NOT EXISTS operation (
-    id                                 UUID PRIMARY KEY NOT NULL DEFAULT (uuid_generate_v4()),
+    id                                 UUID PRIMARY KEY NOT NULL,
     transaction_id                     UUID NOT NULL,
     description                        TEXT NOT NULL,
     type                               TEXT NOT NULL,

diff --git a/...s/000003_create_asset_rate_table.down.sql → ...s/000002_create_asset_rate_table.down.sql b/...s/000003_create_asset_rate_table.down.sql → ...s/000002_create_asset_rate_table.down.sql
diff --git a/...ons/000003_create_asset_rate_table.up.sql → ...ons/000002_create_asset_rate_table.up.sql b/...ons/000003_create_asset_rate_table.up.sql → ...ons/000002_create_asset_rate_table.up.sql
@@ -1,5 +1,5 @@
 CREATE TABLE IF NOT EXISTS asset_rate (
-    id                                 UUID PRIMARY KEY NOT NULL DEFAULT (uuid_generate_v4()),
+    id                                 UUID PRIMARY KEY NOT NULL,
     base_asset_code                    TEXT NOT NULL,
     counter_asset_code                 TEXT NOT NULL,
     amount                             NUMERIC NOT NULL,