removed legacy from bff

api/server/interface/api/sresponse/payment.go

@@ -41,26 +41,26 @@ type FxQuote struct {
 }
 
 type PaymentQuote struct {
-	QuoteRef                 string              `json:"quoteRef,omitempty"`
-	DebitAmount              *paymenttypes.Money `json:"debitAmount,omitempty"`
-	DebitSettlementAmount    *paymenttypes.Money `json:"debitSettlementAmount,omitempty"`
-	ExpectedSettlementAmount *paymenttypes.Money `json:"expectedSettlementAmount,omitempty"`
-	ExpectedFeeTotal         *paymenttypes.Money `json:"expectedFeeTotal,omitempty"`
-	FeeLines                 []FeeLine           `json:"feeLines,omitempty"`
-	FxQuote                  *FxQuote            `json:"fxQuote,omitempty"`
+	QuoteRef string        `json:"quoteRef,omitempty"`
+	Amounts  *QuoteAmounts `json:"amounts,omitempty"`
+	Fees     *QuoteFees    `json:"fees,omitempty"`
+	FxQuote  *FxQuote      `json:"fxQuote,omitempty"`
 }
 
-type PaymentQuoteAggregate struct {
-	DebitAmounts              []*paymenttypes.Money `json:"debitAmounts,omitempty"`
-	ExpectedSettlementAmounts []*paymenttypes.Money `json:"expectedSettlementAmounts,omitempty"`
-	ExpectedFeeTotals         []*paymenttypes.Money `json:"expectedFeeTotals,omitempty"`
+type QuoteAmounts struct {
+	SourcePrincipal       *paymenttypes.Money `json:"sourcePrincipal,omitempty"`
+	SourceDebitTotal      *paymenttypes.Money `json:"sourceDebitTotal,omitempty"`
+	DestinationSettlement *paymenttypes.Money `json:"destinationSettlement,omitempty"`
+}
+
+type QuoteFees struct {
+	Lines []FeeLine `json:"lines,omitempty"`
 }
 
 type PaymentQuotes struct {
-	IdempotencyKey string                 `json:"idempotencyKey"`
-	QuoteRef       string                 `json:"quoteRef,omitempty"`
-	Aggregate      *PaymentQuoteAggregate `json:"aggregate,omitempty"`
-	Quotes         []PaymentQuote         `json:"quotes,omitempty"`
+	IdempotencyKey string         `json:"idempotencyKey,omitempty"`
+	QuoteRef       string         `json:"quoteRef,omitempty"`
+	Items          []PaymentQuote `json:"items,omitempty"`
 }
 
 type Payment struct {
@@ -196,12 +196,13 @@ func toPaymentQuote(q *quotationv2.PaymentQuote) *PaymentQuote {
 	if q == nil {
 		return nil
 	}
+	amounts := toQuoteAmounts(q)
+	fees := toQuoteFees(q.GetFeeLines())
 	return &PaymentQuote{
-		QuoteRef:                 q.GetQuoteRef(),
-		DebitAmount:              toMoney(q.GetPayerTotalDebitAmount()),
-		ExpectedSettlementAmount: toMoney(q.GetDestinationAmount()),
-		FeeLines:                 toFeeLines(q.GetFeeLines()),
-		FxQuote:                  toFxQuote(q.GetFxQuote()),
+		QuoteRef: q.GetQuoteRef(),
+		Amounts:  amounts,
+		Fees:     fees,
+		FxQuote:  toFxQuote(q.GetFxQuote()),
 	}
 }
 
@@ -209,22 +210,45 @@ func toPaymentQuotes(resp *quotationv2.QuotePaymentsResponse) *PaymentQuotes {
 	if resp == nil {
 		return nil
 	}
-	quotes := make([]PaymentQuote, 0, len(resp.GetQuotes()))
+	items := make([]PaymentQuote, 0, len(resp.GetQuotes()))
 	for _, quote := range resp.GetQuotes() {
 		if dto := toPaymentQuote(quote); dto != nil {
-			quotes = append(quotes, *dto)
+			items = append(items, *dto)
 		}
 	}
-	if len(quotes) == 0 {
-		quotes = nil
+	if len(items) == 0 {
+		items = nil
 	}
 	return &PaymentQuotes{
 		IdempotencyKey: resp.GetIdempotencyKey(),
 		QuoteRef:       resp.GetQuoteRef(),
-		Quotes:         quotes,
+		Items:          items,
 	}
 }
 
+func toQuoteAmounts(q *quotationv2.PaymentQuote) *QuoteAmounts {
+	if q == nil {
+		return nil
+	}
+	amounts := &QuoteAmounts{
+		SourcePrincipal:       toMoney(q.GetTransferPrincipalAmount()),
+		SourceDebitTotal:      toMoney(q.GetPayerTotalDebitAmount()),
+		DestinationSettlement: toMoney(q.GetDestinationAmount()),
+	}
+	if amounts.SourcePrincipal == nil && amounts.SourceDebitTotal == nil && amounts.DestinationSettlement == nil {
+		return nil
+	}
+	return amounts
+}
+
+func toQuoteFees(lines []*feesv1.DerivedPostingLine) *QuoteFees {
+	feeLines := toFeeLines(lines)
+	if len(feeLines) == 0 {
+		return nil
+	}
+	return &QuoteFees{Lines: feeLines}
+}
+
 func toPayments(items []*orchestrationv2.Payment) []Payment {
 	if len(items) == 0 {
 		return nil