Add EntityMappingRecordManager ref #11 closes#22

saturn72 · Oct 23, 2020 · 0a701b1 · 0a701b1
1 parent f768ca7
commit 0a701b1
Show file tree

Hide file tree

Showing 30 changed files with 800 additions and 555 deletions.
diff --git a/src/AnyService.Core.Tests/Security/PermissionManagerExtensionsTests.cs b/src/AnyService.Core.Tests/Security/PermissionManagerExtensionsTests.cs
@@ -18,7 +18,7 @@ public async Task GetPermittedIds_HasUserPermissions_ReturnsEmpty(UserPermission
         {
             var pm = new Mock<IPermissionManager>();
             pm.Setup(p => p.GetUserPermissions(It.IsAny<string>())).ReturnsAsync(userPermissions);
-            var res = await PermissionManagerExtensions.GetPermittedIds(pm.Object, "uId", "ek", "pk");
+            var res = await PermissionManagerExtensions.GetPermittedEntitiesIds(pm.Object, "uId", "ek", "pk");
             res.ShouldBeEmpty();
         }
         public static IEnumerable<object[]> GetPermittedIds_HasUserPermissions_ReturnsEmpty_DATA => new[]
@@ -54,7 +54,7 @@ public async Task GetPermittedIds_NotMatch_AllConditions_ReturnsEmpty()
             };
             var pm = new Mock<IPermissionManager>();
             pm.Setup(p => p.GetUserPermissions(It.IsAny<string>())).ReturnsAsync(up);
-            var res = await PermissionManagerExtensions.GetPermittedIds(pm.Object, "some-user-id", "ek", "pk");
+            var res = await PermissionManagerExtensions.GetPermittedEntitiesIds(pm.Object, "some-user-id", "ek", "pk");
             res.ShouldBeEmpty();
         }
         [Fact]
@@ -72,7 +72,7 @@ public async Task GetPermittedIds_ReturnsEntityIds()
             };
             var pm = new Mock<IPermissionManager>();
             pm.Setup(p => p.GetUserPermissions(It.IsAny<string>())).ReturnsAsync(up);
-            var res = await PermissionManagerExtensions.GetPermittedIds(pm.Object, "some-user-id", "ek", "pk");
+            var res = await PermissionManagerExtensions.GetPermittedEntitiesIds(pm.Object, "some-user-id", "ek", "pk");
             res.Count().ShouldBe(2);
             res.Contains(eId1);
             res.Contains(eId2);

diff --git a/src/AnyService.Core/DomainEntities.cs b/src/AnyService.Core/DomainEntities.cs
@@ -5,7 +5,7 @@ public interface IDbModel<TId>
     {
         TId Id { get; set; }
     }
-    public sealed class EntityMapping : IEntity
+    public sealed class EntityMappingRecord : IEntity
     {
         public string Id { get; set; }
         public string ParentEntityName { get; set; }

diff --git a/src/AnyService.Core/Security/PermissionManagerExtensions.cs b/src/AnyService.Core/Security/PermissionManagerExtensions.cs
@@ -17,7 +17,7 @@ public static async Task<bool> UserHasPermissionOnEntity(this IPermissionManager
                     && p.EntityKey.Equals(entityKey, StringComparison.InvariantCultureIgnoreCase));
             return !hasPermission?.Excluded ?? false;
         }
-        public static async Task<IEnumerable<string>> GetPermittedIds(this IPermissionManager manager, string userId, string entityKey, string permissionKey)
+        public static async Task<IEnumerable<string>> GetPermittedEntitiesIds(this IPermissionManager manager, string userId, string entityKey, string permissionKey)
         {
             var ups = await manager.GetUserPermissions(userId);
             return ups?.EntityPermissions?

diff --git a/src/AnyService.SampleApp/SampleAppDbContext.cs b/src/AnyService.SampleApp/SampleAppDbContext.cs
@@ -17,7 +17,7 @@ public SampleAppDbContext(DbContextOptions<SampleAppDbContext> options) : base(o
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
-            modelBuilder.Entity<EntityMapping>(b => b.Property(u => u.Id).ValueGeneratedOnAdd());
+            modelBuilder.Entity<EntityMappingRecord>(b => b.Property(u => u.Id).ValueGeneratedOnAdd());
             modelBuilder.Entity<UserPermissions>(b => b.Property(u => u.Id).ValueGeneratedOnAdd());
             modelBuilder.Entity<EntityPermission>(b =>
             {

diff --git a/src/AnyService.Tests/Controllers/GenericControllerTests.cs b/src/AnyService.Tests/Controllers/GenericControllerTests.cs
@@ -1,8 +1,11 @@
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using AnyService.Controllers;
+using AnyService.Models;
 using AnyService.Services;
+using AnyService.Services.EntityMapping;
 using AnyService.Services.ServiceResponseMappers;
 using AnyService.Tests.Services.ServiceResponseMappers;
 using Microsoft.AspNetCore.Mvc;
@@ -24,7 +27,8 @@ public class GenericControllerTests : MappingTest
         [InlineData(nameof(GenericController<MyClass, MyClass>.GetAll), "GET", null)]
         [InlineData(nameof(GenericController<MyClass, MyClass>.GetById), "GET", "{id}")]
         [InlineData(nameof(GenericController<MyClass, MyClass>.Put), "PUT", "{id}")]
-        [InlineData(nameof(GenericController<MyClass, MyClass>.UpdateEntityMappings), "PUT", "__map/{id}")]
+
+        [InlineData(nameof(EntityMappingRecordController.UpdateEntityMappings), "PUT", "__map/{id}")]
         public void ValidateVerbs(string methodName, string expHttpVerb, string expTemplate)
         {
             var type = typeof(GenericController<,>);
@@ -104,29 +108,65 @@ public async Task Create_ReturnsServiceResponse()
             js.Value.ShouldBe(expData);
         }
         #endregion
+    }
+    public class EntityMappingControllerTests
+    {
+        public class MyClass : IEntity
+        {
+            public string Id { get; set; }
+        }
         #region UpdateEntityMappings
         [Fact]
-        public async Task UpdateEntityMappings_InvalidModelState()
+        public async Task UpdateEntityMappings_InvalidModelState_ReturnsBadRequest()
         {
-            var wc = new WorkContext
+            var ecrs = new EntityConfigRecord[] { };
+            var log = new Mock<ILogger<EntityMappingRecordController>>();
+            var ctrl = new EntityMappingRecordController(null, ecrs, null, log.Object);
+            ctrl.ModelState.AddModelError("k", "err");
+            var m = new EntityMappingRequestModel { ParentEntityKey = "exists", ChildEntityKey = "exists" };
+            var res = await ctrl.UpdateEntityMappings("id", m);
+            res.ShouldBeOfType<BadRequestResult>();
+        }
+        [Theory]
+        [MemberData(nameof(UpdateEntityMappings_InvalidRequest_ReturnsBadRequest_DATA))]
+        public async Task UpdateEntityMappings_InvalidRequest_ReturnsBadRequest(EntityMappingRequestModel m)
+        {
+            var ecrs = new[]
             {
-                CurrentEndpointSettings = new EndpointSettings
-                {
-                    MapToType = typeof(MyClass),
-                    MapToPaginationType = typeof(Pagination<MyClass>),
-                    EntityConfigRecord = new EntityConfigRecord
-                    {
-                        Type = typeof(MyClass),
-                        Name = typeof(MyClass).Name,
-                    }
-                }
+                new EntityConfigRecord{Name = "exists", ExternalName="exist"}
             };
-            var log = new Mock<ILogger<GenericController<MyClass, MyClass>>>();
-            var ctrl = new GenericController<MyClass, MyClass>(null, null, null, wc, log.Object);
-            ctrl.ModelState.AddModelError("k", "err");
-            var res = await ctrl.UpdateEntityMappings("id", null);
+            var log = new Mock<ILogger<EntityMappingRecordController>>();
+            var ctrl = new EntityMappingRecordController(null, ecrs, null, log.Object);
+            var res = await ctrl.UpdateEntityMappings("id", m);
             res.ShouldBeOfType<BadRequestResult>();
         }
+        public static IEnumerable<object[]> UpdateEntityMappings_InvalidRequest_ReturnsBadRequest_DATA => new[]
+        {
+            new object[]{new EntityMappingRequestModel { ParentEntityKey = "not-exists", ChildEntityKey = "Exists" } },
+            new object[]{new EntityMappingRequestModel { ParentEntityKey = "exists", ChildEntityKey = "not-exists"} },
+        };
+        [Fact]
+        public async Task UpdateEntityMappings_ReturnsserviceResponse()
+        {
+            var ecrs = new[]
+            {
+                new EntityConfigRecord{Name = "e1", ExternalName="e1"},
+                new EntityConfigRecord{Name = "e2", ExternalName="e2"},
+            };
+            var mgr = new Mock<IEntityMappingRecordManager>();
+            mgr.Setup(m => m.UpdateMapping(It.IsAny<EntityMappingRequest>())).ReturnsAsync(new ServiceResponse<EntityMappingRequest> { Result = ServiceResult.Accepted });
+
+            var srm = new Mock<IServiceResponseMapper>();
+
+            var log = new Mock<ILogger<EntityMappingRecordController>>();
+            var ctrl = new EntityMappingRecordController(mgr.Object, ecrs, srm.Object, log.Object);
+
+            var model = new EntityMappingRequestModel { ParentEntityKey = "e1", ChildEntityKey = "e2" };
+            await ctrl.UpdateEntityMappings("id", model);
+
+            srm.Verify(s => s.MapServiceResponse(It.Is<ServiceResponse<EntityMappingRequest>>(sr => sr.Result == ServiceResult.Accepted)), Times.Once);
+        }
         #endregion
+
     }
 }
diff --git a/src/AnyService.Tests/EntityConfigRecordExtensionsTests.cs b/src/AnyService.Tests/EntityConfigRecordExtensionsTests.cs
@@ -1,5 +1,4 @@
-using AutoMapper.Configuration.Annotations;
-using Shouldly;
+using Shouldly;
 using System;
 using System.Collections.Generic;
 using System.Linq;