#2 Починил шаг по получению назначенных прав для ролей в тесте

GregoryGhost · Mar 15, 2020 · 81f8c38 · 81f8c38
1 parent 0a8c7db
commit 81f8c38
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 16 deletions.
diff --git a/Idone/Idone.DAL/DTO/DtoFilterById.cs b/Idone/Idone.DAL/DTO/DtoFilterById.cs
@@ -5,7 +5,7 @@
     /// <summary>
     /// DTO фильтра по идентификатору сущности.
     /// </summary>
-    public class DtoFilterById : Record<DtoFilterById>
+    public class DtoFilterById : Record<DtoFilterById>, IIdentity
     {
         /// <summary>
         /// Конструктор по умолчанию.

diff --git a/Idone/Idone.DAL/DTO/DtoLinkUserRoles.cs b/Idone/Idone.DAL/DTO/DtoLinkUserRoles.cs
@@ -14,7 +14,7 @@ public class DtoLinkUserRoles : Record<DtoLinkUserRoles>
         /// </summary>
         /// <param name="userId"> Идентификатор пользователя. </param>
         /// <param name="roleIds"> Идентификаторы ролей пользователя. </param>
-        public DtoLinkUserRoles(int userId, IEnumerable<int> roleIds)
+        public DtoLinkUserRoles(IIdentity userId, IEnumerable<IIdentity> roleIds)
         {
             UserId = userId;
             RoleIds = roleIds;
@@ -23,11 +23,11 @@ public DtoLinkUserRoles(int userId, IEnumerable<int> roleIds)
         /// <summary>
         /// Идентификаторы ролей пользователя.
         /// </summary>
-        public IEnumerable<int> RoleIds { get; private set; }
+        public IEnumerable<IIdentity> RoleIds { get; private set; }
 
         /// <summary>
         /// Идентификатор пользователя.
         /// </summary>
-        public int UserId { get; private set; }
+        public IIdentity UserId { get; private set; }
     }
 }
diff --git a/Idone/Idone.Security/Services/UserService.cs b/Idone/Idone.Security/Services/UserService.cs
@@ -249,7 +249,7 @@ public UserService(AppContext appContext)
         public Either<Error, Success> UnsetUserRoles(DtoLinkUserRoles link)
         {
             var dbQuery = _appContext.UserRoles.AsQueryable();
-            var foundUser = dbQuery.FirstOrDefault(x => x.Id == link.UserId) ?? Left<Error, UserRole>(Error.NotFoundRecord);
+            var foundUser = dbQuery.FirstOrDefault(x => x.Id == link.UserId.Id) ?? Left<Error, UserRole>(Error.NotFoundRecord);
 
             var result = foundUser.Bind(userRole =>
             {

diff --git a/Idone/Idone.Tests/Constants.fs b/Idone/Idone.Tests/Constants.fs
@@ -15,17 +15,17 @@ module Constants =
 
     let PERMISSIONS : Perm list = 
         [
-            { Name = "" }
+            { Name = "тестовое_резрешение"; Description = "описание" }
         ]
 
     let PERMS_ROLES_LINKS : PermRoleLink list = [
         {
             Role = { Name = "админ" }
-            Perm = { Name = "разрешение1" }
+            Perm = { Name = "разрешение1"; Description = "описание" }
         };
         {
             Role = { Name = "пользователь" }
-            Perm = { Name = "разрешение2" }
+            Perm = { Name = "разрешение2"; Description = "описание" }
         }
     ]
 

diff --git a/Idone/Idone.Tests/Helpers/IdoneApiHelper.fs b/Idone/Idone.Tests/Helpers/IdoneApiHelper.fs
@@ -1,4 +1,5 @@
 namespace Idone.Tests.Helpers
+open Idone.DAL.Base
 
 module IdoneApiHelper =
     open Idone.DAL.DTO
@@ -51,7 +52,11 @@ module IdoneApiHelper =
         roles |> List.map (fun role -> new DtoNewRole(role.Name))
 
     let preparePermData (perms : Perm list) : DtoNewPermission list =
-        perms |> List.map (fun perm -> new DtoNewPermission(perm.Name))
+        perms |> List.map (fun perm -> new DtoNewPermission(perm.Name, perm.Description))
+
+    let toDefaultGridQueryRolePerm (filter : #IIdentity) : DtoGridQueryRolePermission =
+        let query = new DtoGridQueryRolePermission(filter, FIRST_PAGE)
+        query
 
     let inline bindData
                  (entity1 : #IIdentity list)

diff --git a/Idone/Idone.Tests/Helpers/IdoneApiWrapper.fs b/Idone/Idone.Tests/Helpers/IdoneApiWrapper.fs
@@ -45,7 +45,8 @@ type SecurityModuleWrapper(servicesProvider : ServiceProvider) =
     member __.SetRolesForUser (roles : Role list, user : DtoRegistratedUser) : Either<Error, Success> =
         either {
             let roleIds = __.GetRoleIds roles
-            let linkUserRoles = new DtoLinkUserRoles(user.Id, roleIds)
+            let userId = new DtoFilterById(user.Id)
+            let linkUserRoles = new DtoLinkUserRoles(userId, roleIds)
 
             return! _module.SetUserRoles linkUserRoles
         }     
@@ -78,11 +79,11 @@ type SecurityModuleWrapper(servicesProvider : ServiceProvider) =
     member __.FindRole (role : Role) : Either<Error, DtoRowRole> =
         role |> toDefaultGridQueryRole |> __.GetGridRoles >>= takeFirstRow
 
-    member __.GetRoleIds (roles : Role list) : int seq =
+    member __.GetRoleIds (roles : Role list) : #IIdentity seq =
         roles |> List.map (fun role -> either {
                 return! __.FindRole role })
         |> reduceAllRights 
-        |> Seq.map (fun role -> role.Id)
+        |> Seq.map (fun role -> new DtoFilterById(role.Id) :> IIdentity)
 
     member __.CreatePermissions (newPerms : Perm list) : DtoPermission list =
         newPerms |> preparePermData
@@ -98,10 +99,17 @@ type SecurityModuleWrapper(servicesProvider : ServiceProvider) =
         |> reduceAllRights
         |> Seq.toList
 
-    member __.GetRolesPermissions (roles: #IIdentity list) : DtoRowPermission list =
+    member __.GetRolesPermissions (roles: Role list) : DtoRowPermission list =
         roles
-        |> List.map (fun role -> either {
-                return! (_module.GetGridRolePermissions roleId)})
+        |> __.GetRoleIds
+        |> Seq.map (fun roleId -> either {
+                let filter = toDefaultGridQueryRolePerm (roleId :?> DtoFilterById)
+                let grid = _module.GetGridRolePermissions filter
+                return! grid})
+        |> reduceAllRights
+        |> Seq.map (fun x -> takeFirstRow x)
+        |> reduceAllRights
+        |> Seq.toList
 
-    member __.GetPermissionsRoles (perms: #IIdentity list) : DtoRowRole list =
+    member __.GetPermissionsRoles (perms: Perm list) : DtoRowRole list =
         raise (System.NotImplementedException())
diff --git a/Idone/Idone.Tests/Types.fs b/Idone/Idone.Tests/Types.fs
@@ -8,6 +8,7 @@ type Role =
 type Perm =
     {
         Name : string
+        Description : string
     }
 
 type PermRoleLink =