Skip to content

SDP 1686 create wallet endpoint update #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions internal/data/wallets.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ type WalletInsert struct {
Homepage string `db:"homepage"`
SEP10ClientDomain string `db:"sep_10_client_domain"`
DeepLinkSchema string `db:"deep_link_schema"`
Enabled bool `db:"enabled"`
AssetsIDs []string `db:"assets_ids"`
}

Expand Down Expand Up @@ -163,13 +164,13 @@ func (wm *WalletModel) Insert(ctx context.Context, newWallet WalletInsert) (*Wal
const query = `
WITH new_wallet AS (
INSERT INTO wallets
(name, homepage, deep_link_schema, sep_10_client_domain)
(name, homepage, deep_link_schema, sep_10_client_domain, enabled)
VALUES
($1, $2, $3, $4)
($1, $2, $3, $4, $5)
RETURNING
*
), assets_cte AS (
SELECT UNNEST($5::text[]) id
SELECT UNNEST($6::text[]) id
), new_wallet_assets AS (
INSERT INTO wallets_assets
(wallet_id, asset_id)
Expand All @@ -183,12 +184,11 @@ func (wm *WalletModel) Insert(ctx context.Context, newWallet WalletInsert) (*Wal
`

var w Wallet
err := dbTx.GetContext(
if err := dbTx.GetContext(
ctx, &w, query,
newWallet.Name, newWallet.Homepage, newWallet.DeepLinkSchema, newWallet.SEP10ClientDomain,
newWallet.Name, newWallet.Homepage, newWallet.DeepLinkSchema, newWallet.SEP10ClientDomain, newWallet.Enabled,
pq.Array(newWallet.AssetsIDs),
)
if err != nil {
); err != nil {
if pqError, ok := err.(*pq.Error); ok {
constraintErrMap := map[string]error{
"wallets_assets_asset_id_fkey": ErrInvalidAssetID,
Expand Down
66 changes: 45 additions & 21 deletions internal/serve/httphandler/wallets_handler.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package httphandler

import (
"context"
"errors"
"fmt"
"net/http"
Expand All @@ -12,12 +13,14 @@ import (
"github.com/stellar/stellar-disbursement-platform-backend/internal/data"
"github.com/stellar/stellar-disbursement-platform-backend/internal/serve/httperror"
"github.com/stellar/stellar-disbursement-platform-backend/internal/serve/validators"
"github.com/stellar/stellar-disbursement-platform-backend/internal/services"
"github.com/stellar/stellar-disbursement-platform-backend/internal/utils"
)

type WalletsHandler struct {
Models *data.Models
NetworkType utils.NetworkType
Models *data.Models
NetworkType utils.NetworkType
AssetResolver *services.AssetResolver
}

// GetWallets returns a list of wallets
Expand Down Expand Up @@ -74,30 +77,36 @@ func (h WalletsHandler) PostWallets(rw http.ResponseWriter, req *http.Request) {
return
}

wallet, err := h.Models.Wallets.Insert(ctx, data.WalletInsert{
// Resolve asset references to IDs
var assetIDs []string
var err error

if len(reqBody.Assets) > 0 {
assetIDs, err = h.AssetResolver.ResolveAssetReferences(ctx, reqBody.Assets)
if err != nil {
httperror.BadRequest("failed to resolve asset references", err, nil).Render(rw)
return
}
} else if len(reqBody.AssetsIDs) > 0 {
if err = h.AssetResolver.ValidateAssetIDs(ctx, reqBody.AssetsIDs); err != nil {
httperror.BadRequest("invalid asset ID", err, nil).Render(rw)
return
}
assetIDs = reqBody.AssetsIDs
}

walletInsert := data.WalletInsert{
Name: reqBody.Name,
Homepage: reqBody.Homepage,
SEP10ClientDomain: reqBody.SEP10ClientDomain,
DeepLinkSchema: reqBody.DeepLinkSchema,
AssetsIDs: reqBody.AssetsIDs,
})
if err != nil {
switch {
case errors.Is(err, data.ErrInvalidAssetID):
httperror.BadRequest(data.ErrInvalidAssetID.Error(), err, nil).Render(rw)
return
case errors.Is(err, data.ErrWalletNameAlreadyExists):
httperror.Conflict(data.ErrWalletNameAlreadyExists.Error(), err, nil).Render(rw)
return
case errors.Is(err, data.ErrWalletHomepageAlreadyExists):
httperror.Conflict(data.ErrWalletHomepageAlreadyExists.Error(), err, nil).Render(rw)
return
case errors.Is(err, data.ErrWalletDeepLinkSchemaAlreadyExists):
httperror.Conflict(data.ErrWalletDeepLinkSchemaAlreadyExists.Error(), err, nil).Render(rw)
return
}
AssetsIDs: assetIDs,
Enabled: *reqBody.Enabled,
}

httperror.InternalError(ctx, "", err, nil).Render(rw)
wallet, err := h.Models.Wallets.Insert(ctx, walletInsert)
if err != nil {
h.handleWalletCreationError(ctx, rw, err)
return
}

Expand Down Expand Up @@ -159,3 +168,18 @@ func (h WalletsHandler) PatchWallets(rw http.ResponseWriter, req *http.Request)

httpjson.Render(rw, map[string]string{"message": "wallet updated successfully"}, httpjson.JSON)
}

func (h WalletsHandler) handleWalletCreationError(ctx context.Context, rw http.ResponseWriter, err error) {
switch {
case errors.Is(err, data.ErrInvalidAssetID):
httperror.BadRequest(data.ErrInvalidAssetID.Error(), err, nil).Render(rw)
case errors.Is(err, data.ErrWalletNameAlreadyExists):
httperror.Conflict(data.ErrWalletNameAlreadyExists.Error(), err, nil).Render(rw)
case errors.Is(err, data.ErrWalletHomepageAlreadyExists):
httperror.Conflict(data.ErrWalletHomepageAlreadyExists.Error(), err, nil).Render(rw)
case errors.Is(err, data.ErrWalletDeepLinkSchemaAlreadyExists):
httperror.Conflict(data.ErrWalletDeepLinkSchemaAlreadyExists.Error(), err, nil).Render(rw)
default:
httperror.InternalError(ctx, "failed to create wallet", err, nil).Render(rw)
}
}
Loading