#2 Добавил получение данных из таблиц/удаление/назначение прав

GregoryGhost · Mar 12, 2020 · 829dfc2 · 829dfc2
1 parent 9960d65
commit 829dfc2
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 17 deletions.
diff --git a/Idone/Idone.DAL/Base/Extensions/DbSetExtension.cs b/Idone/Idone.DAL/Base/Extensions/DbSetExtension.cs
@@ -1,5 +1,7 @@
 namespace Idone.DAL.Base.Extensions
 {
+    using Idone.DAL.Dictionaries;
+
     using LanguageExt;
 
     using Microsoft.EntityFrameworkCore;
@@ -37,5 +39,11 @@ public static Option<T> Find<T>(this DbSet<T> dbSet, params object[] keyValues)
                 ? Some(searchResult)
                 : None;
         }
+
+        public static Either<Error, T> FindEither<T>(this DbSet<T> dbSet, params object[] keyValues)
+            where T : class
+        {
+            return dbSet.Find<T>(keyValues).ToEither(Error.NotFoundRecord);
+        }
     }
 }
diff --git a/Idone/Idone.DAL/DTO/DtoNewPermission.cs b/Idone/Idone.DAL/DTO/DtoNewPermission.cs
@@ -4,11 +4,13 @@
 
     public class DtoNewPermission: Record<DtoNewPermission>
     {
-        public DtoNewPermission(string name)
+        public DtoNewPermission(string name, string description)
         {
             Name = name;
+            Description = description;
         }
 
         public string Name { get; }
+        public string Description { get; }
     }
 }
diff --git a/Idone/Idone.DAL/DTO/DtoPermission.cs b/Idone/Idone.DAL/DTO/DtoPermission.cs
@@ -4,9 +4,10 @@
 
     public class DtoPermission: Record<DtoPermission>, IIdentity
     {
-        public DtoPermission(string name)
+        public DtoPermission(int id, string name)
         {
             Name = name;
+            Id = id;
         }
 
         public string Name { get; }

diff --git a/Idone/Idone.DAL/DTO/DtoRole.cs b/Idone/Idone.DAL/DTO/DtoRole.cs
@@ -11,7 +11,7 @@ public class DtoRole : Record<DtoRole>, IIdentity
         /// Конструктор по умолчанию.
         /// </summary>
         /// <param name="name"> Название роли. </param>
-        public DtoRole(string name)
+        public DtoRole(int id, string name)
         {
             Name = name;
         }

diff --git a/Idone/Idone.DAL/Dictionaries/Error.cs b/Idone/Idone.DAL/Dictionaries/Error.cs
@@ -8,6 +8,7 @@ public enum Error
         /// <summary>
         /// Исключение, подробности смотреть в логах.
         /// </summary>
-        Exception = 0
+        Exception = 0,
+        NotFoundRecord,
     }
 }
diff --git a/Idone/Idone.DAL/Entities/Permission.cs b/Idone/Idone.DAL/Entities/Permission.cs
@@ -1,6 +1,7 @@
 namespace Idone.DAL.Entities
 {
     using Idone.DAL.Dictionaries;
+    using Idone.DAL.DTO;
 
     using LanguageExt;
 
@@ -41,5 +42,16 @@ private Permission()
 
             return permission;
         }
+
+        public static Either<Error, Permission> Create(DtoNewPermission newPermission)
+        {
+            var user = new Permission
+            {
+                Description = newPermission.Description,
+                Name = newPermission.Name
+            };
+
+            return user;
+        }
     }
 }
diff --git a/Idone/Idone.DAL/Entities/RolePermission.cs b/Idone/Idone.DAL/Entities/RolePermission.cs
@@ -31,12 +31,12 @@ private RolePermission()
         /// </summary>
         public Role Role { get; private set; }
 
-        public Either<Error, RolePermission> Create(Permission permission, Role role)
+        public static Either<Error, RolePermission> Create(Permission permission, Role role)
         {
             return new RolePermission
             {
                 Permission = permission,
-                Role = Role
+                Role = role
             };
         }
     }

diff --git a/Idone/Idone.Security/EnterPoint.cs b/Idone/Idone.Security/EnterPoint.cs
@@ -37,18 +37,23 @@ public EnterPoint(IServiceProvider serviceProvider)
         /// <inheritdoc />
         public Either<Error, Success> AllowRolePermissions(DtoLinkRolePermissions linkRolePermissions)
         {
-            throw new NotImplementedException();
+            var result = _userService.AllowRolePermissions(linkRolePermissions);
+
+            return result;
         }
 
         /// <inheritdoc />
         public Either<Error, DtoPermission> CreatePermissions(DtoNewPermission newPermission)
         {
-            throw new NotImplementedException();
+            var result = _userService.CreatePermissions(newPermission);
+
+            return result;
         }
 
         /// <inheritdoc />
         public Either<Error, DAL.DTO.DtoRole> CreateRole(DtoNewRole newRole)
         {
+            //TODO: не стыковка API - в описании модуля создание одной роли, в методе юзер сервиса написано создание ролей, но создает все равно одну роль.
             var result = _userService.CreateRoles(newRole);
 
             return result;
@@ -57,7 +62,9 @@ public EnterPoint(IServiceProvider serviceProvider)
         /// <inheritdoc />
         public Either<Error, Success> DenyRolePermissions(DtoLinkRolePermissions linkRolePermissions)
         {
-            throw new NotImplementedException();
+            var result = _userService.DenyRolePermissions(linkRolePermissions);
+
+            return result;
         }
 
         /// <inheritdoc />
@@ -136,7 +143,9 @@ public EnterPoint(IServiceProvider serviceProvider)
         /// <inheritdoc />
         public Either<Error, DtoPermission> GetPermissionById(int permId)
         {
-            throw new NotImplementedException();
+            var result = _userService.GetPermissionById(permId);
+
+            return result;
         }
 
         /// <inheritdoc />
@@ -182,7 +191,9 @@ public EnterPoint(IServiceProvider serviceProvider)
         /// <inheritdoc />
         public Either<Error, Success> UnsetUserRoles(DtoLinkUserRoles linkUserRoles)
         {
-            throw new NotImplementedException();
+            var result = _userService.UnsetUserRoles(linkUserRoles);
+
+            return result;
         }
     }
 }
diff --git a/Idone/Idone.Security/Services/UserService.cs b/Idone/Idone.Security/Services/UserService.cs
@@ -95,7 +95,7 @@ public UserService(AppContext appContext)
                 }).Bind(
                 role =>
                 {
-                    var createdRole = new DtoRole(role.Name);
+                    var createdRole = new DtoRole(role.Id, role.Name);
                     return Right<Error, DtoRole>(createdRole);
                 });
 
@@ -168,11 +168,6 @@ public UserService(AppContext appContext)
             return Right<Error, DtoGridUser>(result);
         }
 
-        public Either<Error, DtoRole> GetRoleById(int roleId)
-        {
-            throw new System.NotImplementedException();
-        }
-
         public Either<Error, DtoGridPermission> GetGridRolePermissions(DtoGridQueryRolePermission gridQuery)
         {
             var dbQuery = _appContext.RolePermissions.AsQueryable();
@@ -242,5 +237,89 @@ public UserService(AppContext appContext)
 
             return Right<Error, DtoGridPermission>(result);
         }
+
+        public Either<Error, DtoRole> GetRoleById(int roleId)
+        {
+            var dbQuery = _appContext.Roles.AsQueryable().FirstOrDefault(role => role.Id == roleId) ?? Left<Error, Role>(Error.NotFoundRecord);
+
+            var result = dbQuery.Bind<DtoRole>(x => new DtoRole(x.Id, x.Name));
+
+            return result;
+        }
+
+        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 result = foundUser.Bind(userRole =>
+            {
+                _appContext.UserRoles.Remove(userRole);
+                var t = _appContext.TrySaveChanges().Bind<Success>(_ => Success.ItsSuccess);
+                return t;
+            });
+
+            return result;
+        }
+
+        public Either<Error, DtoPermission> GetPermissionById(int permId)
+        {
+            var dbQuery = _appContext.Permissions.AsQueryable().FirstOrDefault(permission => permission.Id == permId) ?? Left<Error, Permission>(Error.NotFoundRecord);
+
+            var result = dbQuery.Bind<DtoPermission>(x => new DtoPermission(x.Id, x.Name));
+
+            return result;
+        }
+
+        public Either<Error, Success> DenyRolePermissions(DtoLinkRolePermissions link)
+        {
+            var dbQuery = _appContext.RolePermissions.AsQueryable();
+            var foundUser = dbQuery.FirstOrDefault(x => x.Id == link.RoleId) ?? Left<Error, RolePermission>(Error.NotFoundRecord);
+
+            var result = foundUser.Bind(rolePermission =>
+            {
+                _appContext.RolePermissions.Remove(rolePermission);
+                var t = _appContext.TrySaveChanges().Bind<Success>(_ => Success.ItsSuccess);
+                return t;
+            });
+
+            return result;
+        }
+
+        public Either<Error, DtoPermission> CreatePermissions(DtoNewPermission newPermission)
+        {
+            //TODO: опять не состыковочка в названии метода, проверить с тестами, может имеет смысл исправить интерфейс метода.
+            var result = Permission.Create(newPermission).Bind(
+                permission =>
+                {
+                    _appContext.Permissions.Add(permission);
+                    return _appContext.TrySaveChanges().Bind<Permission>(_ => permission);
+                }).Bind(
+                permission =>
+                {
+                    var createdPermission = new DtoPermission(permission.Id, permission.Name);
+                    return Right<Error, DtoPermission>(createdPermission);
+                });
+
+            return result;
+        }
+
+        public Either<Error, Success> AllowRolePermissions(DtoLinkRolePermissions link)
+        {
+            var result = _appContext.Roles.FindEither(link.RoleId).Bind(
+                role =>
+                {
+                    link.PermissionIds.Select(permission => _appContext.Permissions.Find<Permission>(permission)).Select(
+                        permission => 
+                        {
+                            RolePermission.Create(permission, role).Bind<EntityEntry<RolePermission>>(x => _appContext.RolePermissions.Add(x));
+                            return Right<Error, Permission>(permission);
+                        });
+                    var t = _appContext.TrySaveChanges().Bind<Success>(_ => Success.ItsSuccess);
+                    return t;
+                });
+
+            return result;
+        }
     }
 }