Merge pull request #621 from nofrixion/MOOV-4725-payment-request-model-improvements

Payment request model improvements.

Author: sauravmaiti22

src/NoFrixion.MoneyMoov/Extensions/PaymentRequestEventExtensions.cs

@@ -368,4 +368,43 @@ private static List<PaymentRequestEvent> GetAllCardSaleEvents(
             .Where(x => x.EventType == PaymentRequestEventTypesEnum.card_sale)
             .ToList() : new List<PaymentRequestEvent>();
     }
+
+    private static bool IsPispRelatedEvent(this PaymentRequestEvent paymentRequestEvent)
+    {
+        return
+            paymentRequestEvent.EventType == PaymentRequestEventTypesEnum.pisp_initiate ||
+            paymentRequestEvent.EventType == PaymentRequestEventTypesEnum.pisp_callback ||
+            paymentRequestEvent.EventType == PaymentRequestEventTypesEnum.pisp_webhook ||
+            paymentRequestEvent.EventType == PaymentRequestEventTypesEnum.pisp_settle ||
+            paymentRequestEvent.EventType == PaymentRequestEventTypesEnum.pisp_settle_failure ||
+            paymentRequestEvent.EventType == PaymentRequestEventTypesEnum.pisp_refund_initiated ||
+            paymentRequestEvent.EventType == PaymentRequestEventTypesEnum.pisp_refund_settled;
+    }
+
+    private static bool IsDirectDebitRelatedEvent(this PaymentRequestEvent paymentRequestEvent)
+    {
+        return paymentRequestEvent.EventType == PaymentRequestEventTypesEnum.direct_debit_create ||
+               paymentRequestEvent.EventType == PaymentRequestEventTypesEnum.direct_debit_failed ||
+               paymentRequestEvent.EventType == PaymentRequestEventTypesEnum.direct_debit_paid;
+    }
+
+    public static PaymentMethodTypeEnum GetPaymentMethodType(this PaymentRequestEvent paymentRequestEvent)
+    {
+        if (paymentRequestEvent.IsCardRelatedEvent())
+        {
+            return PaymentMethodTypeEnum.card;
+        }
+
+        if (paymentRequestEvent.IsPispRelatedEvent())
+        {
+            return PaymentMethodTypeEnum.pisp;
+        }
+
+        if (paymentRequestEvent.IsDirectDebitRelatedEvent())
+        {
+            return PaymentMethodTypeEnum.directDebit;
+        }
+
+        return PaymentMethodTypeEnum.None;
+    }
 }

src/NoFrixion.MoneyMoov/Extensions/PaymentRequestExtensions.cs

@@ -35,6 +35,9 @@ public static List<PaymentRequestPaymentAttempt> GetPaymentAttempts(this IEnumer
             paymentAttempts.AddRange(GetPispPaymentAttempts(events));
             paymentAttempts.AddRange(GetLightningPaymentAttempts(events));
             paymentAttempts.AddRange(GetDirectDebitPaymentAttempts(events));
+            
+            paymentAttempts.Sort(
+                (x, y) => y.InitiatedAt.CompareTo(x.InitiatedAt));
 
             return paymentAttempts;
         }

src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestEvent.cs

@@ -18,6 +18,7 @@
 //-----------------------------------------------------------------------------
 
 using System.ComponentModel.DataAnnotations;
+using NoFrixion.MoneyMoov.Extensions;
 
 namespace NoFrixion.MoneyMoov.Models;
 
@@ -211,4 +212,9 @@ public decimal DisplayAmount()
             _ => Math.Round(Amount, PaymentsConstants.FIAT_ROUNDING_DECIMAL_PLACES)
         };
     }
+
+    /// <summary>
+    /// The type of payment method the event relates to, e.g. card, pisp, etc.
+    /// </summary>
+    public PaymentMethodTypeEnum PaymentMethodType => this.GetPaymentMethodType();
 }

test/MoneyMoov.UnitTests/Extensions/PaymentRequestExtensionsTests.cs

@@ -0,0 +1,77 @@
+// -----------------------------------------------------------------------------
+//  Filename: PaymentRequestExtensionsTests.cs
+// 
+//  Description: Unit tests for the PaymentRequestExtensions.
+//  Author(s):
+//  Saurav Maiti ([email protected])
+// 
+//  History:
+//  29 Jul 2025  Saurav Maiti   Created, Hamilton gardens, Dublin, Ireland.
+// 
+//  License:
+//  MIT.
+// -----------------------------------------------------------------------------
+
+using NoFrixion.MoneyMoov.Extensions;
+using NoFrixion.MoneyMoov.Models;
+using Xunit;
+
+namespace NoFrixion.MoneyMoov.UnitTests.Extensions;
+
+public class PaymentRequestExtensionsTests
+{
+    [Fact]
+    public void PaymentRequestExtensions_GetPaymentAttempts_ReturnsDescendingByInitiatedAt()
+    {
+        // Arrange
+        var paymentRequestEvents = new List<PaymentRequestEvent>()
+        {
+            new PaymentRequestEvent
+            {
+                ID = Guid.NewGuid(),
+                PaymentRequestID = Guid.NewGuid(),
+                Amount = 100,
+                Currency = CurrencyTypeEnum.EUR,
+                Inserted = DateTime.UtcNow,
+                EventType = PaymentRequestEventTypesEnum.pisp_initiate,
+                Status = PaymentRequestResult.PISP_YAPILY_PENDING_STATUS,
+                PispPaymentInitiationID = "initiation1",
+                PispPaymentServiceProviderID = "bankofireland"
+            },
+            new PaymentRequestEvent
+            {
+                ID = Guid.NewGuid(),
+                PaymentRequestID = Guid.NewGuid(),
+                Amount = 100,
+                Currency = CurrencyTypeEnum.EUR,
+                Inserted = DateTime.UtcNow.AddMinutes(-5),
+                EventType = PaymentRequestEventTypesEnum.pisp_initiate,
+                Status = PaymentRequestResult.PISP_YAPILY_PENDING_STATUS,
+                PispPaymentInitiationID = "initiation2",
+                PispPaymentServiceProviderID = "bankofireland"
+            },
+            new PaymentRequestEvent
+            {
+                ID = Guid.NewGuid(),
+                PaymentRequestID = Guid.NewGuid(),
+                Amount = 100,
+                Currency = CurrencyTypeEnum.EUR,
+                Inserted = DateTime.UtcNow.AddMinutes(-10),
+                EventType = PaymentRequestEventTypesEnum.pisp_initiate,
+                Status = PaymentRequestResult.PISP_YAPILY_PENDING_STATUS,
+                PispPaymentInitiationID = "initiation3",
+                PispPaymentServiceProviderID = "bankofireland"
+            }
+        };
+
+        // Act
+        var result = paymentRequestEvents.GetPaymentAttempts();
+
+        // Assert
+        Assert.NotNull(result);
+        Assert.Equal(3, result.Count);
+        Assert.Equal("initiation1", result[0].AttemptKey);
+        Assert.Equal("initiation2", result[1].AttemptKey);
+        Assert.Equal("initiation3", result[2].AttemptKey);
+    }
+}