Skip to content

Commit

Permalink
Merge pull request #121 from formancehq/feat/banking-circle-transfer-…
Browse files Browse the repository at this point in the history
…payout

feat(bankingcircle): add transfer/payout creation
  • Loading branch information
paul-nicolas authored Oct 14, 2024
2 parents 165d61d + 3531050 commit 8098898
Show file tree
Hide file tree
Showing 7 changed files with 244 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package bankingcircle

import (
"context"
"encoding/json"

"github.com/formancehq/payments/internal/models"
)

func (p Plugin) createBankAccount(ctx context.Context, req models.CreateBankAccountRequest) (models.CreateBankAccountResponse, error) {
func (p Plugin) createBankAccount(req models.CreateBankAccountRequest) (models.CreateBankAccountResponse, error) {
// We can't create bank accounts in Banking Circle since they do not store
// the bank account information. We just have to return the related formance
// account in order to use it in the future.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,29 @@ func (c *Client) GetPayments(ctx context.Context, page int, pageSize int) ([]Pay
return res.Result, nil
}

func (c *Client) GetPayment(ctx context.Context, paymentID string) (*Payment, error) {
if err := c.ensureAccessTokenIsValid(ctx); err != nil {
return nil, err
}

// f := connectors.ClientMetrics(ctx, "bankingcircle", "get_payment")
// now := time.Now()
// defer f(ctx, now)

req, err := http.NewRequestWithContext(ctx, http.MethodGet, fmt.Sprintf("%s/api/v1/payments/singles/%s", c.endpoint, paymentID), http.NoBody)
if err != nil {
return nil, fmt.Errorf("failed to create payments request: %w", err)
}
req.Header.Set("Authorization", "Bearer "+c.accessToken)

var res Payment
statusCode, err := c.httpClient.Do(req, &res, nil)
if err != nil {
return nil, fmt.Errorf("failed to get payment, status code %d: %w", statusCode, err)
}
return &res, nil
}

type StatusResponse struct {
Status string `json:"status"`
}
Expand Down
97 changes: 97 additions & 0 deletions internal/connectors/plugins/public/bankingcircle/payouts.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
package bankingcircle

import (
"context"
"encoding/json"
"fmt"

"github.com/formancehq/payments/internal/connectors/plugins/currency"
"github.com/formancehq/payments/internal/connectors/plugins/public/bankingcircle/client"
"github.com/formancehq/payments/internal/models"
)

func (p *Plugin) validatePayoutRequest(pi models.PSPPaymentInitiation) error {
if pi.SourceAccount == nil {
return fmt.Errorf("source account is required: %w", models.ErrInvalidRequest)
}

if pi.DestinationAccount == nil {
return fmt.Errorf("destination account is required: %w", models.ErrInvalidRequest)
}

return nil
}

func (p *Plugin) createPayout(ctx context.Context, pi models.PSPPaymentInitiation) (models.PSPPayment, error) {
if err := p.validatePayoutRequest(pi); err != nil {
return models.PSPPayment{}, err
}

curr, precision, err := currency.GetCurrencyAndPrecisionFromAsset(supportedCurrenciesWithDecimal, pi.Asset)
if err != nil {
return models.PSPPayment{}, fmt.Errorf("failed to get currency and precision from asset: %v: %w", err, models.ErrInvalidRequest)
}

amount, err := currency.GetStringAmountFromBigIntWithPrecision(pi.Amount, precision)
if err != nil {
return models.PSPPayment{}, fmt.Errorf("failed to get string amount from big int: %v: %w", err, models.ErrInvalidRequest)
}

var sourceAccount *client.Account
sourceAccount, err = p.client.GetAccount(ctx, pi.SourceAccount.Reference)
if err != nil {
return models.PSPPayment{}, fmt.Errorf("failed to get source account: %v: %w", err, models.ErrInvalidRequest)
}
if len(sourceAccount.AccountIdentifiers) == 0 {
return models.PSPPayment{}, fmt.Errorf("no account identifiers provided for source account: %v: %w", err, models.ErrInvalidRequest)
}

var destinationAccount *client.Account
destinationAccount, err = p.client.GetAccount(ctx, pi.DestinationAccount.Reference)
if err != nil {
return models.PSPPayment{}, fmt.Errorf("failed to get destination account: %v: %w", err, models.ErrInvalidRequest)
}
if len(destinationAccount.AccountIdentifiers) == 0 {
return models.PSPPayment{}, fmt.Errorf("no account identifiers provided for destination account: %v: %w", err, models.ErrInvalidRequest)
}

resp, err := p.client.InitiateTransferOrPayouts(ctx, &client.PaymentRequest{
IdempotencyKey: pi.Reference,
RequestedExecutionDate: pi.CreatedAt,
DebtorAccount: client.PaymentAccount{
Account: sourceAccount.AccountIdentifiers[0].Account,
FinancialInstitution: sourceAccount.AccountIdentifiers[0].FinancialInstitution,
Country: sourceAccount.AccountIdentifiers[0].Country,
},
DebtorReference: pi.Description,
CurrencyOfTransfer: curr,
Amount: struct {
Currency string "json:\"currency\""
Amount json.Number "json:\"amount\""
}{
Currency: curr,
Amount: json.Number(amount),
},
ChargeBearer: "SHA",
CreditorAccount: &client.PaymentAccount{
Account: destinationAccount.AccountIdentifiers[0].Account,
FinancialInstitution: destinationAccount.AccountIdentifiers[0].FinancialInstitution,
Country: destinationAccount.AccountIdentifiers[0].Country,
},
})
if err != nil {
return models.PSPPayment{}, err
}

payment, err := p.client.GetPayment(ctx, resp.PaymentID)
if err != nil {
return models.PSPPayment{}, err
}

res, err := translatePayment(*payment)
if err != nil {
return models.PSPPayment{}, err
}

return *res, nil
}
24 changes: 21 additions & 3 deletions internal/connectors/plugins/public/bankingcircle/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,33 @@ func (p Plugin) CreateBankAccount(ctx context.Context, req models.CreateBankAcco
if p.client == nil {
return models.CreateBankAccountResponse{}, plugins.ErrNotYetInstalled
}
return p.createBankAccount(ctx, req)
return p.createBankAccount(req)
}

func (p Plugin) CreateTransfer(ctx context.Context, req models.CreateTransferRequest) (models.CreateTransferResponse, error) {
return models.CreateTransferResponse{}, plugins.ErrNotImplemented
if p.client == nil {
return models.CreateTransferResponse{}, plugins.ErrNotYetInstalled
}
payment, err := p.createTransfer(ctx, req.PaymentInitiation)
if err != nil {
return models.CreateTransferResponse{}, err
}
return models.CreateTransferResponse{
Payment: payment,
}, nil
}

func (p Plugin) CreatePayout(ctx context.Context, req models.CreatePayoutRequest) (models.CreatePayoutResponse, error) {
return models.CreatePayoutResponse{}, plugins.ErrNotImplemented
if p.client == nil {
return models.CreatePayoutResponse{}, plugins.ErrNotYetInstalled
}
payment, err := p.createPayout(ctx, req.PaymentInitiation)
if err != nil {
return models.CreatePayoutResponse{}, err
}
return models.CreatePayoutResponse{
Payment: payment,
}, nil
}

func (p Plugin) CreateWebhooks(ctx context.Context, req models.CreateWebhooksRequest) (models.CreateWebhooksResponse, error) {
Expand Down
100 changes: 100 additions & 0 deletions internal/connectors/plugins/public/bankingcircle/transfers.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
package bankingcircle

import (
"context"
"encoding/json"
"fmt"

"github.com/formancehq/payments/internal/connectors/plugins/currency"
"github.com/formancehq/payments/internal/connectors/plugins/public/bankingcircle/client"
"github.com/formancehq/payments/internal/models"
)

func (p *Plugin) validateTransferRequest(pi models.PSPPaymentInitiation) error {
if pi.SourceAccount == nil {
return fmt.Errorf("source account is required: %w", models.ErrInvalidRequest)
}

if pi.DestinationAccount == nil {
return fmt.Errorf("destination account is required: %w", models.ErrInvalidRequest)
}

return nil
}

func (p *Plugin) createTransfer(ctx context.Context, pi models.PSPPaymentInitiation) (models.PSPPayment, error) {
if err := p.validateTransferRequest(pi); err != nil {
return models.PSPPayment{}, err
}

curr, precision, err := currency.GetCurrencyAndPrecisionFromAsset(supportedCurrenciesWithDecimal, pi.Asset)
if err != nil {
return models.PSPPayment{}, fmt.Errorf("failed to get currency and precision from asset: %v: %w", err, models.ErrInvalidRequest)
}

amount, err := currency.GetStringAmountFromBigIntWithPrecision(pi.Amount, precision)
if err != nil {
return models.PSPPayment{}, fmt.Errorf("failed to get string amount from big int: %v: %w", err, models.ErrInvalidRequest)
}

var sourceAccount *client.Account
sourceAccount, err = p.client.GetAccount(ctx, pi.SourceAccount.Reference)
if err != nil {
return models.PSPPayment{}, fmt.Errorf("failed to get source account: %v: %w", err, models.ErrInvalidRequest)
}
if len(sourceAccount.AccountIdentifiers) == 0 {
return models.PSPPayment{}, fmt.Errorf("no account identifiers provided for source account: %v: %w", err, models.ErrInvalidRequest)
}

var destinationAccount *client.Account
destinationAccount, err = p.client.GetAccount(ctx, pi.DestinationAccount.Reference)
if err != nil {
return models.PSPPayment{}, fmt.Errorf("failed to get destination account: %v: %w", err, models.ErrInvalidRequest)
}
if len(destinationAccount.AccountIdentifiers) == 0 {
return models.PSPPayment{}, fmt.Errorf("no account identifiers provided for destination account: %v: %w", err, models.ErrInvalidRequest)
}

resp, err := p.client.InitiateTransferOrPayouts(
ctx,
&client.PaymentRequest{
IdempotencyKey: pi.Reference,
RequestedExecutionDate: pi.CreatedAt,
DebtorAccount: client.PaymentAccount{
Account: sourceAccount.AccountIdentifiers[0].Account,
FinancialInstitution: sourceAccount.AccountIdentifiers[0].FinancialInstitution,
Country: sourceAccount.AccountIdentifiers[0].Country,
},
DebtorReference: pi.Description,
CurrencyOfTransfer: curr,
Amount: struct {
Currency string "json:\"currency\""
Amount json.Number "json:\"amount\""
}{
Currency: curr,
Amount: json.Number(amount),
},
ChargeBearer: "SHA",
CreditorAccount: &client.PaymentAccount{
Account: destinationAccount.AccountIdentifiers[0].Account,
FinancialInstitution: destinationAccount.AccountIdentifiers[0].FinancialInstitution,
Country: destinationAccount.AccountIdentifiers[0].Country,
},
},
)
if err != nil {
return models.PSPPayment{}, err
}

payment, err := p.client.GetPayment(ctx, resp.PaymentID)
if err != nil {
return models.PSPPayment{}, err
}

res, err := translatePayment(*payment)
if err != nil {
return models.PSPPayment{}, err
}

return *res, nil
}
2 changes: 1 addition & 1 deletion internal/connectors/plugins/public/mangopay/transfers.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (p *Plugin) validateTransferRequest(pi models.PSPPaymentInitiation) error {
return fmt.Errorf("source account is required: %w", models.ErrInvalidRequest)
}

if pi.SourceAccount == nil {
if pi.DestinationAccount == nil {
return fmt.Errorf("destination account is required: %w", models.ErrInvalidRequest)
}

Expand Down
2 changes: 1 addition & 1 deletion internal/models/payments_initiations.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ func (pi *PaymentInitiation) UnmarshalJSON(data []byte) error {
func FromPaymentInitiationToPSPPaymentInitiation(from *PaymentInitiation, sourceAccount, destinationAccount *PSPAccount) *PSPPaymentInitiation {
return &PSPPaymentInitiation{
Reference: from.Reference,
CreatedAt: from.CreatedAt,
CreatedAt: from.ScheduledAt, // Scheduled at should be the creation time of the payment on the PSP
Description: from.Description,
SourceAccount: sourceAccount,
DestinationAccount: destinationAccount,
Expand Down

0 comments on commit 8098898

Please sign in to comment.