simona/dotnet-template
Template
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Sprint 5 #28

Merged
csimonapastore merged 28 commits from sprints/5 into main 2025-05-28 00:10:39 +02:00
Conversation 1 Commits 28 Files Changed 53 +11 -22
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 448afad655 - Show all commits

33
MainProject/Services/PermissionService.cs
View File

@@ -674,17 +674,6 @@ public class PermissionService : BaseService, IPermissionService
.ToList(); .ToList();
} }
private static List<string?>? GetOperationsNamesFromFile(PermissionInfo permissionInfo)
{
return permissionInfo?.RolePermissionModuleOperations?
.Where(x => x != null)
.Where(x => x.Operations != null)
.SelectMany(y => y.Operations!)
.Select(z => z.Operation)
.Distinct()
.ToList();
}
private (List<PermissionSystem>, List<string>) HandlePermissionSystemOnStartup(PermissionsFile permissionsFile) private (List<PermissionSystem>, List<string>) HandlePermissionSystemOnStartup(PermissionsFile permissionsFile)
{ {
List<string> newPermissions = []; List<string> newPermissions = [];
@@ -805,14 +794,14 @@ public class PermissionService : BaseService, IPermissionService
List<Role> rolesList = []; List<Role> rolesList = [];
List<string>? roles = permissionsFile.PermissionInfos? List<string>? roles = permissionsFile.PermissionInfos?
.Where(x => x.RolePermissionModuleOperations != null)? .Where(x => x.RolePermissionModuleOperations != null)
.SelectMany(x => x.RolePermissionModuleOperations!)? .SelectMany(x => x.RolePermissionModuleOperations!)
.Where(x => x.Operations != null)? .Where(x => x.Operations != null)
.SelectMany(y => y.Operations!)? .SelectMany(y => y.Operations!)
.Where(z => z.Roles != null)? .Where(z => z.Roles != null)
.SelectMany(z => z.Roles!)? .SelectMany(z => z.Roles!)
.Where(z => z != null)? .Where(z => z != null)
.Distinct()? .Distinct()
.ToList(); .ToList();
if (roles != null && roles.Count > 0) if (roles != null && roles.Count > 0)
@@ -936,7 +925,7 @@ public class PermissionService : BaseService, IPermissionService
var modulesNames = GetModulesNamesFromPermissionInfo(permissionInfo); var modulesNames = GetModulesNamesFromPermissionInfo(permissionInfo);
if (modulesNames != null && modulesNames.Count > 0) if (modulesNames != null && modulesNames.Count > 0)
{ {
List<PermissionModule> permissionModules = allPermissionModules.Where(x => modulesNames.Contains(x.Name)).ToList() ?? []; List<PermissionModule> permissionModules = allPermissionModules.Where(x => modulesNames.Contains(x.Name))?.ToList() ?? [];
(permissionSystemModuleList, newPermissions) = this.HandlePermissionSystemModuleOnStartup(permissionsFile, permissionSystems, permissionModules, permissionInfo); (permissionSystemModuleList, newPermissions) = this.HandlePermissionSystemModuleOnStartup(permissionsFile, permissionSystems, permissionModules, permissionInfo);
} }
} }
@@ -1114,7 +1103,7 @@ public class PermissionService : BaseService, IPermissionService
.FirstOrDefault(x => x.PermissionOperation.Name == operationInfo.Operation); .FirstOrDefault(x => x.PermissionOperation.Name == operationInfo.Operation);
if (permissionSystemModuleOperation != null && operationInfo.Roles != null && operationInfo.Roles.Count > 0) if (permissionSystemModuleOperation != null && operationInfo.Roles != null && operationInfo.Roles.Count > 0)
{ {
var roles = allRoles.Where(x => operationInfo.Roles.Contains(x.Name)).ToList(); var roles = allRoles.Where(x => operationInfo.Roles.Contains(x.Name))?.ToList() ?? [];
if (roles != null && roles.Count > 0) if (roles != null && roles.Count > 0)
{ {
foreach (var roleName in operationInfo.Roles) foreach (var roleName in operationInfo.Roles)
@@ -1188,7 +1177,7 @@ public class PermissionService : BaseService, IPermissionService
{ {
// Get all PermissionSystemModuleOperations by System.Name // Get all PermissionSystemModuleOperations by System.Name
List<PermissionSystemModuleOperation> allPermissionSystemModuleOperationsBySystem = allPermissionSystemModuleOperations List<PermissionSystemModuleOperation> allPermissionSystemModuleOperationsBySystem = allPermissionSystemModuleOperations
.Where(x => x.PermissionSystemModule.PermissionSystem.Name == permissionInfo.System).ToList(); .Where(x => x.PermissionSystemModule.PermissionSystem.Name == permissionInfo.System)?.ToList() ?? [];
if (allPermissionSystemModuleOperationsBySystem != null && allPermissionSystemModuleOperationsBySystem.Count > 0) if (allPermissionSystemModuleOperationsBySystem != null && allPermissionSystemModuleOperationsBySystem.Count > 0)
{ {