+ quotation provider

api/server/internal/server/paymentapiimp/mapper.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 
 	"github.com/tech/sendico/pkg/merrors"
+	"github.com/tech/sendico/pkg/model"
 	fxv1 "github.com/tech/sendico/pkg/proto/common/fx/v1"
 	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
 	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
@@ -45,7 +46,7 @@ func mapPaymentIntent(intent *srequest.PaymentIntent) (*orchestratorv1.PaymentIn
 		Source:         source,
 		Destination:    destination,
 		Amount:         mapMoney(intent.Amount),
-		RequiresFx:     intent.RequiresFX,
+		RequiresFx:     fx != nil,
 		Fx:             fx,
 		SettlementMode: settlementMode,
 		Attributes:     copyStringMap(intent.Attributes),
@@ -99,6 +100,14 @@ func mapPaymentEndpoint(endpoint *srequest.Endpoint, field string) (*orchestrato
 		result.Endpoint = &orchestratorv1.PaymentEndpoint_Card{
 			Card: mapCardEndpoint(&payload),
 		}
+	case srequest.EndpointTypeCardToken:
+		payload, err := endpoint.DecodeCardToken()
+		if err != nil {
+			return nil, merrors.InvalidArgument(field + " endpoint: " + err.Error())
+		}
+		result.Endpoint = &orchestratorv1.PaymentEndpoint_Card{
+			Card: mapCardTokenEndpoint(&payload),
+		}
 	case "":
 		return nil, merrors.InvalidArgument(field + " endpoint type is required")
 	default:
@@ -163,7 +172,7 @@ func mapAsset(asset *srequest.Asset) (*chainv1.Asset, error) {
 	}, nil
 }
 
-func mapMoney(m *srequest.Money) *moneyv1.Money {
+func mapMoney(m *model.Money) *moneyv1.Money {
 	if m == nil {
 		return nil
 	}
@@ -206,21 +215,28 @@ func mapCardEndpoint(card *srequest.CardEndpoint) *orchestratorv1.CardEndpoint {
 		return nil
 	}
 	result := &orchestratorv1.CardEndpoint{
-		CardholderName: strings.TrimSpace(card.Cardholder),
-		ExpMonth:       card.ExpMonth,
-		ExpYear:        card.ExpYear,
-		Country:        strings.TrimSpace(card.Country),
-		MaskedPan:      strings.TrimSpace(card.MaskedPan),
+		CardholderName:    strings.TrimSpace(card.FirstName),
+		CardholderSurname: strings.TrimSpace(card.LastName),
+		ExpMonth:          card.ExpMonth,
+		ExpYear:           card.ExpYear,
+		Country:           strings.TrimSpace(card.Country),
 	}
 	if pan := strings.TrimSpace(card.Pan); pan != "" {
 		result.Card = &orchestratorv1.CardEndpoint_Pan{Pan: pan}
 	}
-	if token := strings.TrimSpace(card.Token); token != "" {
-		result.Card = &orchestratorv1.CardEndpoint_Token{Token: token}
-	}
 	return result
 }
 
+func mapCardTokenEndpoint(card *srequest.CardTokenEndpoint) *orchestratorv1.CardEndpoint {
+	if card == nil {
+		return nil
+	}
+	return &orchestratorv1.CardEndpoint{
+		Card:      &orchestratorv1.CardEndpoint_Token{Token: strings.TrimSpace(card.Token)},
+		MaskedPan: strings.TrimSpace(card.MaskedPan),
+	}
+}
+
 func mapPaymentKind(kind srequest.PaymentKind) (orchestratorv1.PaymentKind, error) {
 	switch strings.TrimSpace(string(kind)) {
 	case "", string(srequest.PaymentKindUnspecified):

api/server/internal/server/paymentapiimp/quote.go

@@ -36,11 +36,17 @@ func (a *PaymentAPI) quotePayment(r *http.Request, account *model.Account, token
 
 	payload, err := decodeQuotePayload(r)
 	if err != nil {
+		a.logger.Debug("Failed to decode payload", zap.Error(err), mutil.PLog(a.oph, r))
 		return response.BadPayload(a.logger, a.Name(), err)
 	}
+	if err := payload.Validate(); err != nil {
+		a.logger.Debug("Failed to validate payload", zap.Error(err), mutil.PLog(a.oph, r))
+		return response.Auto(a.logger, a.Name(), err)
+	}
 
 	intent, err := mapPaymentIntent(&payload.Intent)
 	if err != nil {
+		a.logger.Debug("Failed to map payment intent", zap.Error(err), mutil.PLog(a.oph, r))
 		return response.BadPayload(a.logger, a.Name(), err)
 	}
 
@@ -66,7 +72,7 @@ func decodeQuotePayload(r *http.Request) (*srequest.QuotePayment, error) {
 
 	payload := &srequest.QuotePayment{}
 	if err := json.NewDecoder(r.Body).Decode(payload); err != nil {
-		return nil, merrors.InvalidArgument("invalid payload: " + err.Error())
+		return nil, merrors.InvalidArgument("invalid payload: "+err.Error(), "payload")
 	}
 	payload.IdempotencyKey = strings.TrimSpace(payload.IdempotencyKey)
 	if err := payload.Validate(); err != nil {

api/server/internal/server/paymentapiimp/service.go

@@ -35,7 +35,7 @@ type PaymentAPI struct {
 	permissionRef primitive.ObjectID
 }
 
-func (a *PaymentAPI) Name() mservice.Type { return mservice.PaymentOrchestrator }
+func (a *PaymentAPI) Name() mservice.Type { return mservice.Payments }
 
 func (a *PaymentAPI) Finish(ctx context.Context) error {
 	if a.client != nil {
@@ -48,12 +48,12 @@ func (a *PaymentAPI) Finish(ctx context.Context) error {
 
 func CreateAPI(apiCtx eapi.API) (*PaymentAPI, error) {
 	p := &PaymentAPI{
-		logger: apiCtx.Logger().Named(mservice.PaymentOrchestrator),
+		logger: apiCtx.Logger().Named(mservice.Payments),
 		enf:    apiCtx.Permissions().Enforcer(),
 		oph:    mutil.CreatePH(mservice.Organizations),
 	}
 
-	desc, err := apiCtx.Permissions().GetPolicyDescription(context.Background(), mservice.PaymentOrchestrator)
+	desc, err := apiCtx.Permissions().GetPolicyDescription(context.Background(), mservice.Payments)
 	if err != nil {
 		p.logger.Warn("Failed to fetch payment orchestrator permission description", zap.Error(err))
 		return nil, err