8000 fix(*): payment initiations fixes by paul-nicolas · Pull Request #374 · formancehq/payments · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(*): payment initiations fixes #374

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 24, 2025
Merged

fix(*): payment initiations fixes #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f21afce
fix(*): payment initiations fixes
paul-nicolas Mar 21, 2025
b3e53ff
add comments
paul-nicolas Mar 21, 2025
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
1 change: 0 additions & 1 deletion internal/api/backend/backend_generated.go
< 8000 path d="M8 9a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM1.5 9a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Zm13 0a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z">
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions internal/api/services/payment_initiations_approve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@ func (s *Service) PaymentInitiationsApprove(ctx context.Context, id models.Payme
return models.Task{}, newStorageError(err, "cannot get payment initiation")
}

startDelay := 0 * time.Second
now := time.Now()
if !pi.ScheduledAt.IsZero() && pi.ScheduledAt.After(now) {
startDelay = pi.ScheduledAt.Sub(now)
if !pi.ScheduledAt.IsZero() && pi.ScheduledAt.After(time.Now()) {
// In any case, if the payment initiation is scheduled for the future,
// we do not want to wait for the results
waitResult = false
}

switch pi.Type {
case models.PAYMENT_INITIATION_TYPE_TRANSFER:
task, err := s.engine.CreateTransfer(ctx, pi.ID, startDelay, 1, waitResult)
task, err := s.engine.CreateTransfer(ctx, pi.ID, 1, waitResult)
if err != nil {
return models.Task{}, handleEngineErrors(err)
}
return task, nil
case models.PAYMENT_INITIATION_TYPE_PAYOUT:
task, err := s.engine.CreatePayout(ctx, pi.ID, startDelay, 1, waitResult)
task, err := s.engine.CreatePayout(ctx, pi.ID, 1, waitResult)
if err != nil {
return models.Task{}, handleEngineErrors(err)
}
Expand Down
13 changes: 9 additions & 4 deletions internal/api/services/payment_initiations_approve_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestPaymentInitiationsApprove(t *testing.T) {
}
piWithScheduledAt := models.PaymentInitiation{
Type: models.PAYMENT_INITIATION_TYPE_PAYOUT,
ScheduledAt: time.Now(),
ScheduledAt: time.Now().Add(time.Hour),
}

tests := []struct {
Expand Down Expand Up @@ -141,17 +141,22 @@ func TestPaymentInitiationsApprove(t *testing.T) {
if test.expectedAdjError == nil {
store.EXPECT().PaymentInitiationsGet(gomock.Any(), pid).Return(&test.pi, test.piGetStorageErr)

waitResult := true
if !test.pi.ScheduledAt.IsZero() {
waitResult = false
}

if test.piGetStorageErr == nil {
switch test.pi.Type {
case models.PAYMENT_INITIATION_TYPE_TRANSFER:
eng.EXPECT().CreateTransfer(gomock.Any(), pid, 0*time.Second, 1, false).Return(models.Task{}, test.engineErr)
eng.EXPECT().CreateTransfer(gomock.Any(), pid, 1, waitResult).Return(models.Task{}, test.engineErr)
case models.PAYMENT_INITIATION_TYPE_PAYOUT:
eng.EXPECT().CreatePayout(gomock.Any(), pid, gomock.Any(), 1, false).Return(models.Task{}, test.engineErr)
eng.EXPECT().CreatePayout(gomock.Any(), pid, 1, waitResult).Return(models.Task{}, test.engineErr)
}
}
}

_, err := s.PaymentInitiationsApprove(context.Background(), pid, false)
_, err := s.PaymentInitiationsApprove(context.Background(), pid, true)
switch {
case test.expectedAdjError == nil && test.expectedPIError == nil && test.expectedEngineError == nil:
require.NoError(t, err)
Expand Down
11 changes: 2 additions & 9 deletions internal/api/services/payment_initiations_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package services

import (
"context"
"time"

"github.com/formancehq/payments/internal/models"
)
Expand All @@ -28,21 +27,15 @@ func (s *Service) PaymentInitiationsCreate(ctx context.Context, paymentInitiatio
return models.Task{}, newStorageError(err, "cannot create payment initiation")
}

startDelay := 0 * time.Second
now := time.Now()
if !paymentInitiation.ScheduledAt.IsZero() && paymentInitiation.ScheduledAt.After(now) {
startDelay = paymentInitiation.ScheduledAt.Sub(now)
}

switch paymentInitiation.Type {
case models.PAYMENT_INITIATION_TYPE_TRANSFER:
task, err := s.engine.CreateTransfer(ctx, paymentInitiation.ID, startDelay, 1, waitResult)
task, err := s.engine.CreateTransfer(ctx, paymentInitiation.ID, 1, waitResult)
if err != nil {
return models.Task{}, handleEngineErrors(err)
}
return task, nil
case models.PAYMENT_INITIATION_TYPE_PAYOUT:
task, err := s.engine.CreatePayout(ctx, paymentInitiation.ID, startDelay, 1, waitResult)
task, err := s.engine.CreatePayout(ctx, paymentInitiation.ID, 1, waitResult)
if err != nil {
return models.Task{}, handleEngineErrors(err)
}
Expand Down
4 changes: 2 additions & 2 deletions internal/api/services/payment_initiations_create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ func TestPaymentInitiationsCreate(t *testing.T) {
if test.piUpsertStorageErr == nil && test.sendToPSP {
switch test.pi.Type {
case models.PAYMENT_INITIATION_TYPE_TRANSFER:
eng.EXPECT().CreateTransfer(gomock.Any(), models.PaymentInitiationID{}, 0*time.Second, 1, false).Return(models.Task{}, test.engineErr)
eng.EXPECT().CreateTransfer(gomock.Any(), models.PaymentInitiationID{}, 1, false).Return(models.Task{}, test.engineErr)
case models.PAYMENT_INITIATION_TYPE_PAYOUT:
eng.EXPECT().CreatePayout(gomock.Any(), models.PaymentInitiationID{}, gomock.Any(), 1, false).Return(models.Task{}, test.engineErr)
eng.EXPECT().CreatePayout(gomock.Any(), models.PaymentInitiationID{}, 1, false).Return(models.Task{}, test.engineErr)
}
}

Expand Down
6 changes: 2 additions & 4 deletions internal/api/services/payment_initiations_retry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package services
import (
"context"
"fmt"
"time"

"github.com/formancehq/go-libs/v2/bun/bunpaginate"
"github.com/formancehq/payments/internal/models"
Expand Down Expand Up @@ -36,16 +35,15 @@ func (s *Service) PaymentInitiationsRetry(ctx context.Context, id models.Payment

attempts := getAttemps(adjustments)

startDelay := 0 * time.Second
switch pi.Type {
case models.PAYMENT_INITIATION_TYPE_TRANSFER:
task, err := s.engine.CreateTransfer(ctx, pi.ID, startDelay, attempts+1, waitResult)
task, err := s.engine.CreateTransfer(ctx, pi.ID, attempts+1, waitResult)
if err != nil {
return models.Task{}, handleEngineErrors(err)
}
return task, nil
case models.PAYMENT_INITIATION_TYPE_PAYOUT:
task, err := s.engine.CreatePayout(ctx, pi.ID, startDelay, attempts+1, waitResult)
task, err := s.engine.CreatePayout(ctx, pi.ID, attempts+1, waitResult)
if err != nil {
return models.Task{}, handleEngineErrors(err)
}
Expand Down
5 changes: 2 additions & 3 deletions internal/api/services/payment_initiations_retry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"fmt"
"testing"
"time"

"github.com/formancehq/go-libs/v2/bun/bunpaginate"
"github.com/formancehq/payments/internal/connectors/engine"
Expand Down Expand Up @@ -143,9 +142,9 @@ func TestPaymentInitiationsRetry(t *testing.T) {
if test.piGetStorageErr == nil {
switch test.pi.Type {
case models.PAYMENT_INITIATION_TYPE_TRANSFER:
eng.EXPECT().CreateTransfer(gomock.Any(), pid, 0*time.Second, 2, false).Return(models.Task{}, test.engineErr)
eng.EXPECT().CreateTransfer(gomock.Any(), pid, 2, false).Return(models.Task{}, test.engineErr)
case models.PAYMENT_INITIATION_TYPE_PAYOUT:
eng.EXPECT().CreatePayout(gomock.Any(), pid, gomock.Any(), 2, false).Return(models.Task{}, test.engineErr)
eng.EXPECT().CreatePayout(gomock.Any(), pid, 2, false).Return(models.Task{}, test.engineErr)
}
}
}
Expand Down
18 changes: 17 additions & 1 deletion internal/api/v2/handler_transfer_initiations_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,14 @@
func translateAdjustments(from []models.PaymentInitiationAdjustment) []transferInitiationAdjustmentsResponse {
to := make([]transferInitiationAdjustmentsResponse, len(from))
for i, adjustment := range from {
status, toSend := translateStatus(adjustment.Status)
if !toSend {
continue

Check warning on line 123 in internal/api/v2/handler_transfer_initiations_get.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_transfer_initiations_get.go#L121-L123 

Added lines #L121 - L123 were not covered by tests
}
to[i] = transferInitiationAdjustmentsResponse{
AdjustmentID: adjustment.ID.String(),
CreatedAt: adjustment.CreatedAt,
Status: adjustment.Status.String(),
Status: status,

Check warning on line 128 in internal/api/v2/handler_transfer_initiations_get.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_transfer_initiations_get.go#L128 

Added line #L128 was not covered by tests
Error: func() string {
if adjustment.Error == nil {
return ""
Expand All @@ -134,6 +138,18 @@
return to
}

func translateStatus(from models.PaymentInitiationAdjustmentStatus) (string, bool) {
switch from {
case models.PAYMENT_INITIATION_ADJUSTMENT_STATUS_SCHEDULED_FOR_PROCESSING:
// PAYMENT_INITIATION_ADJUSTMENT_STATUS_SCHEDULED_FOR_PROCESSING is not supported
// in v2 as it is introduced in v3. Since we're gonna list all adjustments
// we can drop this one
return "", false
default:
return from.String(), true

Check warning on line 149 in internal/api/v2/handler_transfer_initiations_get.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_transfer_initiations_get.go#L141-L149 

Added lines #L141 - L149 were not covered by tests
}
}

func translateRelatedPayments(from []models.Payment) []transferInitiationPaymentsResponse {
to := make([]transferInitiationPaymentsResponse, len(from))
for i, payment := range from {
Expand Down
13 changes: 12 additions & 1 deletion internal/api/v2/handler_transfer_initiations_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"github.com/formancehq/go-libs/v2/pointer"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/models"
"github.com/formancehq/payments/internal/otel"
"github.com/formancehq/payments/internal/storage"
)
Expand Down Expand Up @@ -49,8 +50,18 @@
return
}

status := ""
switch lastAdjustment.Status {
case models.PAYMENT_INITIATION_ADJUSTMENT_STATUS_SCHEDULED_FOR_PROCESSING:
// PAYMENT_INITIATION_ADJUSTMENT_STATUS_SCHEDULED_FOR_PROCESSING is not supported
// in v2 as it is introduced in v3. We map it to PROCESSING for backward compatibility.
status = models.PAYMENT_INITIATION_ADJUSTMENT_STATUS_PROCESSING.String()

Check warning on line 58 in internal/api/v2/handler_transfer_initiations_list.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_transfer_initiations_list.go#L55-L58 

Added lines #L55 - L58 were not covered by tests
default:
status = lastAdjustment.Status.String()
}

if lastAdjustment != nil {
data[i].Status = lastAdjustment.Status.String()
data[i].Status = status
data[i].Error = func() string {
if lastAdjustment.Error == nil {
return ""
Expand Down
2 changes: 0 additions & 2 deletions internal/connectors/engine/activities/schedule_client_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions internal/connectors/engine/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ type Engine interface {
// in the external system (PSP).
ForwardBankAccount(ctx context.Context, bankAccountID uuid.UUID, connectorID models.ConnectorID, waitResult bool) (models.Task, error)
// Create a transfer between two accounts on the given connector (PSP).
CreateTransfer(ctx context.Context, piID models.PaymentInitiationID, startDelay time.Duration, attempt int, waitResult bool) (models.Task, error)
CreateTransfer(ctx context.Context, piID models.PaymentInitiationID, attempt int, waitResult bool) (models.Task, error)
// Reverse a transfer on the given connector (PSP).
ReverseTransfer(ctx context.Context, reversal models.PaymentInitiationReversal, waitResult bool) (models.Task, error)
// Create a payout on the given connector (PSP).
CreatePayout(ctx context.Context, piID models.PaymentInitiationID, startDelay time.Duration, attempt int, waitResult bool) (models.Task, error)
CreatePayout(ctx context.Context, piID models.PaymentInitiationID, attempt int, waitResult bool) (models.Task, error)
// Reverse a payout on the given connector (PSP).
ReversePayout(ctx context.Context, reversal models.PaymentInitiationReversal, waitResult bool) (models.Task, error)

Expand Down Expand Up @@ -513,7 +513,7 @@ func (e *engine) ForwardBankAccount(ctx context.Context, bankAccountID uuid.UUID
return task, nil
}

func (e *engine) CreateTransfer(ctx context.Context, piID models.PaymentInitiationID, startDelay time.Duration, attempt int, waitResult bool) (models.Task, error) {
func (e *engine) CreateTransfer(ctx context.Context, piID models.PaymentInitiationID, attempt int, waitResult bool) (models.Task, error) {
ctx, span := otel.Tracer().Start(ctx, "engine.CreateTransfer")
defer span.End()

Expand All @@ -540,7 +540,6 @@ func (e *engine) CreateTransfer(ctx context.Context, piID models.PaymentInitiati
ctx,
client.StartWorkflowOptions{
ID: id,
StartDelay: startDelay,
TaskQueue: GetDefaultTaskQueue(e.stack),
WorkflowIDReusePolicy: enums.WORKFLOW_ID_REUSE_POLICY_REJECT_DUPLICATE,
WorkflowExecutionErrorWhenAlreadyStarted: false,
Expand Down Expand Up @@ -632,7 +631,7 @@ func (e *engine) ReverseTransfer(ctx context.Context, reversal models.PaymentIni
return task, nil
}

func (e *engine) CreatePayout(ctx context.Context, piID models.PaymentInitiationID, startDelay time.Duration, attempt int, waitResult bool) (models.Task, error) {
func (e *engine) CreatePayout(ctx context.Context, piID models.PaymentInitiationID, attempt int, waitResult bool) (models.Task, error) {
ctx, span := otel.Tracer().Start(ctx, "engine.CreatePayout")
defer span.End()

Expand All @@ -659,7 +658,6 @@ func (e *engine) CreatePayout(ctx context.Context, piID models.PaymentInitiation
ctx,
client.StartWorkflowOptions{
ID: id,
StartDelay: startDelay,
TaskQueue: GetDefaultTaskQueue(e.stack),
WorkflowIDReusePolicy: enums.WORKFLOW_ID_REUSE_POLICY_REJECT_DUPLICATE,
WorkflowExecutionErrorWhenAlreadyStarted: false,
Expand Down
18 changes: 8 additions & 10 deletions internal/connectors/engine/engine_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion internal/connectors/engine/plugins/plugin_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/connectors/engine/workers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
return nil
}

func (w *WorkerPool) onStartPlugin(ctx context.Context, connector models.Connector) error {
func (w *WorkerPool) onStartPlugin(_ context.Context, connector models.Connector) error {

Check warning on line 115 in internal/connectors/engine/workers.go

View check run for this annotation

Codecov / codecov/patch

internal/connectors/engine/workers.go#L115 

Added line #L115 was not covered by tests
// Even if the connector is scheduled for deletion, we still need to register
// the plugin to be able to handle the uninstallation.
// It will be unregistered when the uninstallation is done in the workflow
Expand Down
Loading
0