feat: update facilitator role removal logic in AppDbContext (#339)

* feat: update facilitator role removal logic in AppDbContext

* feat: enforce minimum facilitator requirement in project updates

* fix: update namespace references from Scampi to PrismaApi in multiple files

* feat: enforce project role requirement on updates

Author: EinarSalbouvet

PrismaDotnetApi/PrismaApi.Api/Controllers/SolversController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using PrismaApi.Application.Interfaces.Services;
 using PrismaApi.Domain.Dtos;
-using Scampi.Domain.Extensions;
+using PrismaApi.Domain.Extensions;
 using System.Net;
 using PrismaApi.Api.Extensions;
 

PrismaDotnetApi/PrismaApi.Api/Controllers/StuctureController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using PrismaApi.Application.Interfaces.Services;
 using PrismaApi.Domain.Dtos;
-using Scampi.Domain.Extensions;
+using PrismaApi.Domain.Extensions;
 using System.Net;
 using PrismaApi.Api.Extensions;
 

PrismaDotnetApi/PrismaApi.Application/Repositories/ProjectRepository.cs

@@ -3,6 +3,7 @@
 using PrismaApi.Domain.Constants;
 using PrismaApi.Domain.Dtos;
 using PrismaApi.Domain.Entities;
+using PrismaApi.Domain.Extensions;
 using PrismaApi.Infrastructure.Context;
 using System.Linq.Expressions;
 
@@ -41,11 +42,11 @@ public async Task<IEnumerable<Project>> UpdateRangeAsync(IEnumerable<Project> in
         var entities = await GetByIdsAsync(incomingEntities.Select(e => e.Id), withTracking: true, filterPredicate: filterPredicate, ct: ct);
         foreach (var entity in entities)
         {
-            var incomingEntity = incomingEntities.Where(x => x.Id == entity.Id).First();
+            var incomingEntity = incomingEntities.First(x => x.Id == entity.Id);
 
             // if user is not a facillitator, they cannnot change the role type.
             bool isUserFacillitator = entity.ProjectRoles
-                .Any(r => string.Equals(r.Role, ProjectRoleType.Facilitator.ToString(), StringComparison.OrdinalIgnoreCase) && r.UserId == userDto.Id);
+                .Any(r => r.Role.IsFacilitator() && r.UserId == userDto.Id);
 
             if (!isUserFacillitator)
             {
@@ -59,11 +60,16 @@ public async Task<IEnumerable<Project>> UpdateRangeAsync(IEnumerable<Project> in
             entity.ParentProjectName = incomingEntity.ParentProjectName;
             entity.EndDate = incomingEntity.EndDate;
             entity.UpdatedById = incomingEntity.UpdatedById;
-
-            if (incomingEntity.ProjectRoles.Count != 0)
+            
+            if (incomingEntity.ProjectRoles.Count == 0)
+            {
+                throw new InvalidOperationException("At least one project role is required.");
+            }
+            if (!incomingEntity.ProjectRoles.Any(x => x.Role.IsFacilitator()))
             {
-                entity.ProjectRoles.Update(incomingEntity.ProjectRoles, DbContext);
+                throw new InvalidOperationException(ExceptionMessages.MinimumFacilitatorRequirement);
             }
+            entity.ProjectRoles.Update(incomingEntity.ProjectRoles, DbContext);
             entity.Objectives.Update(incomingEntity.Objectives, DbContext);
             entity.Strategies.Update(incomingEntity.Strategies, DbContext);
             entity.BoardNodes.Update(incomingEntity.BoardNodes, DbContext);

PrismaDotnetApi/PrismaApi.Application/Services/InternalUserService.cs

@@ -8,7 +8,7 @@
 using PrismaApi.Domain.Constants;
 using PrismaApi.Domain.Dtos;
 using PrismaApi.Infrastructure.Caching;
-using Scampi.Domain.Extensions;
+using PrismaApi.Domain.Extensions;
 
 namespace PrismaApi.Application.Services;
 

PrismaDotnetApi/PrismaApi.Application/Services/PublicUserService.cs

@@ -6,7 +6,7 @@
 using PrismaApi.Domain.Constants;
 using PrismaApi.Domain.Dtos;
 using PrismaApi.Infrastructure.Caching;
-using Scampi.Domain.Extensions;
+using PrismaApi.Domain.Extensions;
 
 namespace PrismaApi.Application.Services;
 

PrismaDotnetApi/PrismaApi.Application/Services/TableRebuildingService.cs

@@ -4,7 +4,7 @@
 using PrismaApi.Domain.Dtos;
 using PrismaApi.Domain.Entities;
 using PrismaApi.Infrastructure.Context;
-using Scampi.Domain.Extensions;
+using PrismaApi.Domain.Extensions;
 
 namespace PrismaApi.Application.Services;
 

PrismaDotnetApi/PrismaApi.Domain/Constants/DomainConstants.cs

@@ -95,3 +95,8 @@ public enum BoardNodeStrokeStyles
     Dashed,
     Dotted,
 }
+
+public static class ExceptionMessages
+{
+    public const string MinimumFacilitatorRequirement = "Projects must have at least one Facilitator.";
+};

PrismaDotnetApi/PrismaApi.Domain/Extensions/DomainConstantsExtensions.cs

@@ -0,0 +1,9 @@
+using PrismaApi.Domain.Constants;
+
+namespace PrismaApi.Domain.Extensions;
+
+public static class ProjectRoleTypeExtensions
+{
+    public static bool IsFacilitator(this string role) => 
+        string.Equals(role, ProjectRoleType.Facilitator.ToString(), StringComparison.OrdinalIgnoreCase);
+}

PrismaDotnetApi/PrismaApi.Domain/Extensions/StringExtensions.cs

@@ -2,7 +2,7 @@
 using System.Text;
 using System.Security.Cryptography;
 
-namespace Scampi.Domain.Extensions;
+namespace PrismaApi.Domain.Extensions;
 
 public static partial class StringExtensions
 {

PrismaDotnetApi/PrismaApi.Infrastructure/Context/AppDbContext.cs

@@ -3,6 +3,7 @@
 using Microsoft.Extensions.Caching.Memory;
 using PrismaApi.Domain.Constants;
 using PrismaApi.Domain.Entities;
+using PrismaApi.Domain.Extensions;
 using PrismaApi.Domain.Interfaces;
 using PrismaApi.Infrastructure.DiscreteTables;
 
@@ -146,25 +147,25 @@ private async Task EnforceMinimumProjectRoles(CancellationToken cancellationToke
 
         foreach (var (projectId, roles) in affectedByProject)
         {
+            var facilitatorRole = ProjectRoleType.Facilitator.ToString();
+
             var facilitatorsBeingRemoved = roles.Count(role =>
                 role.State == EntityState.Deleted
-                    ? string.Equals(role.Entity.Role, ProjectRoleType.Facilitator.ToString(), StringComparison.OrdinalIgnoreCase)
-                    : string.Equals(
-                        role.OriginalValues.GetValue<string>(nameof(ProjectRole.Role)),
-                        ProjectRoleType.Facilitator.ToString(),
-                        StringComparison.OrdinalIgnoreCase));
+                    ? role.Entity.Role.IsFacilitator()
+                    : role.OriginalValues.GetValue<string>(nameof(ProjectRole.Role)).IsFacilitator()
+                    && !role.CurrentValues.GetValue<string>(nameof(ProjectRole.Role)).IsFacilitator());
 
             if (facilitatorsBeingRemoved == 0)
                 continue;
 
             var currentFacilitatorCount = await ProjectRoles
                 .AsNoTracking()
                 .CountAsync(r => r.ProjectId == projectId &&
-                                 r.Role.ToUpper() == ProjectRoleType.Facilitator.ToString().ToUpper(),
-                             cancellationToken);
+                    r.Role.IsFacilitator(), 
+                    cancellationToken);
 
             if (currentFacilitatorCount - facilitatorsBeingRemoved <= 0)
-                throw new InvalidOperationException("Projects must have at least one Facilitator.");
+                throw new InvalidOperationException(ExceptionMessages.MinimumFacilitatorRequirement);
         }
     }