Added missing references to MA payment and to external payment

Author: tl-marco-tormento

README.md

@@ -83,6 +83,8 @@ let res = tl
             beneficiary: Beneficiary::MerchantAccount {
                 merchant_account_id: "some-merchant-account-id".to_string(),
                 account_holder_name: None,
+                reference: None,
+                statement_reference: None,
             },
         },
         user: User {

examples/create_payment.rs

@@ -76,6 +76,8 @@ async fn run() -> anyhow::Result<()> {
                 beneficiary: Beneficiary::MerchantAccount {
                     merchant_account_id: merchant_account.id,
                     account_holder_name: None,
+                    reference: None,
+                    statement_reference: None,
                 },
             },
             user: CreatePaymentUserRequest::NewUser {

src/apis/merchant_accounts/api.rs

@@ -263,7 +263,7 @@ mod tests {
                 SweepingFrequency, TransactionPayinStatus, TransactionPayoutContextCode,
                 TransactionPayoutStatus, TransactionType,
             },
-            payments::{AccountIdentifier, Currency, Remitter},
+            payments::{AccountIdentifier, Currency, ExternalPaymentRemitter},
             payouts::PayoutBeneficiary,
         },
         authenticator::Authenticator,
@@ -745,7 +745,8 @@ mod tests {
                                 "sort_code": "sort-code",
                                 "account_number": "account-number"
                             },
-                            "account_holder_name": "Mr. Holder"
+                            "account_holder_name": "Mr. Holder",
+                            "reference": "ext-payment-ref"
                         }
                     },
                     {
@@ -832,12 +833,13 @@ mod tests {
                     r#type: TransactionType::ExternalPayment {
                         status: TransactionPayinStatus::Settled,
                         settled_at: now,
-                        remitter: Remitter {
+                        remitter: ExternalPaymentRemitter {
                             account_holder_name: Some("Mr. Holder".into()),
                             account_identifier: Some(AccountIdentifier::SortCodeAccountNumber {
                                 sort_code: "sort-code".to_string(),
                                 account_number: "account-number".to_string()
-                            })
+                            }),
+                            reference: Some("ext-payment-ref".to_string())
                         }
                     }
                 },

src/apis/merchant_accounts/model.rs

@@ -1,5 +1,5 @@
 use crate::apis::{
-    payments::{AccountIdentifier, Currency, PaymentSource, Remitter},
+    payments::{AccountIdentifier, Currency, ExternalPaymentRemitter, PaymentSource},
     payouts::PayoutBeneficiary,
 };
 use chrono::{DateTime, SecondsFormat, Utc};
@@ -80,7 +80,7 @@ pub enum TransactionType {
     ExternalPayment {
         status: TransactionPayinStatus,
         settled_at: DateTime<Utc>,
-        remitter: Remitter,
+        remitter: ExternalPaymentRemitter,
     },
     Payout {
         #[serde(flatten)]

src/apis/payments/api.rs

@@ -476,7 +476,7 @@ mod tests {
                     },
                     "beneficiary": {
                         "type": "merchant_account",
-                        "merchant_account_id": "merchant-account-id"
+                        "merchant_account_id": "merchant-account-id",
                     },
                 },
                 "user": {
@@ -509,6 +509,8 @@ mod tests {
                     beneficiary: Beneficiary::MerchantAccount {
                         merchant_account_id: "merchant-account-id".to_string(),
                         account_holder_name: None,
+                        reference: None,
+                        statement_reference: None,
                     },
                 },
                 user: CreatePaymentUserRequest::ExistingUser {
@@ -897,7 +899,9 @@ mod tests {
                 },
                 beneficiary: Beneficiary::MerchantAccount {
                     merchant_account_id: "merchant-account-id".to_string(),
-                    account_holder_name: None
+                    account_holder_name: None,
+                    reference: None,
+                    statement_reference: None
                 }
             }
         );

src/apis/payments/model.rs

@@ -251,6 +251,8 @@ pub enum Beneficiary {
     MerchantAccount {
         merchant_account_id: String,
         account_holder_name: Option<String>,
+        reference: Option<String>,
+        statement_reference: Option<String>,
     },
     ExternalAccount {
         account_holder_name: String,
@@ -311,6 +313,13 @@ pub struct Remitter {
     pub account_identifier: Option<AccountIdentifier>,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
+pub struct ExternalPaymentRemitter {
+    pub account_holder_name: Option<String>,
+    pub account_identifier: Option<AccountIdentifier>,
+    pub reference: Option<String>,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
 pub struct ProviderFilter {
     pub countries: Option<Vec<CountryCode>>,

src/lib.rs

@@ -64,6 +64,8 @@
 //!             beneficiary: Beneficiary::MerchantAccount {
 //!                 merchant_account_id: "some-merchant-account-id".to_string(),
 //!                 account_holder_name: None,
+//!                 reference: None,
+//!                 statement_reference: None,
 //!             },
 //!         },
 //!         user: CreatePaymentUserRequest::NewUser {

tests/integration_tests/helpers.rs

@@ -34,6 +34,8 @@ pub async fn create_closed_loop_payment(
                 beneficiary: Beneficiary::MerchantAccount {
                     merchant_account_id: ctx.merchant_account_gbp_id.clone(),
                     account_holder_name: None,
+                    reference: None,
+                    statement_reference: None,
                 },
             },
             user: CreatePaymentUserRequest::NewUser {

tests/integration_tests/payments.rs

@@ -61,6 +61,8 @@ async fn hpp_link_returns_200() {
                 beneficiary: Beneficiary::MerchantAccount {
                     merchant_account_id: ctx.merchant_account_gbp_id.clone(),
                     account_holder_name: None,
+                    reference: None,
+                    statement_reference: None,
                 },
             },
             user: CreatePaymentUserRequest::NewUser {
@@ -193,6 +195,8 @@ impl CreatePaymentScenario {
                     ScenarioBeneficiary::ClosedLoop => Beneficiary::MerchantAccount {
                         merchant_account_id: ctx.merchant_account_gbp_id.clone(),
                         account_holder_name: None,
+                        reference: Some("Reference".to_string()),
+                        statement_reference: Some("StReference".to_string()),
                     },
                     ScenarioBeneficiary::OpenLoop {
                         ref account_identifier,