Add DD mandate ID to payreq evt model. Fix bug where jsonproperty was…

… being used instead of jsonignore. (#436)
nofrixion · Oct 16, 2024 · f2a6336 · f2a6336
1 parent 95a0639
commit f2a6336
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 21 deletions.
diff --git a/src/NoFrixion.MoneyMoov/Models/Mandates/Mandate.cs b/src/NoFrixion.MoneyMoov/Models/Mandates/Mandate.cs
@@ -119,7 +119,7 @@ public class Mandate
     /// used to do a balance check on the payer's account. We don't currenlty support the AIS workflow.
     /// </summary>
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public decimal Amount { get; set; }
 
     /// <summary>

diff --git a/src/NoFrixion.MoneyMoov/Models/Mandates/MandateCreate.cs b/src/NoFrixion.MoneyMoov/Models/Mandates/MandateCreate.cs
@@ -127,8 +127,8 @@ public class MandateCreate
     /// This is an optional field that with mandates created via Account Information Services can be
     /// used to do a balance check on the payer's account. We don't currenlty support the AIS workflow.
     /// </summary>
-    [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [System.Text.Json.Serialization.JsonIgnore]
+    [Newtonsoft.Json.JsonIgnore]
     public decimal Amount { get; set; }
 
     /// <summary>

diff --git a/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequest.cs b/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequest.cs
@@ -236,7 +236,7 @@ public PaymentMethodTypeEnum PaymentMethodTypes
     public string? CardStripePaymentIntentSecret { get; set; }
 
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public Merchant? Merchant { get; set; }
 
     public List<PaymentRequestAddress> Addresses { get; set; } = new List<PaymentRequestAddress>();
@@ -287,7 +287,7 @@ public PaymentMethodTypeEnum PaymentMethodTypes
     /// </summary>
     /// <returns>The billing address or null if it's not set.</returns>
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public PaymentRequestAddress? BillingAddress =>
         Addresses?.Where(x => x.AddressType == AddressTypesEnum.Billing).FirstOrDefault();
 

diff --git a/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestCreate.cs b/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestCreate.cs
@@ -308,15 +308,15 @@ public string? OriginUrl
     public string? CustomerEmailAddress { get; set; }
 
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public PaymentProcessorsEnum PaymentProcessor { get; set; }
 
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public string? LightningInvoice { get; set; }
 
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public DateTimeOffset? LightningInvoiceExpiresAt { get; set; }
 
     [EmailAddressMultiple(ErrorMessage = PaymentRequestConstants.NOTIFICATION_EMAIL_ADDRESSES_ERROR_MESSAGE)]

diff --git a/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestEvent.cs b/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestEvent.cs
@@ -17,7 +17,6 @@
 // MIT.
 //-----------------------------------------------------------------------------
 
-using System.Text.Json.Serialization;
 using System.ComponentModel.DataAnnotations;
 
 namespace NoFrixion.MoneyMoov.Models;
@@ -44,11 +43,11 @@ public class PaymentRequestEvent
     public string? ErrorMessage { get; set; }
 
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public string? RawResponse { get; set; }
 
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public string? RawResponseHash { get; set; }
 
     public string? CardRequestID { get; set; }
@@ -101,7 +100,7 @@ public class PaymentRequestEvent
     /// between submitting and finalising a payment initiation attempt.
     /// </summary>
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public string? PispToken { get; set; }
 
     /// <summary>
@@ -139,7 +138,7 @@ public class PaymentRequestEvent
     /// of the tokenised card record that can be used with the pay with card token method.
     /// </summary>
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public Guid? TokenisedCardID { get; set; }
 
     /// <summary>
@@ -164,6 +163,11 @@ public class PaymentRequestEvent
     /// </summary>
     public string? DirectDebitPaymentReference { get; set; }
 
+    /// <summary>
+    /// The ID of the mandate that was used wehn requesting payment.
+    /// </summary>
+    public Guid? DrirectDebitMandateID { get; set; }
+
     /// <summary>
     /// Gets the amount to display with the correct number of decimal places based on the currency type. 
     /// </summary>

diff --git a/src/NoFrixion.MoneyMoov/Models/Payouts/Payout.cs b/src/NoFrixion.MoneyMoov/Models/Payouts/Payout.cs
@@ -102,7 +102,7 @@ public class Payout : IValidatableObject, IWebhookPayload
 
     [Obsolete("Please use Destination.")]
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public Guid? DestinationAccountID
     {
         get => Destination?.AccountID;
@@ -115,7 +115,7 @@ public Guid? DestinationAccountID
 
     [Obsolete("Please use Destination.")]
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public string? DestinationIBAN
     {
         get => Destination?.Identifier?.IBAN;
@@ -129,7 +129,7 @@ public string? DestinationIBAN
 
     [Obsolete("Please use Destination.")]
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public string? DestinationAccountNumber
     {
         get => Destination?.Identifier?.AccountNumber;
@@ -143,7 +143,7 @@ public string? DestinationAccountNumber
 
     [Obsolete("Please use Destination.")]
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public string? DestinationSortCode
     {
         get => Destination?.Identifier?.SortCode;
@@ -157,7 +157,7 @@ public string? DestinationSortCode
 
     [Obsolete("Please use Destination.")]
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public string? DestinationAccountName
     {
         get => Destination?.Name;
@@ -265,7 +265,7 @@ public AccountIdentifier? SourceAccountIdentifier
 
     [Obsolete("Please use Destination.")]
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     public Counterparty? DestinationAccount
     {
         get => Destination;

diff --git a/src/NoFrixion.MoneyMoov/NoFrixionProblem.cs b/src/NoFrixion.MoneyMoov/NoFrixionProblem.cs
@@ -212,12 +212,12 @@ public static NoFrixionProblem Empty
     /// unknown, on non-JSON, format.
     /// </summary>
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     [IgnoreDataMember]
     public string RawError { get; set; } = string.Empty;
 
     [System.Text.Json.Serialization.JsonIgnore]
-    [Newtonsoft.Json.JsonProperty]
+    [Newtonsoft.Json.JsonIgnore]
     [IgnoreDataMember]
     public bool IsEmpty => _isEmpty;