Merge pull request #7085 from abpframework/cms-kit/refactoring

CmsKit - Remove huge content value from list items
abpframework · Jan 19, 2021 · badad8d · badad8d
2 parents 739a4f5 + 8fe9a59
commit badad8d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 2 deletions.
diff --git a/...c/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentGetListDto.cs b/...c/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentGetListDto.cs
@@ -0,0 +1,12 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Volo.CmsKit.Admin.Contents
+{
+    public class ContentGetListDto : EntityDto<Guid>
+    {
+        public string EntityType { get; set; }
+
+        public string EntityId { get; set; }
+    }
+}
diff --git a/....CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/IContentAdminAppService.cs b/....CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/IContentAdminAppService.cs
@@ -7,6 +7,7 @@ namespace Volo.CmsKit.Admin.Contents
     public interface IContentAdminAppService 
         : ICrudAppService<
             ContentDto,
+            ContentGetListDto,
             Guid,
             ContentGetListInput,
             ContentCreateDto,

diff --git a/...olo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs b/...olo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs
@@ -13,6 +13,7 @@ public CmsKitAdminApplicationAutoMapperProfile()
             CreateMap<Page, PageDto>();
 
             CreateMap<Content, ContentDto>(MemberList.Destination);
+            CreateMap<Content, ContentGetListDto>(MemberList.Destination);
             CreateMap<ContentCreateDto, Content>(MemberList.Source);
             CreateMap<ContentUpdateDto, Content>(MemberList.Source);
         }

diff --git a/...it/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs b/...it/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs
@@ -14,6 +14,7 @@ public class ContentAdminAppService :
         CrudAppService<
             Content,
             ContentDto,
+            ContentGetListDto,
             Guid,
             ContentGetListInput,
             ContentCreateDto,
@@ -51,7 +52,7 @@ public override async Task<ContentDto> CreateAsync(ContentCreateDto input)
 
             await ContentManager.InsertAsync(entity);
 
-            return MapToGetListOutputDto(entity);
+            return MapToGetOutputDto(entity);
         }
     }
 }
diff --git a/...ms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Contents/ContentAdminController.cs b/...ms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Contents/ContentAdminController.cs
@@ -48,7 +48,7 @@ public Task<ContentDto> GetAsync(Guid id)
 
         [HttpGet]
         [Authorize(CmsKitAdminPermissions.Contents.Default)]
-        public Task<PagedResultDto<ContentDto>> GetListAsync(ContentGetListInput input)
+        public Task<PagedResultDto<ContentGetListDto>> GetListAsync(ContentGetListInput input)
         {
             return ContentAdminAppService.GetListAsync(input);
         }

diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentAdminAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentAdminAppService_Tests.cs
@@ -38,6 +38,7 @@ public async Task ShouldGetListAsync()
             result.ShouldNotBeNull();
             result.Items.ShouldNotBeEmpty();
             result.Items.Count.ShouldBe(4);
+            result.Items.All(x => x.ShouldBeOfType<ContentGetListDto>() != null);
         }
 
         [Fact]
@@ -46,6 +47,8 @@ public async Task ShouldGetAsync()
             var result = await _service.GetAsync(_data.Content_1_Id);
 
             result.ShouldNotBeNull();
+            result.ShouldBeOfType<Admin.Contents.ContentDto>();
+            result.ShouldNotBeNull(result.Value);
         }
 
         [Fact]