From 1c4be4a43c4acd2ee46e37685e9153d9c5b34233 Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 3 May 2021 00:34:30 +0800 Subject: refactor: ... --- BackEnd/Timeline/Controllers/ActionResultControllerExtensions.cs | 5 +++++ BackEnd/Timeline/Controllers/TimelineController.cs | 2 +- BackEnd/Timeline/Controllers/TimelinePostController.cs | 2 +- BackEnd/Timeline/Controllers/UserController.cs | 8 ++------ 4 files changed, 9 insertions(+), 8 deletions(-) (limited to 'BackEnd/Timeline/Controllers') diff --git a/BackEnd/Timeline/Controllers/ActionResultControllerExtensions.cs b/BackEnd/Timeline/Controllers/ActionResultControllerExtensions.cs index a3da73fa..a7a5486c 100644 --- a/BackEnd/Timeline/Controllers/ActionResultControllerExtensions.cs +++ b/BackEnd/Timeline/Controllers/ActionResultControllerExtensions.cs @@ -16,6 +16,11 @@ namespace Timeline.Controllers return controller.StatusCode(StatusCodes.Status403Forbidden, new CommonResponse(ErrorCodes.Common.Forbid, message ?? Resource.MessageForbid)); } + public static ObjectResult Delete(this ControllerBase controller, bool delete = true) + { + return controller.StatusCode(StatusCodes.Status200OK, CommonDeleteResponse.Create(delete)); + } + public static BadRequestObjectResult BadRequestWithCommonResponse(this ControllerBase controller, int code, string message) { return controller.BadRequest(new CommonResponse(code, message)); diff --git a/BackEnd/Timeline/Controllers/TimelineController.cs b/BackEnd/Timeline/Controllers/TimelineController.cs index f04982dc..7347f135 100644 --- a/BackEnd/Timeline/Controllers/TimelineController.cs +++ b/BackEnd/Timeline/Controllers/TimelineController.cs @@ -243,7 +243,7 @@ namespace Timeline.Controllers } await _service.DeleteTimelineAsync(timelineId); - return Ok(); + return this.Delete(); } } } diff --git a/BackEnd/Timeline/Controllers/TimelinePostController.cs b/BackEnd/Timeline/Controllers/TimelinePostController.cs index 9f69b59b..09e7e624 100644 --- a/BackEnd/Timeline/Controllers/TimelinePostController.cs +++ b/BackEnd/Timeline/Controllers/TimelinePostController.cs @@ -266,7 +266,7 @@ namespace Timeline.Controllers await _postService.DeletePostAsync(timelineId, post); - return Ok(); + return this.Delete(); } } } diff --git a/BackEnd/Timeline/Controllers/UserController.cs b/BackEnd/Timeline/Controllers/UserController.cs index ec732caa..47d2ee41 100644 --- a/BackEnd/Timeline/Controllers/UserController.cs +++ b/BackEnd/Timeline/Controllers/UserController.cs @@ -129,11 +129,8 @@ namespace Timeline.Controllers { try { - var delete = await _userDeleteService.DeleteUserAsync(username); - if (delete) - return Ok(CommonDeleteResponse.Delete()); - else - return Ok(CommonDeleteResponse.NotExist()); + await _userDeleteService.DeleteUserAsync(username); + return this.Delete(); } catch (InvalidOperationOnRootUserException) { @@ -187,7 +184,6 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status401Unauthorized)] [ProducesResponseType(StatusCodes.Status403Forbidden)] - [ProducesResponseType(StatusCodes.Status404NotFound)] public async Task DeleteUserPermission([FromRoute][Username] string username, [FromRoute] UserPermission permission) { try -- cgit v1.2.3