feat(payments): add provider in bank account response and search (#936)

formancehq · Dec 1, 2023 · d18dde6 · d18dde6 · vercel · Dec 1, 2023
1 parent a9f7385
commit d18dde6
Show file tree

Hide file tree

Showing 35 changed files with 42 additions and 11 deletions.
diff --git a/.../testdata/monopod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml b/.../testdata/monopod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...trollers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-streams.yaml b/...trollers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...ollers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-streams.yaml b/...ollers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-streams.yaml
@@ -411,6 +411,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/.../monopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml b/.../monopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...monopod-payments-before-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml b/...monopod-payments-before-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/.../testdata/monopod-search-before-v0.7.0/results/configmaps--v1/search-benthos-streams.yaml b/.../testdata/monopod-search-before-v0.7.0/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...trollers/stack/testdata/multipod-debug/results/configmaps--v1/search-benthos-streams.yaml b/...trollers/stack/testdata/multipod-debug/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...controllers/stack/testdata/multipod-debug/results/deployments-apps-v1/search-benthos.yaml b/...controllers/stack/testdata/multipod-debug/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: NeqZuKzHHkxy17D5tfZq6ND-r2DaIN0o3EXCTeFaIB4=
+                stack.formance.cloud/volumes-hash: XAoeNRyNlYPVHlXqJ9489fdaUDa9XjgtcUy5DM54PZc=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

diff --git a/...testdata/multipod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml b/...testdata/multipod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...ck/testdata/multipod-disabled-one-service/results/deployments-apps-v1/search-benthos.yaml b/...ck/testdata/multipod-disabled-one-service/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: NeqZuKzHHkxy17D5tfZq6ND-r2DaIN0o3EXCTeFaIB4=
+                stack.formance.cloud/volumes-hash: XAoeNRyNlYPVHlXqJ9489fdaUDa9XjgtcUy5DM54PZc=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

diff --git a/...testdata/multipod-latest-no-monitoring/results/configmaps--v1/search-benthos-streams.yaml b/...testdata/multipod-latest-no-monitoring/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...ck/testdata/multipod-latest-no-monitoring/results/deployments-apps-v1/search-benthos.yaml b/...ck/testdata/multipod-latest-no-monitoring/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: hdtY4C73B31q1uEWDgyd6xny2JcUlh_Opd7Ox2AzpwU=
+                stack.formance.cloud/volumes-hash: Gj-h7gOkMA05Tg6wEUlsr0AZ4Oas1ZxidQY2WySK7J8=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

diff --git a/...a/multipod-latest-with-custom-registry/results/configmaps--v1/search-benthos-streams.yaml b/...a/multipod-latest-with-custom-registry/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...data/multipod-latest-with-custom-registry/results/deployments-apps-v1/search-benthos.yaml b/...data/multipod-latest-with-custom-registry/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: NeqZuKzHHkxy17D5tfZq6ND-r2DaIN0o3EXCTeFaIB4=
+                stack.formance.cloud/volumes-hash: XAoeNRyNlYPVHlXqJ9489fdaUDa9XjgtcUy5DM54PZc=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

diff --git a/.../multipod-latest-with-gateway-fallback/results/configmaps--v1/search-benthos-streams.yaml b/.../multipod-latest-with-gateway-fallback/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...ata/multipod-latest-with-gateway-fallback/results/deployments-apps-v1/search-benthos.yaml b/...ata/multipod-latest-with-gateway-fallback/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: NeqZuKzHHkxy17D5tfZq6ND-r2DaIN0o3EXCTeFaIB4=
+                stack.formance.cloud/volumes-hash: XAoeNRyNlYPVHlXqJ9489fdaUDa9XjgtcUy5DM54PZc=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

diff --git a/.../testdata/multipod-latest-with-secrets/results/configmaps--v1/search-benthos-streams.yaml b/.../testdata/multipod-latest-with-secrets/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...ack/testdata/multipod-latest-with-secrets/results/deployments-apps-v1/search-benthos.yaml b/...ack/testdata/multipod-latest-with-secrets/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: NeqZuKzHHkxy17D5tfZq6ND-r2DaIN0o3EXCTeFaIB4=
+                stack.formance.cloud/volumes-hash: XAoeNRyNlYPVHlXqJ9489fdaUDa9XjgtcUy5DM54PZc=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

diff --git a/...rollers/stack/testdata/multipod-latest/results/configmaps--v1/search-benthos-streams.yaml b/...rollers/stack/testdata/multipod-latest/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...ontrollers/stack/testdata/multipod-latest/results/deployments-apps-v1/search-benthos.yaml b/...ontrollers/stack/testdata/multipod-latest/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: NeqZuKzHHkxy17D5tfZq6ND-r2DaIN0o3EXCTeFaIB4=
+                stack.formance.cloud/volumes-hash: XAoeNRyNlYPVHlXqJ9489fdaUDa9XjgtcUy5DM54PZc=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

diff --git a/...k/testdata/multipod-service-annotation/results/configmaps--v1/search-benthos-streams.yaml b/...k/testdata/multipod-service-annotation/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...tack/testdata/multipod-service-annotation/results/deployments-apps-v1/search-benthos.yaml b/...tack/testdata/multipod-service-annotation/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: hdtY4C73B31q1uEWDgyd6xny2JcUlh_Opd7Ox2AzpwU=
+                stack.formance.cloud/volumes-hash: Gj-h7gOkMA05Tg6wEUlsr0AZ4Oas1ZxidQY2WySK7J8=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

diff --git a/...ta/multipod-with-audit-log-unvalid-tag/results/configmaps--v1/search-benthos-streams.yaml b/...ta/multipod-with-audit-log-unvalid-tag/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...tdata/multipod-with-audit-log-unvalid-tag/results/deployments-apps-v1/search-benthos.yaml b/...tdata/multipod-with-audit-log-unvalid-tag/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: ZfCuMGQfh-rJxVRAMiZgcFAX6YGuJTDmlkhAcqgjeGw=
+                stack.formance.cloud/volumes-hash: HwuOZshluD9ZlUDdE6Qjdk6WThO5yki7neGzghRew50=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

diff --git a/...stack/testdata/multipod-with-audit-log/results/configmaps--v1/search-benthos-streams.yaml b/...stack/testdata/multipod-with-audit-log/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...rs/stack/testdata/multipod-with-audit-log/results/deployments-apps-v1/search-benthos.yaml b/...rs/stack/testdata/multipod-with-audit-log/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: ZfCuMGQfh-rJxVRAMiZgcFAX6YGuJTDmlkhAcqgjeGw=
+                stack.formance.cloud/volumes-hash: HwuOZshluD9ZlUDdE6Qjdk6WThO5yki7neGzghRew50=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

diff --git a/...ck/testdata/multipod-without-audit-log/results/configmaps--v1/search-benthos-streams.yaml b/...ck/testdata/multipod-without-audit-log/results/configmaps--v1/search-benthos-streams.yaml
@@ -288,6 +288,7 @@ data:
                                 "id": this.payload.id,
                                 "createdAt": this.payload.createdAt,
                                 "connectorId": this.payload.connectorId,
+                                "provider": this.payload.provider,
                                 "name": this.payload.name,
                                 "accountNumber": this.payload.accountNumber,
                                 "iban": this.payload.iban,

diff --git a/...stack/testdata/multipod-without-audit-log/results/deployments-apps-v1/search-benthos.yaml b/...stack/testdata/multipod-without-audit-log/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: hdtY4C73B31q1uEWDgyd6xny2JcUlh_Opd7Ox2AzpwU=
+                stack.formance.cloud/volumes-hash: Gj-h7gOkMA05Tg6wEUlsr0AZ4Oas1ZxidQY2WySK7J8=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

diff --git a/components/payments/cmd/api/internal/api/bank_accounts.go b/components/payments/cmd/api/internal/api/bank_accounts.go
@@ -16,6 +16,7 @@ type bankAccountResponse struct {
 	CreatedAt     time.Time `json:"createdAt"`
 	Country       string    `json:"country"`
 	ConnectorID   string    `json:"connectorID"`
+	Provider      string    `json:"provider,omitempty"`
 	AccountID     string    `json:"accountId,omitempty"`
 	Iban          string    `json:"iban,omitempty"`
 	AccountNumber string    `json:"accountNumber,omitempty"`
@@ -47,6 +48,7 @@ func listBankAccountsHandler(b backend.Backend) http.HandlerFunc {
 				Country:     ret[i].Country,
 				ConnectorID: ret[i].ConnectorID.String(),
 				AccountID:   ret[i].AccountID.String(),
+				Provider:    ret[i].ConnectorID.Provider.String(),
 			}
 		}
 
@@ -93,6 +95,7 @@ func readBankAccountHandler(b backend.Backend) http.HandlerFunc {
 			Country:       account.Country,
 			ConnectorID:   account.ConnectorID.String(),
 			AccountID:     account.AccountID.String(),
+			Provider:      account.ConnectorID.Provider.String(),
 			Iban:          account.IBAN,
 			AccountNumber: account.AccountNumber,
 			SwiftBicCode:  account.SwiftBicCode,

diff --git a/components/payments/cmd/api/internal/api/bank_accounts_test.go b/components/payments/cmd/api/internal/api/bank_accounts_test.go
@@ -187,13 +187,15 @@ func TestListBankAccounts(t *testing.T) {
 					Country:     listBankAccountsResponse[0].Country,
 					ConnectorID: listBankAccountsResponse[0].ConnectorID.String(),
 					AccountID:   listBankAccountsResponse[0].AccountID.String(),
+					Provider:    listBankAccountsResponse[0].ConnectorID.Provider.String(),
 				},
 				{
 					ID:          listBankAccountsResponse[1].ID.String(),
 					CreatedAt:   listBankAccountsResponse[1].CreatedAt,
 					Country:     listBankAccountsResponse[1].Country,
 					ConnectorID: listBankAccountsResponse[1].ConnectorID.String(),
 					AccountID:   listBankAccountsResponse[1].AccountID.String(),
+					Provider:    listBankAccountsResponse[1].ConnectorID.Provider.String(),
 				},
 			}
 			expectedPaginationDetails := storage.PaginationDetails{
@@ -333,6 +335,7 @@ func TestGetBankAccount(t *testing.T) {
 				CreatedAt:     getBankAccountResponse.CreatedAt,
 				Country:       getBankAccountResponse.Country,
 				ConnectorID:   getBankAccountResponse.ConnectorID.String(),
+				Provider:      getBankAccountResponse.ConnectorID.Provider.String(),
 				AccountID:     getBankAccountResponse.AccountID.String(),
 				Iban:          "FR76*******************0188",
 				AccountNumber: "13************300",

diff --git a/components/payments/cmd/connectors/internal/api/bank_account.go b/components/payments/cmd/connectors/internal/api/bank_account.go
@@ -15,6 +15,7 @@ type bankAccountResponse struct {
 	CreatedAt     time.Time `json:"createdAt"`
 	Country       string    `json:"country"`
 	ConnectorID   string    `json:"connectorID"`
+	Provider      string    `json:"provider,omitempty"`
 	AccountID     string    `json:"accountId,omitempty"`
 	Iban          string    `json:"iban,omitempty"`
 	AccountNumber string    `json:"accountNumber,omitempty"`
@@ -50,6 +51,7 @@ func createBankAccountHandler(
 			CreatedAt:   bankAccount.CreatedAt,
 			Country:     bankAccount.Country,
 			ConnectorID: bankAccountRequest.ConnectorID,
+			Provider:    bankAccount.ConnectorID.Provider.String(),
 		}
 
 		err = json.NewEncoder(w).Encode(api.BaseResponse[bankAccountResponse]{

diff --git a/components/payments/cmd/connectors/internal/api/bank_account_test.go b/components/payments/cmd/connectors/internal/api/bank_account_test.go
@@ -212,6 +212,7 @@ func TestCreateBankAccounts(t *testing.T) {
 				Country:     createBankAccountResponse.Country,
 				ConnectorID: createBankAccountResponse.ConnectorID.String(),
 				AccountID:   createBankAccountResponse.AccountID.String(),
+				Provider:    createBankAccountResponse.ConnectorID.Provider.String(),
 			}
 
 			backend, mockService := newServiceTestingBackend(t)

diff --git a/components/payments/cmd/connectors/internal/messages/bank_account.go b/components/payments/cmd/connectors/internal/messages/bank_account.go
@@ -11,6 +11,7 @@ type bankAccountMessagePayload struct {
 	ID            string    `json:"id"`
 	CreatedAt     time.Time `json:"createdAt"`
 	ConnectorID   string    `json:"connectorId"`
+	Provider      string    `json:"provider"`
 	Name          string    `json:"name"`
 	AccountNumber string    `json:"accountNumber"`
 	IBAN          string    `json:"iban"`
@@ -26,6 +27,7 @@ func NewEventSavedBankAccounts(bankAccount *models.BankAccount) events.EventMess
 		ID:            bankAccount.ID.String(),
 		CreatedAt:     bankAccount.CreatedAt,
 		ConnectorID:   bankAccount.ConnectorID.String(),
+		Provider:      bankAccount.ConnectorID.Provider.String(),
 		Name:          bankAccount.Name,
 		AccountNumber: bankAccount.AccountNumber,
 		IBAN:          bankAccount.IBAN,

diff --git a/components/payments/openapi.yaml b/components/payments/openapi.yaml
@@ -1335,6 +1335,8 @@ components:
           type: string
         connectorID:
           type: string
+        provider:
+          type: string
         iban:
           type: string
         accountNumber:

diff --git a/components/search/benthos/streams/payments/v0.0.0/payments_ingestion.yaml b/components/search/benthos/streams/payments/v0.0.0/payments_ingestion.yaml
@@ -83,6 +83,7 @@ pipeline:
                         "id": this.payload.id,
                         "createdAt": this.payload.createdAt,
                         "connectorId": this.payload.connectorId,
+                        "provider": this.payload.provider,
                         "name": this.payload.name,
                         "accountNumber": this.payload.accountNumber,
                         "iban": this.payload.iban,