Merge branch 'release/biz-0.1.82'

Author: sipsorcery

src/NoFrixion.MoneyMoov/ApiClients/MerchantClient.cs

@@ -56,6 +56,12 @@ public interface IMerchantClient
     Task<RestApiResponse<Merchant>> GetMerchantAsync(string userAccessToken, Guid merchantID);
 
     Task<RestApiResponse<Merchant>> UpdateMerchantAsync(string userAccessToken, Guid merchantID, MerchantUpdate merchantUpdate);
+
+    Task<RestApiResponse<MerchantPageResponse>> GetChildMerchantsAsync(string userAccessToken, Guid parentMerchantID,
+        int pageNumber = 1,
+        int pageSize = 20,
+        string? search = null,
+        string? sort = null);
 }
 
 public class MerchantClient : IMerchantClient
@@ -365,4 +371,36 @@ public Task<RestApiResponse<Merchant>> UpdateMerchantAsync(string userAccessToke
             _ => Task.FromResult(new RestApiResponse<Merchant>(HttpStatusCode.PreconditionFailed, new Uri(url), prob))
         };
     }
+
+    /// <summary>
+    /// Calls the MoneyMoov Merchant get child merchants endpoint to get a paged list of child merchants.
+    /// </summary>
+    /// <param name="userAccessToken">A user-scoped JWT access token.</param>
+    /// <param name="parentMerchantID">The unique identifier of the parent merchant.</param>
+    /// <param name="pageNumber">The page number of the result set to retrieve.</param>
+    /// <param name="pageSize">The number of records to return per page.</param>
+    /// <param name="search">A search filter to apply to the child merchant list. Typically searches against merchant name or ID.</param>
+    /// <param name="sort">The sort expression for the result set, e.g., "Name asc".</param>
+    /// <returns>A paged response containing a list of child merchants if successful.</returns>
+    public Task<RestApiResponse<MerchantPageResponse>> GetChildMerchantsAsync(string userAccessToken, Guid parentMerchantID,
+        int pageNumber = 1,
+        int pageSize = 20,
+        string? search = null,
+        string? sort = null)
+    {
+        var url = MoneyMoovUrlBuilder.MerchantsApi.ChildMerchantsUrl(_apiClient.GetBaseUri().ToString(),
+            parentMerchantID,
+            pageNumber,
+            pageSize,
+            search,
+            sort);
+
+        var prob = _apiClient.CheckAccessToken(userAccessToken, nameof(GetMerchantTokenAsync));
+
+        return prob switch
+        {
+            var p when p.IsEmpty => _apiClient.GetAsync<MerchantPageResponse>(url, userAccessToken),
+            _ => Task.FromResult(new RestApiResponse<MerchantPageResponse>(HttpStatusCode.PreconditionFailed, new Uri(url), prob))
+        };
+    }
 }

src/NoFrixion.MoneyMoov/ApiClients/UserInviteClient.cs

@@ -26,6 +26,8 @@ public interface IUserInviteClient
 
     Task<RestApiResponse<UserInvite>> GetUserInviteAsync(string accessToken, Guid userInviteID);
 
+    Task<RestApiResponse<UserInvite>> GetUserInviteDetailsAsync(string accessToken, Guid userInviteID);
+
     Task<RestApiResponse<UserInvite>> SendInviteAsync(string userAccessToken, Guid merchantID,
         string inviteeEmailAddress,
         string inviteRegistrationUrl,
@@ -39,6 +41,8 @@ Task<RestApiResponse<UserInvite>> SendInviteAsync(string userAccessToken, Guid m
     Task<RestApiResponse> ResendUserInviteAsync(string accessToken, Guid userInviteID);
 
     Task<RestApiResponse> DeleteUserInviteAsync(string accessToken, Guid inviteID);
+
+    Task<RestApiResponse> AuthoriseUserInviteAsync(string strongUserAccessToken, Guid inviteID);
 }
 
 public class UserInviteClient : IUserInviteClient
@@ -102,6 +106,25 @@ public Task<RestApiResponse<UserInvite>> GetUserInviteAsync(string accessToken,
         };
     }
 
+    /// <summary>
+    /// Calls the MoneyMoov Merchant get user invite details endpoint to get a single user invite by ID.
+    /// </summary>
+    /// <param name="accessToken">A User scoped JWT access token.</param>
+    /// <param name="userInviteID">The ID of the user invite to retrieve.</param>
+    /// <returns>If successful, a user invite object.</returns>
+    public Task<RestApiResponse<UserInvite>> GetUserInviteDetailsAsync(string accessToken, Guid userInviteID)
+    {
+        var url = MoneyMoovUrlBuilder.UserInvitesApi.UserInviteDetailsUrl(_apiClient.GetBaseUri().ToString(), userInviteID);
+
+        var prob = _apiClient.CheckAccessToken(accessToken, nameof(GetUserInviteDetailsAsync));
+
+        return prob switch
+        {
+            var p when p.IsEmpty => _apiClient.GetAsync<UserInvite>(url, accessToken),
+            _ => Task.FromResult(new RestApiResponse<UserInvite>(HttpStatusCode.PreconditionFailed, new Uri(url), prob))
+        };
+    }
+
     /// <summary>
     /// Calls the MoneyMoov account endpoint to create and send an email invite to register
     /// and join a merchant account.
@@ -192,4 +215,25 @@ public Task<RestApiResponse> DeleteUserInviteAsync(string accessToken, Guid invi
             _ => Task.FromResult(new RestApiResponse(HttpStatusCode.PreconditionFailed, new Uri(url), prob))
         };
     }
+
+    /// <summary>
+    /// Calls the MoneyMoov user invites endpoint to authorise a user invite.
+    /// </summary>
+    /// <param name="strongUserAccessToken">The strong user access token acquired to authorise the user invite. Strong
+    /// tokens can only be acquired from a strong customer authentication flow, are short lived (typically 5 minute expiry)
+    /// and are specific to the user invite.</param>
+    /// <param name="inviteID">The ID of the user invite to authorise.</param>
+    /// <returns>An API response indicating the result of the authorise attempt.</returns>
+    public Task<RestApiResponse> AuthoriseUserInviteAsync(string strongUserAccessToken, Guid inviteID)
+    {
+        var url = MoneyMoovUrlBuilder.UserInvitesApi.AuthoriseUserInviteUrl(_apiClient.GetBaseUri().ToString(), inviteID);
+
+        var prob = _apiClient.CheckAccessToken(strongUserAccessToken, nameof(AuthoriseUserInviteAsync));
+
+        return prob switch
+        {
+            var p when p.IsEmpty => _apiClient.PostAsync(url, strongUserAccessToken),
+            _ => Task.FromResult(new RestApiResponse(HttpStatusCode.PreconditionFailed, new Uri(url), prob))
+        };
+    }
 }

src/NoFrixion.MoneyMoov/Enums/ApprovalTypesEnum.cs

@@ -35,5 +35,7 @@ public enum ApproveTypesEnum
 
     Payrun = 8,
 
-    MerchantToken = 9
+    MerchantToken = 9,
+
+    UserInvite = 10,
 }

src/NoFrixion.MoneyMoov/Enums/AuthorisationType.cs

@@ -22,5 +22,6 @@ public enum AuthorisationType
     Rule = 2,
     Beneficiary = 3,
     Payrun = 4,
-    MerchantToken = 5
+    MerchantToken = 5,
+    UserInvite = 6
 }

src/NoFrixion.MoneyMoov/Enums/RoleEventTypeEnum.cs

@@ -0,0 +1,38 @@
+// -----------------------------------------------------------------------------
+//  Filename: RoleEventTypeEnum.cs
+// 
+//  Description: List of the types of events that can occur in a role:
+// 
+//  Author(s):
+//  Axel Granillo ([email protected])
+// 
+//  History:
+//  17 07 2025  Axel Granillo   Created, Remote, Mexico City, Mexico.
+// 
+//  License:
+//  MIT.
+// -----------------------------------------------------------------------------
+
+namespace NoFrixion.MoneyMoov.Enums;
+
+/// <summary>
+/// Events that can occur in a role.
+/// </summary>
+public enum RoleEventTypeEnum
+{
+    None = 0,
+
+    Created = 1,
+    
+    Edited = 2,
+    
+    Archived = 3,
+    
+    Unarchived = 4,
+    
+    AssignedToUser = 5,
+    
+    RemovedFromUser = 6,
+    
+    UpdatedUserAssignment = 7
+}

src/NoFrixion.MoneyMoov/Enums/UserInviteEventTypeEnum.cs

@@ -0,0 +1,30 @@
+//-----------------------------------------------------------------------------
+// Filename: UserInviteEventTypeEnum.cs
+// 
+// Description: Enum for the different types of user invite events that can
+// occur.
+// 
+// Author(s):
+// Aaron Clauson ([email protected])
+// 
+// History:
+// 06 Aug 2025  Aaron Clauson   Created, Carnesore Point, Wexford, Ireland.
+// 
+// License:
+// MIT.
+//-----------------------------------------------------------------------------
+
+namespace NoFrixion.MoneyMoov.Enums;
+
+public enum UserInviteEventTypeEnum
+{
+    /// <summary>
+    /// Something went wrong and the event type is unknown.
+    /// </summary>
+    Unknown = 0,
+    
+    /// <summary>
+    /// A user invite was authorised by an approver.
+    /// </summary>
+    Authorise = 1
+}

src/NoFrixion.MoneyMoov/Enums/UserInviteStatusEnum.cs

@@ -31,5 +31,10 @@ public enum UserInviteStatusEnum
     /// <summary>
     /// User has accepted the invite but the role is pending.
     /// </summary>
-    Accepted = 2
+    Accepted = 2,
+
+    /// <summary>
+    /// The invite needs to be authorised before being activated.
+    /// </summary>
+    AuthorisationRequired = 3,
 }

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/Account/PaymentAccountMinimal.cs

@@ -66,4 +66,14 @@ public class PaymentAccountMinimal
     /// Externally connected account can be used to view account balances and transactions. 
     /// </summary>
     public bool IsConnectedAccount { get; set; }
+    
+    /// <summary>
+    /// Total of the payouts that have been submitted for processing.
+    /// </summary>
+    public decimal SubmittedPayoutsBalance { get; set; }
+    
+    /// <summary>
+    /// The current available balance of the account. Calculated by subtracting any submitted payments from the current balance.
+    /// </summary>
+    public decimal AvailableBalance => Balance - SubmittedPayoutsBalance;
 }