diff --git a/backend/.vscode/launch.json b/backend/.vscode/launch.json index 073e203..d2ce7b4 100644 --- a/backend/.vscode/launch.json +++ b/backend/.vscode/launch.json @@ -12,7 +12,7 @@ "program": "${workspaceRoot}/cmd/main.go", "args": [ "-log-level=debug", - "-log-local=true", + "-log-local=false", "-log-add-source=true", "-jwt-secret=local_jwt_secret", diff --git a/backend/Makefile b/backend/Makefile index da8c458..2a274e6 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -44,4 +44,7 @@ run.debug: bin.build -db-database=blockd \ -db-user=blockd \ -db-secret=blockd \ - -db-enable-tls=false \ No newline at end of file + -db-enable-tls=false + +start.d: + sudo systemctl start docker \ No newline at end of file diff --git a/backend/internal/usecase/interactors/organizations/interactor.go b/backend/internal/usecase/interactors/organizations/interactor.go index 3a70875..674827f 100644 --- a/backend/internal/usecase/interactors/organizations/interactor.go +++ b/backend/internal/usecase/interactors/organizations/interactor.go @@ -129,6 +129,15 @@ func (i *organizationsInteractor) List( } } + i.log.Debug( + "organizations_list", + slog.String("cursor", params.Cursor), + slog.Int("limit", int(params.Limit)), + slog.Any("cursor-id", cursor.Id), + slog.Any("ids", params.Ids), + slog.Any("user_id", params.UserId), + ) + orgs, err := i.orgRepository.Get(ctx, organizations.GetParams{ UserId: params.UserId, Ids: params.Ids, @@ -179,7 +188,7 @@ func (i *organizationsInteractor) Create( } org := models.Organization{ - ID: uuid.New(), + ID: uuid.Must(uuid.NewV7()), Name: params.Name, Address: params.Address, WalletSeed: walletSeed, diff --git a/backend/internal/usecase/interactors/users/interactor.go b/backend/internal/usecase/interactors/users/interactor.go index 8a39498..9471718 100644 --- a/backend/internal/usecase/interactors/users/interactor.go +++ b/backend/internal/usecase/interactors/users/interactor.go @@ -73,7 +73,7 @@ func (i *usersInteractor) Create(ctx context.Context, params CreateParams) (*mod } user := models.NewUser( - uuid.New(), + uuid.Must(uuid.NewV7()), seed, params.Activate, time.Now(), diff --git a/backend/internal/usecase/repository/organizations/repository.go b/backend/internal/usecase/repository/organizations/repository.go index aeaa720..a91061c 100644 --- a/backend/internal/usecase/repository/organizations/repository.go +++ b/backend/internal/usecase/repository/organizations/repository.go @@ -109,7 +109,7 @@ func (r *repositorySQL) Get(ctx context.Context, params GetParams) ([]*models.Or } if params.CursorId != uuid.Nil { - query = query.Where(sq.Lt{ + query = query.Where(sq.Gt{ "o.id": params.CursorId, }) }