8000 fix(payments): fix missing delay when scheduling in the future by paul-nicolas · Pull Request #226 · formancehq/payments · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(payments): fix missing delay when scheduling in the future #226

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 1 commit into from
Dec 20, 2024
Merged

fix(payments): fix missing delay when scheduling in the future #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 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 @@ -3,6 +3,7 @@ package services
import (
"context"
"fmt"
"time"

"github.com/formancehq/go-libs/v2/bun/bunpaginate"
"github.com/formancehq/payments/internal/models"
Expand Down Expand Up @@ -38,15 +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)
}

switch pi.Type {
case models.PAYMENT_INITIATION_TYPE_TRANSFER:
task, err := s.engine.CreateTransfer(ctx, pi.ID, 1, waitResult)
task, err := s.engine.CreateTransfer(ctx, pi.ID, startDelay, 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, 1, waitResult)
task, err := s.engine.CreatePayout(ctx, pi.ID, startDelay, 1, waitResult)
if err != nil {
return models.Task{}, handleEngineErrors(err)
}
Expand Down
11 changes: 9 additions & 2 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,6 +2,7 @@ package services

import (
"context"
"time"

"github.com/formancehq/payments/internal/models"
)
Expand All @@ -28,15 +29,21 @@ 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, 1, waitResult)
task, err := s.engine.CreateTransfer(ctx, paymentInitiation.ID, startDelay, 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, 1, waitResult)
task, err := s.engine.CreatePayout(ctx, paymentInitiation.ID, startDelay, 1, waitResult)
if err != nil {
return models.Task{}, handleEngineErrors(err)
}
Expand Down
31 changes: 14 additions & 17 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,6 +3,7 @@ package services
import (
"context"
"fmt"
"time"

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

attempts := getAttemps(adjustments, isReversed)

if isReversed {
// TODO(polo): implement the reverse retry
return models.Task{}, fmt.Errorf("cannot retry a reversed payment initiation: %w", ErrValidation)
} else {
switch pi.Type {
case models.PAYMENT_INITIATION_TYPE_TRANSFER:
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, attempts+1, waitResult)
if err != nil {
return models.Task{}, handleEngineErrors(err)
}
return task, nil
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)
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)
if err != nil {
return models.Task{}, handleEngineErrors(err)
}
return task, nil
}

return models.Task{}, nil
Expand Down
10 changes: 6 additions & 4 deletions internal/connectors/engine/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,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, attempt int, waitResult bool) (models.Task, error)
CreateTransfer(ctx context.Context, piID models.PaymentInitiationID, startDelay time.Duration, 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, attempt int, waitResult bool) (models.Task, error)
CreatePayout(ctx context.Context, piID models.PaymentInitiationID, startDelay time.Duration, 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 @@ -482,7 +482,7 @@ func (e *engine) ForwardBankAccount(ctx context.Context, bankAccountID uuid.UUID
return task, nil
}

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

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

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

Expand All @@ -627,6 +628,7 @@ func (e *engine) CreatePayout(ctx context.Context, piID models.PaymentInitiation
ctx,
client.StartWorkflowOptions{
ID: id,
StartDelay: startDelay,
TaskQueue: e.getConnectorTaskQueue(piID.ConnectorID),
WorkflowIDReusePolicy: enums.WORKFLOW_ID_REUSE_POLICY_REJECT_DUPLICATE,
WorkflowExecutionErrorWhenAlreadyStarted: false,
Expand Down
Loading
0