fix(payments): missing connectorID in transfer response (#1018)

formancehq · Dec 15, 2023 · ae27932 · ae27932 · vercel · Dec 15, 2023
1 parent 69b93cc
commit ae27932
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/components/payments/cmd/api/internal/api/transfer_initiation.go b/components/payments/cmd/api/internal/api/transfer_initiation.go
@@ -20,6 +20,7 @@ type transferInitiationResponse struct {
 	Description          string    `json:"description"`
 	SourceAccountID      string    `json:"sourceAccountID"`
 	DestinationAccountID string    `json:"destinationAccountID"`
+	ConnectorID          string    `json:"connectorID"`
 	Provider             string    `json:"provider"`
 	Type                 string    `json:"type"`
 	Amount               *big.Int  `json:"amount"`
@@ -65,6 +66,7 @@ func readTransferInitiationHandler(b backend.Backend) http.HandlerFunc {
 				Description:          ret.Description,
 				SourceAccountID:      ret.SourceAccountID.String(),
 				DestinationAccountID: ret.DestinationAccountID.String(),
+				ConnectorID:          ret.ConnectorID.String(),
 				Provider:             ret.Provider.String(),
 				Type:                 ret.Type.String(),
 				Amount:               ret.Amount,
@@ -120,6 +122,7 @@ func listTransferInitiationsHandler(b backend.Backend) http.HandlerFunc {
 				SourceAccountID:      ret[i].SourceAccountID.String(),
 				DestinationAccountID: ret[i].DestinationAccountID.String(),
 				Provider:             ret[i].Provider.String(),
+				ConnectorID:          ret[i].ConnectorID.String(),
 				Type:                 ret[i].Type.String(),
 				Amount:               ret[i].Amount,
 				Asset:                ret[i].Asset.String(),

diff --git a/components/payments/cmd/api/internal/api/transfer_initiation_test.go b/components/payments/cmd/api/internal/api/transfer_initiation_test.go
@@ -237,6 +237,7 @@ func TestListTransferInitiations(t *testing.T) {
 					Amount:               listTFsResponse[0].Amount,
 					Asset:                listTFsResponse[0].Asset.String(),
 					Status:               listTFsResponse[0].Status.String(),
+					ConnectorID:          listTFsResponse[0].ConnectorID.String(),
 					Error:                listTFsResponse[0].Error,
 				},
 				{
@@ -251,6 +252,7 @@ func TestListTransferInitiations(t *testing.T) {
 					Type:                 listTFsResponse[1].Type.String(),
 					Amount:               listTFsResponse[1].Amount,
 					Asset:                listTFsResponse[1].Asset.String(),
+					ConnectorID:          listTFsResponse[1].ConnectorID.String(),
 					Status:               listTFsResponse[1].Status.String(),
 					Error:                listTFsResponse[1].Error,
 				},
@@ -445,6 +447,7 @@ func TestGetTransferInitiation(t *testing.T) {
 						Provider:             getTransferInitiationResponse.Provider.String(),
 						Type:                 getTransferInitiationResponse.Type.String(),
 						Amount:               getTransferInitiationResponse.Amount,
+						ConnectorID:          getTransferInitiationResponse.ConnectorID.String(),
 						Asset:                getTransferInitiationResponse.Asset.String(),
 						Status:               getTransferInitiationResponse.Status.String(),
 						Error:                getTransferInitiationResponse.Error,
@@ -497,6 +500,7 @@ func TestGetTransferInitiation(t *testing.T) {
 						Provider:             getTransferInitiationResponse.Provider.String(),
 						Type:                 getTransferInitiationResponse.Type.String(),
 						Amount:               getTransferInitiationResponse.Amount,
+						ConnectorID:          getTransferInitiationResponse.ConnectorID.String(),
 						Asset:                getTransferInitiationResponse.Asset.String(),
 						Status:               getTransferInitiationResponse.Status.String(),
 						Error:                getTransferInitiationResponse.Error,

diff --git a/components/payments/cmd/api/internal/storage/transfer_initiation.go b/components/payments/cmd/api/internal/storage/transfer_initiation.go
@@ -33,7 +33,7 @@ func (s *Storage) GetTransferInitiation(ctx context.Context, id models.TransferI
 	var transferInitiation models.TransferInitiation
 
 	query := s.db.NewSelect().
-		Column("id", "created_at", "scheduled_at", "updated_at", "description", "type", "source_account_id", "destination_account_id", "provider", "amount", "asset", "status", "error").
+		Column("id", "connector_id", "created_at", "scheduled_at", "updated_at", "description", "type", "source_account_id", "destination_account_id", "provider", "amount", "asset", "status", "error").
 		Model(&transferInitiation).
 		Where("id = ?", id)
 
@@ -71,7 +71,7 @@ func (s *Storage) ListTransferInitiations(ctx context.Context, pagination Pagina
 	var tfs []*models.TransferInitiation
 
 	query := s.db.NewSelect().
-		Column("id", "created_at", "scheduled_at", "updated_at", "description", "type", "source_account_id", "destination_account_id", "provider", "amount", "asset", "status", "error").
+		Column("id", "connector_id", "created_at", "scheduled_at", "updated_at", "description", "type", "source_account_id", "destination_account_id", "provider", "amount", "asset", "status", "error").
 		Model(&tfs)
 
 	if pagination.queryBuilder != nil {
@@ -113,7 +113,7 @@ func (s *Storage) ListTransferInitiations(ctx context.Context, pagination Pagina
 		lastReference = tfs[len(tfs)-1].CreatedAt.Format(time.RFC3339Nano)
 
 		query = s.db.NewSelect().
-			Column("id", "created_at", "updated_at", "description", "type", "source_account_id", "destination_account_id", "provider", "amount", "asset", "status", "error").
+			Column("id", "connector_id", "created_at", "updated_at", "description", "type", "source_account_id", "destination_account_id", "provider", "amount", "asset", "status", "error").
 			Model(&tfs)
 
 		hasPrevious, err = pagination.hasPrevious(ctx, query, "transfer_initiation.created_at", firstReference)