From 2d5f664739a7370e1128b675381ce3fe347abc4b Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 22 Jan 2019 14:10:33 +0300
Subject: [PATCH] Blogging module: controllers refactor & fixes

---
 .../Volo/Blogging/BlogsController.cs          |  4 +---
 .../Volo/Blogging/CommentsController.cs       | 19 ++++++++++++-------
 .../Volo/Blogging/PostsController.cs          | 16 +++++++---------
 .../Volo/Blogging/TagsController.cs           |  3 ---
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BlogsController.cs b/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BlogsController.cs
index 357dfe8b7f..9fbb70f849 100644
--- a/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BlogsController.cs
+++ b/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BlogsController.cs
@@ -12,10 +12,7 @@ namespace Volo.Blogging
 {
     [RemoteService]
     [Area("blogging")]
-    [Controller]
-    [ControllerName("Blogs")]
     [Route("api/blogging/blogs")]
-    [DisableAuditing]
     public class BlogsController : AbpController, IBlogAppService
     {
         private readonly IBlogAppService _blogAppService;
@@ -66,6 +63,7 @@ namespace Volo.Blogging
         }
 
         [HttpDelete]
+        [Route("{id}")]
         public async Task Delete(Guid id)
         {
             await _blogAppService.Delete(id);
diff --git a/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/CommentsController.cs b/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/CommentsController.cs
index 64a079edfb..518a37b809 100644
--- a/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/CommentsController.cs
+++ b/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/CommentsController.cs
@@ -13,33 +13,38 @@ namespace Volo.Blogging
 {
     [RemoteService]
     [Area("blogging")]
-    [Controller]
-    [ControllerName("Comments")]
     [Route("api/blogging/comments")]
-    [DisableAuditing]
     public class CommentsController : AbpController, ICommentAppService
     {
+        private readonly ICommentAppService _commentAppService;
+
+        public CommentsController(ICommentAppService commentAppService)
+        {
+            _commentAppService = commentAppService;
+        }
+
         [HttpGet]
-        [Route("{postId}")]
+        [Route("hierarchical/{postId}")]
         public Task<List<CommentWithRepliesDto>> GetHierarchicalListOfPostAsync(Guid postId)
         {
-            throw new NotImplementedException();
+            return _commentAppService.GetHierarchicalListOfPostAsync(postId);
         }
 
         [HttpPost]
         public Task<CommentWithDetailsDto> CreateAsync(CreateCommentDto input)
         {
-            throw new NotImplementedException();
+            return _commentAppService.CreateAsync(input);
         }
 
         [HttpPut]
         [Route("{id}")]
         public Task<CommentWithDetailsDto> UpdateAsync(Guid id, UpdateCommentDto input)
         {
-            throw new NotImplementedException();
+            return _commentAppService.UpdateAsync(id, input);
         }
 
         [HttpDelete]
+        [Route("{id}")]
         public Task DeleteAsync(Guid id)
         {
             throw new NotImplementedException();
diff --git a/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/PostsController.cs b/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/PostsController.cs
index 87e5551cd2..22b68cd292 100644
--- a/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/PostsController.cs
+++ b/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/PostsController.cs
@@ -11,10 +11,7 @@ namespace Volo.Blogging
 {
     [RemoteService]
     [Area("blogging")]
-    [Controller]
-    [ControllerName("Posts")]
     [Route("api/blogging/posts")]
-    [DisableAuditing]
     public class PostsController : AbpController, IPostAppService
     {
         private readonly IPostAppService _postAppService;
@@ -45,12 +42,6 @@ namespace Volo.Blogging
             return _postAppService.GetAsync(id);
         }
 
-        [HttpDelete]
-        public Task DeleteAsync(Guid id)
-        {
-            return _postAppService.DeleteAsync(id);
-        }
-
         [HttpPost]
         public Task<PostWithDetailsDto> CreateAsync(CreatePostDto input)
         {
@@ -63,5 +54,12 @@ namespace Volo.Blogging
         {
             return _postAppService.UpdateAsync(id, input);
         }
+
+        [HttpDelete]
+        [Route("{id}")]
+        public Task DeleteAsync(Guid id)
+        {
+            return _postAppService.DeleteAsync(id);
+        }
     }
 }
diff --git a/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/TagsController.cs b/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/TagsController.cs
index 71310c065d..bdb7d1d77c 100644
--- a/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/TagsController.cs
+++ b/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/TagsController.cs
@@ -12,10 +12,7 @@ namespace Volo.Blogging
 {
     [RemoteService]
     [Area("blogging")]
-    [Controller]
-    [ControllerName("Tags")]
     [Route("api/blogging/tags")]
-    [DisableAuditing]
     public class TagsController : AbpController, ITagAppService
     {
         private readonly ITagAppService _tagAppService;