fix: merge conflicts

Signed-off-by: Lawrence Zawila <113581282+darkmatterpool@users.noreply.github.com>
formancehq · Dec 23, 2022 · f265c84 · f265c84
1 parent d359843
commit f265c84
Show file tree

Hide file tree

Showing 28 changed files with 582 additions and 491 deletions.
diff --git a/client/.openapi-generator-ignore b/client/.openapi-generator-ignore
@@ -21,3 +21,4 @@
 #docs/*.md
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
+test/
diff --git a/client/.openapi-generator/FILES b/client/.openapi-generator/FILES
@@ -1,5 +1,4 @@
 .gitignore
-.openapi-generator-ignore
 .travis.yml
 README.md
 api/openapi.yaml
@@ -8,32 +7,43 @@ client.go
 configuration.go
 docs/BankingCircleConfig.md
 docs/ConnectorBaseInfo.md
+docs/ConnectorTaskBase.md
+docs/Connectors.md
 docs/CurrencyCloudConfig.md
 docs/DummyPayConfig.md
 docs/GetPaymentResponse.md
+docs/ListConnectorsConfigsResponse.md
+docs/ListConnectorsConfigsResponseConnector.md
+docs/ListConnectorsConfigsResponseConnectorKey.md
 docs/ListConnectorsResponse.md
 docs/ListPaymentsResponse.md
 docs/ModulrConfig.md
 docs/Payment.md
 docs/PaymentsApi.md
 docs/StripeConfig.md
 docs/StripeTask.md
+docs/StripeTransferRequest.md
 docs/WiseConfig.md
 git_push.sh
 go.mod
 go.sum
 model_banking_circle_config.go
 model_connector_base_info.go
+model_connector_task_base.go
+model_connectors.go
 model_currency_cloud_config.go
 model_dummy_pay_config.go
 model_get_payment_response.go
+model_list_connectors_configs_response.go
+model_list_connectors_configs_response_connector.go
+model_list_connectors_configs_response_connector_key.go
 model_list_connectors_response.go
 model_list_payments_response.go
 model_modulr_config.go
 model_payment.go
 model_stripe_config.go
 model_stripe_task.go
+model_stripe_transfer_request.go
 model_wise_config.go
 response.go
-test/api_payments_test.go
 utils.go
diff --git a/client/.openapi-generator/VERSION b/client/.openapi-generator/VERSION
@@ -1 +1 @@
-6.3.0-SNAPSHOT
+6.2.1
diff --git a/client/README.md b/client/README.md
@@ -15,6 +15,7 @@ Install the following dependencies:
 
 ```shell
 go get github.com/stretchr/testify/assert
+go get golang.org/x/oauth2
 go get golang.org/x/net/context
 ```
 
@@ -77,6 +78,7 @@ All URIs are relative to *http://localhost*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
+*PaymentsApi* | [**ConnectorsStripeTransfer**](docs/PaymentsApi.md#connectorsstripetransfer) | **Post** /connectors/stripe/transfer | Transfer funds between Stripe accounts
 *PaymentsApi* | [**GetAllConnectors**](docs/PaymentsApi.md#getallconnectors) | **Get** /connectors | Get all installed connectors
 *PaymentsApi* | [**GetAllConnectorsConfigs**](docs/PaymentsApi.md#getallconnectorsconfigs) | **Get** /connectors/configs | Get all available connectors configs
 *PaymentsApi* | [**GetConnectorTask**](docs/PaymentsApi.md#getconnectortask) | **Get** /connectors/{connector}/tasks/{taskId} | Read a specific task of the connector
@@ -93,15 +95,21 @@ Class | Method | HTTP request | Description
 
  - [BankingCircleConfig](docs/BankingCircleConfig.md)
  - [ConnectorBaseInfo](docs/ConnectorBaseInfo.md)
+ - [ConnectorTaskBase](docs/ConnectorTaskBase.md)
+ - [Connectors](docs/Connectors.md)
  - [CurrencyCloudConfig](docs/CurrencyCloudConfig.md)
  - [DummyPayConfig](docs/DummyPayConfig.md)
  - [GetPaymentResponse](docs/GetPaymentResponse.md)
+ - [ListConnectorsConfigsResponse](docs/ListConnectorsConfigsResponse.md)
+ - [ListConnectorsConfigsResponseConnector](docs/ListConnectorsConfigsResponseConnector.md)
+ - [ListConnectorsConfigsResponseConnectorKey](docs/ListConnectorsConfigsResponseConnectorKey.md)
  - [ListConnectorsResponse](docs/ListConnectorsResponse.md)
  - [ListPaymentsResponse](docs/ListPaymentsResponse.md)
  - [ModulrConfig](docs/ModulrConfig.md)
  - [Payment](docs/Payment.md)
  - [StripeConfig](docs/StripeConfig.md)
  - [StripeTask](docs/StripeTask.md)
+ - [StripeTransferRequest](docs/StripeTransferRequest.md)
  - [WiseConfig](docs/WiseConfig.md)
 
 

diff --git a/client/api/openapi.yaml b/client/api/openapi.yaml
@@ -91,7 +91,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/ConnectorConfig'
+                $ref: '#/components/schemas/ListConnectorsConfigsResponse'
           description: List of available connectors configs
       summary: Get all available connectors configs
       tags:
@@ -107,8 +107,7 @@ paths:
         name: connector
         required: true
         schema:
-          enum:
-          - stripe
+          $ref: '#/components/schemas/Connectors'
         style: simple
       responses:
         "204":
@@ -126,12 +125,7 @@ paths:
         name: connector
         required: true
         schema:
-          enum:
-          - stripe
-          - dummypay
-          - wise
-          - modulr
-          - currencycloud
+          $ref: '#/components/schemas/Connectors'
         style: simple
       requestBody:
         content:
@@ -156,8 +150,7 @@ paths:
         name: connector
         required: true
         schema:
-          enum:
-          - stripe
+          $ref: '#/components/schemas/Connectors'
         style: simple
       responses:
         "200":
@@ -181,8 +174,7 @@ paths:
         name: connector
         required: true
         schema:
-          enum:
-          - stripe
+          $ref: '#/components/schemas/Connectors'
         style: simple
       responses:
         "204":
@@ -201,16 +193,21 @@ paths:
         name: connector
         required: true
         schema:
-          enum:
-          - stripe
+          $ref: '#/components/schemas/Connectors'
         style: simple
       responses:
         "200":
           content:
             application/json:
               schema:
                 items:
-                  $ref: '#/components/schemas/ConnectorTask'
+                  oneOf:
+                  - $ref: '#/components/schemas/TaskDescriptorStripe'
+                  - $ref: '#/components/schemas/TaskDescriptorWise'
+                  - $ref: '#/components/schemas/TaskDescriptorCurrencyCloud'
+                  - $ref: '#/components/schemas/TaskDescriptorDummyPay'
+                  - $ref: '#/components/schemas/TaskDescriptorModulr'
+                  - $ref: '#/components/schemas/TaskDescriptorBankingCircle'
           description: Task list
       summary: List connector tasks
       tags:
@@ -226,8 +223,7 @@ paths:
         name: connector
         required: true
         schema:
-          enum:
-          - stripe
+          $ref: '#/components/schemas/Connectors'
         style: simple
       - description: The task id
         example: task1
@@ -242,13 +238,43 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/ConnectorTask'
+                oneOf:
+                - $ref: '#/components/schemas/TaskDescriptorStripe'
+                - $ref: '#/components/schemas/TaskDescriptorWise'
+                - $ref: '#/components/schemas/TaskDescriptorCurrencyCloud'
+                - $ref: '#/components/schemas/TaskDescriptorDummyPay'
+                - $ref: '#/components/schemas/TaskDescriptorModulr'
+                - $ref: '#/components/schemas/TaskDescriptorBankingCircle'
           description: The specified task
       summary: Read a specific task of the connector
       tags:
       - Payments
+  /connectors/stripe/transfer:
+    post:
+      description: Execute a transfer between two Stripe accounts
+      operationId: connectorsStripeTransfer
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/StripeTransferRequest'
+        required: true
+      responses:
+        "200":
+          description: Transfer has been executed
+      summary: Transfer funds between Stripe accounts
+      tags:
+      - Payments
 components:
   schemas:
+    Connectors:
+      enum:
+      - STRIPE
+      - DUMMY-PAY
+      - SIE
+      - MODULR
+      - CURRENCY-CLOUD
+      - BANKING-CIRCLE
     ConnectorConfig:
       oneOf:
       - $ref: '#/components/schemas/StripeConfig'
@@ -257,9 +283,6 @@ components:
       - $ref: '#/components/schemas/ModulrConfig'
       - $ref: '#/components/schemas/CurrencyCloudConfig'
       - $ref: '#/components/schemas/BankingCircleConfig'
-    ConnectorTask:
-      oneOf:
-      - $ref: '#/components/schemas/StripeTask'
     StripeConfig:
       properties:
         pollingPeriod:
@@ -435,9 +458,128 @@ components:
             $ref: '#/components/schemas/ConnectorBaseInfo'
       required:
       - data
+    ListConnectorsConfigsResponse:
+      example:
+        connector:
+          key:
+            datatype: ""
+            required: ""
+      properties:
+        connector:
+          $ref: '#/components/schemas/ListConnectorsConfigsResponse_connector'
     ConnectorBaseInfo:
       properties:
         provider:
           example: stripe
         disabled:
           example: false
+    StripeTransferRequest:
+      example:
+        amount: 100
+        metadata:
+          order_id: "6735"
+        destination: acct_1Gqj58KZcSIg2N2q
+        asset: USD
+      properties:
+        amount:
+          example: 100
+        asset:
+          example: USD
+        destination:
+          example: acct_1Gqj58KZcSIg2N2q
+        metadata:
+          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"
+    ConnectorTaskBase:
+      properties:
+        provider:
+          description: The connector code
+          example: stripe
+        createdAt:
+          description: The date when the task was created
+          example: 2020-01-01T00:00:00.000Z
+          format: date-time
+        status:
+          description: The task status
+          enum:
+          - stopped
+          - pending
+          - terminated
+          - active
+          - failed
+          example: stopped
+        error:
+          description: The error message if the task failed
+          example: "Error: Something went wrong"
+        state:
+          description: The task state
+          example: {}
+    TaskDescriptorStripe:
+      allOf:
+      - $ref: '#/components/schemas/ConnectorTaskBase'
+      - properties:
+          descriptor:
+            properties:
+              name: {}
+              main: {}
+              account: {}
+    TaskDescriptorWise:
+      allOf:
+      - $ref: '#/components/schemas/ConnectorTaskBase'
+      - properties:
+          descriptor:
+            properties:
+              name: {}
+              key: {}
+              profileID: {}
+    TaskDescriptorModulr:
+      allOf:
+      - $ref: '#/components/schemas/ConnectorTaskBase'
+      - properties:
+          descriptor:
+            properties:
+              name: {}
+              key: {}
+              accountID: {}
+    TaskDescriptorDummyPay:
+      allOf:
+      - $ref: '#/components/schemas/ConnectorTaskBase'
+      - properties:
+          descriptor:
+            properties:
+              name: {}
+              key: {}
+              fileName: {}
+    TaskDescriptorCurrencyCloud:
+      allOf:
+      - $ref: '#/components/schemas/ConnectorTaskBase'
+      - properties:
+          descriptor:
+            properties:
+              name: {}
+    TaskDescriptorBankingCircle:
+      allOf:
+      - $ref: '#/components/schemas/ConnectorTaskBase'
+      - properties:
+          descriptor:
+            properties:
+              name: {}
+              key: {}
+    ListConnectorsConfigsResponse_connector_key:
+      example:
+        datatype: ""
+        required: ""
+      properties:
+        datatype: {}
+        required: {}
+    ListConnectorsConfigsResponse_connector:
+      example:
+        key:
+          datatype: ""
+          required: ""
+      properties:
+        key:
+          $ref: '#/components/schemas/ListConnectorsConfigsResponse_connector_key'