From 475e1f32946c97dfa642126b2114eaddac299cf0 Mon Sep 17 00:00:00 2001
From: Geoffrey Ragot <geoffrey.ragot@gmail.com>
Date: Mon, 29 Aug 2022 17:35:32 +0200
Subject: [PATCH] fix: payments publish

---
 pkg/bridge/ingestion/ingester.go |  2 +-
 pkg/bridge/ingestion/message.go  |  4 +---
 pkg/payment.go                   | 10 +++++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkg/bridge/ingestion/ingester.go b/pkg/bridge/ingestion/ingester.go
index 558d5aeb5..8a0a882c7 100644
--- a/pkg/bridge/ingestion/ingester.go
+++ b/pkg/bridge/ingestion/ingester.go
@@ -212,7 +212,7 @@ func (i *defaultIngester) Ingest(ctx context.Context, batch Batch, commitState a
 			for _, e := range allPayments {
 				i.publish(ctx, TopicPayments,
 					NewEventSavedPayment(
-						SavedPayment(e.Computed())))
+						e.Computed()))
 			}
 		}
 
diff --git a/pkg/bridge/ingestion/message.go b/pkg/bridge/ingestion/message.go
index bf8d52ceb..385773f3c 100644
--- a/pkg/bridge/ingestion/message.go
+++ b/pkg/bridge/ingestion/message.go
@@ -26,9 +26,7 @@ type EventMessage struct {
 	Payload json.RawMessage `json:"payload"`
 }
 
-type SavedPayment payments.ComputedPayment
-
-func NewEventSavedPayment(payment SavedPayment) EventMessage {
+func NewEventSavedPayment(payment payments.SavedPayment) EventMessage {
 	payload, err := json.Marshal(payment)
 	if err != nil {
 		panic(err)
diff --git a/pkg/payment.go b/pkg/payment.go
index e983b66f9..c26fcafd9 100644
--- a/pkg/payment.go
+++ b/pkg/payment.go
@@ -114,7 +114,7 @@ func (p Payment) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (p Payment) Computed() ComputedPayment {
+func (p Payment) Computed() SavedPayment {
 
 	aggregatedAdjustmentValue := int64(0)
 	amount := int64(0)
@@ -131,7 +131,7 @@ func (p Payment) Computed() ComputedPayment {
 		amount = p.InitialAmount + aggregatedAdjustmentValue
 	}
 
-	return ComputedPayment{
+	return SavedPayment{
 		Identifier:  p.Identifier,
 		Data:        p.Data,
 		Amount:      amount,
@@ -139,15 +139,15 @@ func (p Payment) Computed() ComputedPayment {
 	}
 }
 
-type ComputedPayment struct {
+type SavedPayment struct {
 	Identifier
 	Data
 	Amount      int64        `json:"amount"`
 	Adjustments []Adjustment `json:"adjustments"`
 }
 
-func (p ComputedPayment) MarshalJSON() ([]byte, error) {
-	type Aux ComputedPayment
+func (p SavedPayment) MarshalJSON() ([]byte, error) {
+	type Aux SavedPayment
 	return json.Marshal(struct {
 		ID string `json:"id"`
 		Aux