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 +30 -10
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6d7dc432d8 - Show all commits

40
MainProject/Services/PermissionService.cs
View File

@@ -1103,16 +1103,10 @@ public class PermissionService : BaseService, IPermissionService
var roles = allRoles.Where(x => operationInfo.Roles.Contains(x.Name)).ToList();
if (roles.Count > 0)
{
foreach (var roleName in operationInfo.Roles)
{
(tmpRolePermissionSystemModuleOperationList, tmpPermissions) = this.HandleRolePermissionSystemModuleOperationOnStartup
(
roles, roleName, permissionSystemModuleOperation
);
newPermissions.AddRange(tmpPermissions);
rolePermissionSystemModuleOperationList.AddRange(tmpRolePermissionSystemModuleOperationList);
}
(tmpRolePermissionSystemModuleOperationList, tmpPermissions) = this.HandleRolePermissionSystemModuleOperationOnStartup
(
roles, permissionSystemModuleOperation, operationInfo
);
}
}
}
@@ -1121,6 +1115,32 @@ public class PermissionService : BaseService, IPermissionService
return (rolePermissionSystemModuleOperationList, newPermissions);
}
private (List<RolePermissionSystemModuleOperation>, List<string>) HandleRolePermissionSystemModuleOperationOnStartup
(
List<Role> roles, PermissionSystemModuleOperation permissionSystemModuleOperation, OperationInfo operationInfo
)
{
List<string> newPermissions = [];
List<string> tmpPermissions;
List<RolePermissionSystemModuleOperation> rolePermissionSystemModuleOperationList = [];
List<RolePermissionSystemModuleOperation> tmpRolePermissionSystemModuleOperationList;
if (operationInfo?.Roles != null)
{
foreach (var roleName in operationInfo.Roles)
{
(tmpRolePermissionSystemModuleOperationList, tmpPermissions) = this.HandleRolePermissionSystemModuleOperationOnStartup
(
roles, roleName, permissionSystemModuleOperation
);
newPermissions.AddRange(tmpPermissions);
rolePermissionSystemModuleOperationList.AddRange(tmpRolePermissionSystemModuleOperationList);
}
}
return (rolePermissionSystemModuleOperationList, newPermissions);
}
private (List<RolePermissionSystemModuleOperation>, List<string>) HandleRolePermissionSystemModuleOperationOnStartup
(
List<Role> roles, string roleName, PermissionSystemModuleOperation permissionSystemModuleOperation