Merge branch 'release/moov-1.8.15'

src/NoFrixion.MoneyMoov/Enums/PayrunStatus.cs

@@ -61,4 +61,10 @@ public enum PayrunStatus
     /// Indicates that the pay run has been authorised and is queued for processing.
     /// </summary>
     Queued = 8,
+
+    /// <summary>
+    /// Indicates that the pay run approval is in progress and
+    /// payouts are being created for the pay run.
+    /// </summary>
+    Approving = 9,
 }

src/NoFrixion.MoneyMoov/Models/Roles/RoleUpdate.cs

@@ -0,0 +1,51 @@
+// -----------------------------------------------------------------------------
+//  Filename: RoleUpdate.cs
+// 
+//  Description: Role update model:
+// 
+//  Author(s):
+//  Donal O'Connor ([email protected])
+// 
+//  History:
+//  26 08 2024  Donal O'Connor   Created, Harcourt St, Dublin, Ireland.
+// 
+//  License:
+//  Proprietary NoFrixion.
+// -----------------------------------------------------------------------------
+
+using NoFrixion.Common.Permissions;
+
+namespace NoFrixion.MoneyMoov.Models.Roles;
+
+public class RoleUpdate
+{
+    /// <summary>
+    /// The role id
+    /// </summary>
+    public Guid ID { get; set; }
+
+    /// <summary>
+    /// The role name
+    /// </summary>
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// The role description
+    /// </summary>
+    public string? Description { get; set; }
+
+    /// <summary>
+    /// The roles user permissions
+    /// </summary>
+    public UserPermissions? UserPermissions { get; set; }
+
+    /// <summary>
+    /// The roles merchant permissions
+    /// </summary>
+    public MerchantPermissions? MerchantPermissions { get; set; }
+
+    /// <summary>
+    /// The roles account permissions
+    /// </summary>
+    public AccountPermissions? AccountPermissions { get; set; }
+}

src/NoFrixion.MoneyMoov/Models/Roles/RoleUserUpdate.cs

@@ -0,0 +1,29 @@
+// -----------------------------------------------------------------------------
+//  Filename: RoleUserUpdate.cs
+// 
+//  Description: Role user update model:
+// 
+//  Author(s):
+//  Donal O'Connor ([email protected])
+// 
+//  History:
+//  26 08 2024  Donal O'Connor   Created, Harcourt St, Dublin, Ireland.
+// 
+//  License:
+//  Proprietary NoFrixion.
+// -----------------------------------------------------------------------------
+
+namespace NoFrixion.MoneyMoov.Models.Roles;
+
+public class RoleUserUpdate
+{
+    /// <summary>
+    /// The accounts the user will have permssions for from the associated role
+    /// </summary>
+    public List<Guid>? RoleAccounts { get; set; }
+
+    /// <summary>
+    /// The merchants the user will have permssions for from the associated role
+    /// </summary>
+    public List<Guid>? RoleMerchants { get; set; }
+}

src/NoFrixion.MoneyMoov/NoFrixion.MoneyMoov.csproj

@@ -4,8 +4,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<AssemblyVersion>1.8.14.0</AssemblyVersion>
-	<FileVersion>1.8.14.0</FileVersion>
+	<AssemblyVersion>1.8.15.0</AssemblyVersion>
+	<FileVersion>1.8.15.0</FileVersion>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
 	<NoWarn>$(NoWarn);1591</NoWarn>

src/NoFrixion.MoneyMoov/NoFrixionProblem.cs

@@ -125,6 +125,15 @@ public NoFrixionNotFoundProblem(string errorMessage) : base(errorMessage, STATUS
     }
 }
 
+public class NoFrixionConflictProblem : NoFrixionProblem
+{
+    private const int STATUS_CODE = 409;
+
+    public NoFrixionConflictProblem(string errorMessage) : base(errorMessage, STATUS_CODE)
+    {
+    }
+}
+
 public class NoFrixionProblem
 {
     private static NoFrixionProblem _empty = new NoFrixionProblem { _isEmpty = true };