fix(payments): fix missing metadata in postgres (#1309)

components/payments/cmd/connectors/internal/ingestion/payments.go

@@ -14,7 +14,6 @@ import (
 type PaymentBatchElement struct {
 	Payment    *models.Payment
 	Adjustment *models.PaymentAdjustment
-	Metadata   []*models.PaymentMetadata
 }
 
 type PaymentBatch []PaymentBatchElement
@@ -42,11 +41,12 @@ func (i *DefaultIngester) IngestPayments(
 
 	for batchIdx := range batch {
 		payment := batch[batchIdx].Payment
-		metadata := batch[batchIdx].Metadata
 		adjustment := batch[batchIdx].Adjustment
 
-		if metadata != nil {
-			for _, data := range metadata {
+		if payment != nil {
+			allPayments = append(allPayments, payment)
+
+			for _, data := range payment.Metadata {
 				data.Changelog = append(data.Changelog,
 					models.MetadataChangelog{
 						CreatedAt: time.Now(),
@@ -57,10 +57,6 @@ func (i *DefaultIngester) IngestPayments(
 			}
 		}
 
-		if payment != nil {
-			allPayments = append(allPayments, payment)
-		}
-
 		if adjustment != nil && adjustment.Reference != "" {
 			allAdjustments = append(allAdjustments, adjustment)
 		}

components/payments/cmd/connectors/internal/storage/payments.go

@@ -125,7 +125,7 @@ func (s *Storage) UpsertPaymentsMetadata(ctx context.Context, metadata []*models
 		Model(&metadata).
 		On("CONFLICT (payment_id, key) DO UPDATE").
 		Set("value = EXCLUDED.value").
-		Set("changelog = metadata.changelog || EXCLUDED.changelog").
+		Set("changelog = payment_metadata.changelog || EXCLUDED.changelog").
 		Exec(ctx)
 	if err != nil {
 		return e("failed to create metadata", err)

components/payments/internal/models/payment.go

@@ -109,8 +109,8 @@ type Payment struct {
 	DestinationAccountID *AccountID `bun:",type:character varying,nullzero"`
 
 	// Read only fields
-	Adjustments []*PaymentAdjustment `bun:"rel:has-many,join:id=payment_id"`
 	Metadata    []*PaymentMetadata   `bun:"rel:has-many,join:id=payment_id"`
+	Adjustments []*PaymentAdjustment `bun:"rel:has-many,join:id=payment_id"`
 	Connector   *Connector           `bun:"rel:has-one,join:connector_id=id"`
 }