fix orchestration

formancehq · Sep 25, 2023 · edf60cb · edf60cb
1 parent 8ad2098
commit edf60cb
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 133 deletions.
diff --git a/components/orchestration/internal/workflow/activities/activity_payment_stripe_transfer.go b/components/orchestration/internal/workflow/activities/activity_payment_stripe_transfer.go
@@ -4,16 +4,30 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/formancehq/formance-sdk-go/pkg/models/shared"
+	"go.temporal.io/sdk/activity"
 	"go.temporal.io/sdk/workflow"
 )
 
-func (a Activities) StripeTransfer(ctx context.Context, request shared.StripeTransferRequest) error {
+func (a Activities) StripeTransfer(ctx context.Context, request shared.ActivityStripeTransfer) error {
+	activityInfo := activity.GetInfo(ctx)
+	ti := shared.TransferInitiationRequest{
+		Amount:               request.Amount,
+		Asset:                *request.Asset,
+		CreatedAt:            time.Now(),
+		DestinationAccountID: *request.Destination,
+		Provider:             shared.ConnectorStripe,
+		Type:                 shared.TransferInitiationRequestTypeTransfer,
+		UniqueRequestID:      activityInfo.WorkflowExecution.ID + activityInfo.ActivityID,
+		Validated:            true, // No need to validate
+	}
+
 	response, err := a.client.Payments.
-		ConnectorsStripeTransfer(
+		CreateTransferInitiation(
 			ctx,
-			request,
+			ti,
 		)
 	if err != nil {
 		return err
@@ -29,6 +43,6 @@ func (a Activities) StripeTransfer(ctx context.Context, request shared.StripeTra
 
 var StripeTransferActivity = Activities{}.StripeTransfer
 
-func StripeTransfer(ctx workflow.Context, request shared.StripeTransferRequest) error {
+func StripeTransfer(ctx workflow.Context, request shared.ActivityStripeTransfer) error {
 	return executeActivity(ctx, StripeTransferActivity, nil, request)
 }
diff --git a/components/orchestration/internal/workflow/stages/send/run.go b/components/orchestration/internal/workflow/stages/send/run.go
@@ -195,7 +195,7 @@ func runWalletToPayment(ctx workflow.Context, source *WalletSource, destination
 		return err
 	}
 
-	if err := activities.StripeTransfer(internal.InfiniteRetryContext(ctx), shared.StripeTransferRequest{
+	if err := activities.StripeTransfer(internal.InfiniteRetryContext(ctx), shared.ActivityStripeTransfer{
 		Amount:      amount.Amount,
 		Asset:       &amount.Asset,
 		Destination: &stripeConnectID,
@@ -360,7 +360,7 @@ func runAccountToPayment(ctx workflow.Context, source *LedgerAccountSource, dest
 		return err
 	}
 
-	if err := activities.StripeTransfer(internal.InfiniteRetryContext(ctx), shared.StripeTransferRequest{
+	if err := activities.StripeTransfer(internal.InfiniteRetryContext(ctx), shared.ActivityStripeTransfer{
 		Amount:      amount.Amount,
 		Asset:       &amount.Asset,
 		Destination: &stripeConnectID,

diff --git a/components/orchestration/internal/workflow/stages/send/run_test.go b/components/orchestration/internal/workflow/stages/send/run_test.go
@@ -688,7 +688,7 @@ var (
 			{
 				Activity: activities.StripeTransferActivity,
 				Args: []any{
-					mock.Anything, shared.StripeTransferRequest{
+					mock.Anything, shared.ActivityStripeTransfer{
 						Amount:      big.NewInt(100),
 						Asset:       pointer.For("USD"),
 						Destination: pointer.For("abcd"),
@@ -1025,7 +1025,7 @@ var (
 			{
 				Activity: activities.StripeTransferActivity,
 				Args: []any{
-					mock.Anything, shared.StripeTransferRequest{
+					mock.Anything, shared.ActivityStripeTransfer{
 						Amount:      big.NewInt(100),
 						Asset:       pointer.For("USD"),
 						Destination: pointer.For("abcd"),

diff --git a/components/orchestration/openapi.yaml b/components/orchestration/openapi.yaml
@@ -92,7 +92,7 @@ paths:
           $ref: '#/components/responses/ErrorResponse'
         204:
           description: No content
-  
+
   /workflows/{workflowID}/instances:
     parameters:
     - in: path
@@ -614,6 +614,27 @@ components:
       - $ref: '#/components/schemas/StageSend'
       - $ref: '#/components/schemas/StageDelay'
       - $ref: '#/components/schemas/StageWaitEvent'
+    StripeTransferRequest:
+      type: object
+      properties:
+        amount:
+          type: integer
+          format: bigint
+          minimum: 0
+          example: 100
+        asset:
+          type: string
+          example: USD
+        destination:
+          type: string
+          example: acct_1Gqj58KZcSIg2N2q
+        metadata:
+          type: object
+          description: |
+            A set of key/value pairs that you can attach to a transfer object.
+            It can be useful for storing additional information about the transfer in a structured format.
+          example:
+            order_id: '6735'
     ActivityStripeTransfer:
       $ref: '#/components/schemas/StripeTransferRequest'
     ActivityGetAccount:

diff --git a/components/payments/openapi.yaml b/components/payments/openapi.yaml
@@ -305,18 +305,6 @@ paths:
       responses:
         '200':
           $ref: '#/components/responses/Transfers'
-  /connectors/stripe/transfers:
-    post:
-      summary: Transfer funds between Stripe accounts
-      tags:
-        - Payments
-      operationId: connectorsStripeTransfer
-      description: Execute a transfer between two Stripe accounts.
-      requestBody:
-        $ref: '#/components/requestBodies/StripeTransfer'
-      responses:
-        '200':
-            $ref: '#/components/responses/StripeTransfer'
 
 # ---------------------- COMPONENTS ----------------------
 components:
@@ -478,12 +466,6 @@ components:
         application/json:
           schema:
             $ref: '#/components/schemas/TaskResponse'
-    StripeTransfer:
-      description: OK
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/StripeTransferResponse'
     Transfer:
       description: OK
       content:
@@ -504,12 +486,6 @@ components:
         application/json:
           schema:
             $ref: '#/components/schemas/ConnectorConfig'
-    StripeTransfer:
-      required: true
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/StripeTransferRequest'
     UpdateMetadata:
       required: true
       content:
@@ -838,7 +814,7 @@ components:
           type: string
           example: '60s'
           description: |
-            The frequency at which the connector will try to fetch new BalanceTransaction objects from Stripe API.
+            The frequency at which the connector will try to fetch new BalanceTransaction objects from Wise API.
           default: '120s'
     ModulrConfig:
       type: object
@@ -859,7 +835,7 @@ components:
           type: string
           example: '60s'
           description: |
-            The frequency at which the connector will try to fetch new BalanceTransaction objects from Stripe API.
+            The frequency at which the connector will try to fetch new BalanceTransaction objects from Modulr API.
           default: '120s'
     BankingCircleConfig:
       type: object
@@ -893,7 +869,7 @@ components:
           type: string
           example: '60s'
           description: |
-            The frequency at which the connector will try to fetch new BalanceTransaction objects from Stripe API.
+            The frequency at which the connector will try to fetch new BalanceTransaction objects from Banking Circle API.
           default: '120s'
     MangoPayConfig:
       type: object
@@ -906,7 +882,7 @@ components:
           type: string
           example: '60s'
           description: |
-            The frequency at which the connector will try to fetch new BalanceTransaction objects from Stripe API.
+            The frequency at which the connector will try to fetch new BalanceTransaction objects from MangoPay API.
           default: '120s'
         clientID:
           type: string
@@ -937,7 +913,7 @@ components:
           type: string
           example: '60s'
           description: |
-            The frequency at which the connector will try to fetch new BalanceTransaction objects from Stripe API.
+            The frequency at which the connector will try to fetch new BalanceTransaction objects from MoneyCorp API.
           default: '120s'
     CurrencyCloudConfig:
       type: object
@@ -1416,29 +1392,6 @@ components:
             - FAILED
             - REJECTED
             - VALIDATED
-    StripeTransferRequest:
-      type: object
-      properties:
-        amount:
-          type: integer
-          format: bigint
-          minimum: 0
-          example: 100
-        asset:
-          type: string
-          example: USD
-        destination:
-          type: string
-          example: acct_1Gqj58KZcSIg2N2q
-        metadata:
-          type: object
-          description: |
-            A set of key/value pairs that you can attach to a transfer object.
-            It can be useful for storing additional information about the transfer in a structured format.
-          example:
-            order_id: '6735'
-    StripeTransferResponse:
-      type: object
     PaymentStatus:
       type: string
       enum: