mirror of
https://github.com/hanzo-fi/payments.git
synced 2026-10-30 20:31:20 +00:00
* feat(EN-214): add outbox table migration * feat(EN-214): add outbox models and storage layer * feat(EN-214): implement outbox publisher activity * feat(EN-214): implement outbox schedule activity * feat(EN-214): add outbox publisher workflow * feat(EN-214): migrate accounts to outbox pattern * feat(EN-214): migrate balances to outbox pattern * feat(EN-214): migrate payments to outbox pattern * feat(EN-214): migrate bank accounts to outbox pattern * feat(EN-214): migrate pools to outbox pattern * feat(EN-214): migrate payment initiations to outbox pattern * feat(EN-214): migrate PSU and connections to outbox pattern * feat(EN-214): migrate connectors to outbox pattern * feat(EN-214): remove legacy send_events workflow * feat(EN-214): update workflows to use outbox pattern * feat(EN-214): improve outbox idempotency and error handling * feat(EN-214): update storage tasks and tests * test(EN-214): update e2e tests for outbox pattern * test(EN-214): clean up workflow tests * chore(EN-214): update docker compose configuration * feat(EN-214): add e2e run config in ide * fix: add back docker-compose-dev run config * chore: improve connector uninstall comments & remove connector id being passed * fix: ensure events are not pushed if balances are not created * fix: ensure err is not overwritten when using rollback * fix: ensure we use v3 provider format * chore: apply the nitpick comments from coderabbit * chore: consistentely use e() error handling * feat: optionally disable publisher schedule to make e2e test more consistent * fix: improve error handling on uninstall connector * avoid using custom payload and rely on existing interfaces; also avoid using different types for events * fix: remove unecessary unmarshalling * fix: ensure that rollbackOnTxError picks up errors on tx.Commit() * fix: add extra validation on iban & account number in the test * test: cover marshall/unmarshalling of event payload * fix: increase test timeout * try to make test more resiliant * fix: wrong pointer use in loop * fix: error formatting issue * fix: move oubtox schedule creation out of an activity and do it in the worker itself * feat: OutboxEventDeleteAndSend as batch * change outbox_event to have id only instead of idempotency key * make e2e test less brittle, save eventID as idempotency key in publication * feat: make outbox_event keep an history * feat(EN-214): added a schedule to cleanup outbox events * test: make cleanup actually clean * ignore linting rules for now * feat: do not add psu metadata to event anymore as it's irrelevant * fix: create local variable instead of relying on pointers, even if not 100% necessary * fix: remove temporal schedule describe calls
164 lines
4.6 KiB
Go
164 lines
4.6 KiB
Go
package events
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"math/big"
|
|
"time"
|
|
|
|
"github.com/formancehq/go-libs/v3/api"
|
|
"github.com/formancehq/go-libs/v3/publish"
|
|
"github.com/formancehq/payments/internal/models"
|
|
"github.com/formancehq/payments/pkg/events"
|
|
)
|
|
|
|
type PaymentMessagePayload struct {
|
|
// Mandatory fields
|
|
ID string `json:"id"`
|
|
ConnectorID string `json:"connectorID"`
|
|
Provider string `json:"provider"`
|
|
Reference string `json:"reference"`
|
|
CreatedAt time.Time `json:"createdAt"`
|
|
Type string `json:"type"`
|
|
Status string `json:"status"`
|
|
Scheme string `json:"scheme"`
|
|
Asset string `json:"asset"`
|
|
RawData json.RawMessage `json:"rawData"`
|
|
InitialAmount *big.Int `json:"initialAmount"`
|
|
Amount *big.Int `json:"amount"`
|
|
|
|
// Optional fields
|
|
SourceAccountID string `json:"sourceAccountID,omitempty"`
|
|
DestinationAccountID string `json:"destinationAccountID,omitempty"`
|
|
Links []api.Link `json:"links,omitempty"`
|
|
Metadata map[string]string `json:"metadata,omitempty"`
|
|
}
|
|
|
|
func (p *PaymentMessagePayload) MarshalJSON() ([]byte, error) {
|
|
type Alias PaymentMessagePayload
|
|
var initialAmountStr *string
|
|
if p.InitialAmount != nil {
|
|
s := p.InitialAmount.String()
|
|
initialAmountStr = &s
|
|
}
|
|
var amountStr *string
|
|
if p.Amount != nil {
|
|
s := p.Amount.String()
|
|
amountStr = &s
|
|
}
|
|
return json.Marshal(&struct {
|
|
InitialAmount *string `json:"initialAmount"`
|
|
Amount *string `json:"amount"`
|
|
*Alias
|
|
}{
|
|
InitialAmount: initialAmountStr,
|
|
Amount: amountStr,
|
|
Alias: (*Alias)(p),
|
|
})
|
|
}
|
|
|
|
func (p *PaymentMessagePayload) UnmarshalJSON(data []byte) error {
|
|
type Alias PaymentMessagePayload
|
|
aux := &struct {
|
|
InitialAmount *string `json:"initialAmount"`
|
|
Amount *string `json:"amount"`
|
|
*Alias
|
|
}{
|
|
Alias: (*Alias)(p),
|
|
}
|
|
if err := json.Unmarshal(data, &aux); err != nil {
|
|
return err
|
|
}
|
|
if aux.InitialAmount != nil {
|
|
bi := new(big.Int)
|
|
if _, ok := bi.SetString(*aux.InitialAmount, 10); !ok {
|
|
return fmt.Errorf("invalid initialAmount string: %s", *aux.InitialAmount)
|
|
}
|
|
p.InitialAmount = bi
|
|
} else {
|
|
p.InitialAmount = nil
|
|
}
|
|
if aux.Amount != nil {
|
|
bi := new(big.Int)
|
|
if _, ok := bi.SetString(*aux.Amount, 10); !ok {
|
|
return fmt.Errorf("invalid amount string: %s", *aux.Amount)
|
|
}
|
|
p.Amount = bi
|
|
} else {
|
|
p.Amount = nil
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (e Events) NewEventSavedPayments(payment models.Payment, adjustment models.PaymentAdjustment) publish.EventMessage {
|
|
payload := PaymentMessagePayload{
|
|
ID: payment.ID.String(),
|
|
Reference: payment.Reference,
|
|
Type: payment.Type.String(),
|
|
Status: payment.Status.String(),
|
|
InitialAmount: payment.InitialAmount,
|
|
Amount: payment.Amount,
|
|
Scheme: payment.Scheme.String(),
|
|
Asset: payment.Asset,
|
|
CreatedAt: payment.CreatedAt,
|
|
ConnectorID: payment.ConnectorID.String(),
|
|
Provider: models.ToV3Provider(payment.ConnectorID.Provider),
|
|
SourceAccountID: func() string {
|
|
if payment.SourceAccountID == nil {
|
|
return ""
|
|
}
|
|
return payment.SourceAccountID.String()
|
|
}(),
|
|
DestinationAccountID: func() string {
|
|
if payment.DestinationAccountID == nil {
|
|
return ""
|
|
}
|
|
return payment.DestinationAccountID.String()
|
|
}(),
|
|
RawData: adjustment.Raw,
|
|
Metadata: payment.Metadata,
|
|
}
|
|
|
|
if payment.SourceAccountID != nil {
|
|
payload.Links = append(payload.Links, api.Link{
|
|
Name: "source_account",
|
|
URI: e.stackURL + "/api/payments/v3/accounts/" + payment.SourceAccountID.String(),
|
|
})
|
|
}
|
|
|
|
if payment.DestinationAccountID != nil {
|
|
payload.Links = append(payload.Links, api.Link{
|
|
Name: "destination_account",
|
|
URI: e.stackURL + "/api/payments/v3/accounts/" + payment.DestinationAccountID.String(),
|
|
})
|
|
}
|
|
|
|
return publish.EventMessage{
|
|
IdempotencyKey: adjustment.IdempotencyKey(),
|
|
Date: time.Now().UTC(),
|
|
App: events.EventApp,
|
|
Version: events.EventVersion,
|
|
Type: events.EventTypeSavedPayments,
|
|
Payload: payload,
|
|
}
|
|
}
|
|
|
|
type PaymentDeletedMessagePayload struct {
|
|
ID string `json:"id"`
|
|
}
|
|
|
|
func (e Events) NewEventPaymentDeleted(paymentID models.PaymentID) publish.EventMessage {
|
|
payload := PaymentDeletedMessagePayload{
|
|
ID: paymentID.String(),
|
|
}
|
|
|
|
return publish.EventMessage{
|
|
IdempotencyKey: fmt.Sprintf("delete:%s", paymentID.String()),
|
|
Date: time.Now().UTC(),
|
|
App: events.EventApp,
|
|
Version: events.EventVersion,
|
|
Type: events.EventTypeDeletedPayments,
|
|
Payload: payload,
|
|
}
|
|
}
|