fix after review

components/payments/internal/storage/balances_test.go

@@ -94,7 +94,7 @@ func TestBalancesUpsert(t *testing.T) {
 			{
 				AccountID:     defaultAccounts[2].ID,
 				CreatedAt:     now.Add(-59 * time.Minute).UTC().Time,
-				LastUpdatedAt: now.Add(-20 * time.Minute).UTC().Time,
+				LastUpdatedAt: now.Add(-20 * time.Minute).UTC().Time, // Last updated at should be updated to the new balance value
 				Asset:         "USD/2",
 				Balance:       big.NewInt(100),
 			},
@@ -125,13 +125,15 @@ func TestBalancesUpsert(t *testing.T) {
 		)
 
 		expectedBalances := []models.Balance{
+			// We should have one more balance with the new balance value
 			{
 				AccountID:     defaultAccounts[0].ID,
 				CreatedAt:     now.Add(-20 * time.Minute).UTC().Time,
 				LastUpdatedAt: now.Add(-20 * time.Minute).UTC().Time,
 				Asset:         "USD/2",
 				Balance:       big.NewInt(200),
 			},
+			// and the old balance should have its updated at to the new balance created at
 			{
 				AccountID:     defaultAccounts[0].ID,
 				CreatedAt:     now.Add(-60 * time.Minute).UTC().Time,

components/payments/internal/storage/bank_accounts.go

@@ -47,18 +47,22 @@ func (s *store) BankAccountsUpsert(ctx context.Context, ba models.BankAccount) e
 
 	toInsert := fromBankAccountModels(ba)
 	// Insert or update the bank account
-	var idsUpdated []uuid.UUID
-	err = tx.NewInsert().
+	res, err := tx.NewInsert().
 		Model(&toInsert).
 		Column("id", "created_at", "name", "country", "metadata").
 		On("CONFLICT (id) DO NOTHING").
 		Returning("id").
-		Scan(ctx, &idsUpdated)
+		Exec(ctx)
+	if err != nil {
+		return e("insert bank account", err)
+	}
+
+	rowsAffected, err := res.RowsAffected()
 	if err != nil {
 		return e("insert bank account", err)
 	}
 
-	if len(idsUpdated) > 0 {
+	if rowsAffected > 0 {
 		_, err = tx.NewUpdate().
 			Model((*bankAccount)(nil)).
 			Set("account_number = pgp_sym_encrypt(?::TEXT, ?, ?)", toInsert.AccountNumber, s.configEncryptionKey, encryptionOptions).

components/payments/internal/storage/payments_test.go

@@ -229,13 +229,8 @@ func TestPaymentsUpsert(t *testing.T) {
 		p := models.Payment{
 			ID:            pID1,
 			ConnectorID:   defaultConnector.ID,
-			Reference:     "test1",
-			CreatedAt:     now.Add(-20 * time.Minute).UTC().Time,
-			Type:          models.PAYMENT_TYPE_TRANSFER,
-			InitialAmount: big.NewInt(100),
-			Amount:        big.NewInt(100),
-			Asset:         "USD/2",
-			Scheme:        models.PAYMENT_SCHEME_OTHER,
+			InitialAmount: big.NewInt(0),
+			Amount:        big.NewInt(0),
 			Adjustments: []models.PaymentAdjustment{
 				{
 					ID: models.PaymentAdjustmentID{