mirror of
https://github.com/hanzo-fi/payments.git
synced 2026-10-30 20:31:20 +00:00
* Reflect new amount for returned/reverted transaction. * Enhance payout and transfer response structures with transaction IDs and pending transaction IDs; * Update payment creation logic to utilize new fields. * Remove periodic execution of fetch_payments * Update ParentReference and Reference fields in payment model for transfer creation * Update pkg/client/ * Set return payment to SUCCEEDED, remove adjustment update * trigger ready for review * retrigger CI * Reuse Refund functionality instead of created Returned upsert operation * fix: ensure PendingTimeline and DeclinedTimeline are preserved in payments state test: add unit test to preserve timeline states in FetchNextPayments * Retrigger CI --------- Co-authored-by: gitstart_bot <[email protected]>
105 lines
2.7 KiB
Go
105 lines
2.7 KiB
Go
package increase
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/formancehq/payments/internal/connectors/plugins/public/increase/client"
|
|
"github.com/formancehq/payments/internal/models"
|
|
)
|
|
|
|
type externalAccountsState struct {
|
|
NextCursor string `json:"next_cursor"`
|
|
}
|
|
|
|
func (p *Plugin) fetchNextExternalAccounts(ctx context.Context, req models.FetchNextExternalAccountsRequest) (models.FetchNextExternalAccountsResponse, error) {
|
|
var oldState externalAccountsState
|
|
if req.State != nil {
|
|
if err := json.Unmarshal(req.State, &oldState); err != nil {
|
|
return models.FetchNextExternalAccountsResponse{}, err
|
|
}
|
|
}
|
|
|
|
accounts := make([]models.PSPAccount, 0, req.PageSize)
|
|
hasMore := false
|
|
pagedRecipients, nextCursor, err := p.client.GetExternalAccounts(ctx, req.PageSize, oldState.NextCursor)
|
|
if err != nil {
|
|
return models.FetchNextExternalAccountsResponse{}, err
|
|
}
|
|
|
|
accounts, err = p.fillExternalAccounts(pagedRecipients, accounts, req.PageSize)
|
|
if err != nil {
|
|
return models.FetchNextExternalAccountsResponse{}, err
|
|
}
|
|
|
|
hasMore = nextCursor != ""
|
|
|
|
newState := externalAccountsState{
|
|
NextCursor: nextCursor,
|
|
}
|
|
|
|
payload, err := json.Marshal(newState)
|
|
if err != nil {
|
|
return models.FetchNextExternalAccountsResponse{}, err
|
|
}
|
|
|
|
return models.FetchNextExternalAccountsResponse{
|
|
ExternalAccounts: accounts,
|
|
NewState: payload,
|
|
HasMore: hasMore,
|
|
}, nil
|
|
}
|
|
|
|
func (p *Plugin) fillExternalAccounts(
|
|
pagedAccounts []*client.ExternalAccount,
|
|
accounts []models.PSPAccount,
|
|
pageSize int,
|
|
) ([]models.PSPAccount, error) {
|
|
for _, account := range pagedAccounts {
|
|
if len(accounts) >= pageSize {
|
|
break
|
|
}
|
|
|
|
mappedAccounts, err := p.mapExternalAccount(account)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to map external account: %w", err)
|
|
}
|
|
accounts = append(accounts, *mappedAccounts)
|
|
}
|
|
|
|
return accounts, nil
|
|
}
|
|
|
|
func (p *Plugin) mapExternalAccount(
|
|
account *client.ExternalAccount,
|
|
) (*models.PSPAccount, error) {
|
|
createdTime, err := time.Parse(time.RFC3339, account.CreatedAt)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
raw, err := json.Marshal(account)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
pspAccount := models.PSPAccount{
|
|
Reference: account.ID,
|
|
CreatedAt: createdTime,
|
|
Name: &account.Description,
|
|
Raw: raw,
|
|
Metadata: map[string]string{
|
|
client.IncreaseTypeMetadataKey: account.Type,
|
|
client.IncreaseAccountHolderMetadataKey: account.AccountHolder,
|
|
client.IncreaseAccountNumberMetadataKey: account.AccountNumber,
|
|
client.IncreaseStatusMetadataKey: account.Status,
|
|
client.IncreaseDescriptionMetadataKey: account.Description,
|
|
client.IncreaseRoutingNumberMetadataKey: account.RoutingNumber,
|
|
},
|
|
}
|
|
|
|
return &pspAccount, nil
|
|
}
|