From 88002173a1155883d1fb46683a9a7ad1f521eb56 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 30 Apr 2021 16:52:55 +0800 Subject: refactor: ... --- BackEnd/Timeline/Controllers/TimelineController.cs | 70 ++++++---------------- 1 file changed, 17 insertions(+), 53 deletions(-) (limited to 'BackEnd/Timeline/Controllers/TimelineController.cs') diff --git a/BackEnd/Timeline/Controllers/TimelineController.cs b/BackEnd/Timeline/Controllers/TimelineController.cs index 3fd0f2ac..bb770ea0 100644 --- a/BackEnd/Timeline/Controllers/TimelineController.cs +++ b/BackEnd/Timeline/Controllers/TimelineController.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Timeline.Entities; -using Timeline.Filters; using Timeline.Models; using Timeline.Models.Http; using Timeline.Models.Validation; @@ -21,7 +20,6 @@ namespace Timeline.Controllers /// [ApiController] [Route("timelines")] - [CatchTimelineNotExistException] [ProducesErrorResponseType(typeof(CommonResponse))] public class TimelineController : Controller { @@ -100,7 +98,7 @@ namespace Timeline.Controllers relationship = new TimelineUserRelationship(relationType, relatedUserId); } - catch (UserNotExistException) + catch (EntityNotExistException) { return BadRequest(ErrorResponse.TimelineController.QueryRelateNotExist()); } @@ -148,17 +146,10 @@ namespace Timeline.Controllers return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } - try - { - await _service.ChangePropertyAsync(timelineId, _mapper.AutoMapperMap(body)); - var t = await _service.GetTimelineAsync(timelineId); - var result = await Map(t); - return result; - } - catch (EntityAlreadyExistException) - { - return BadRequest(ErrorResponse.TimelineController.NameConflict()); - } + await _service.ChangePropertyAsync(timelineId, _mapper.AutoMapperMap(body)); + var t = await _service.GetTimelineAsync(timelineId); + var result = await Map(t); + return result; } /// @@ -181,16 +172,9 @@ namespace Timeline.Controllers return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } - try - { - var userId = await _userService.GetUserIdByUsernameAsync(member); - var create = await _service.AddMemberAsync(timelineId, userId); - return Ok(CommonPutResponse.Create(create)); - } - catch (UserNotExistException) - { - return BadRequest(ErrorResponse.UserCommon.NotExist()); - } + var userId = await _userService.GetUserIdByUsernameAsync(member); + var create = await _service.AddMemberAsync(timelineId, userId); + return Ok(CommonPutResponse.Create(create)); } /// @@ -213,16 +197,10 @@ namespace Timeline.Controllers return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } - try - { - var userId = await _userService.GetUserIdByUsernameAsync(member); - var delete = await _service.RemoveMemberAsync(timelineId, userId); - return Ok(CommonDeleteResponse.Create(delete)); - } - catch (UserNotExistException) - { - return BadRequest(ErrorResponse.UserCommon.NotExist()); - } + + var userId = await _userService.GetUserIdByUsernameAsync(member); + var delete = await _service.RemoveMemberAsync(timelineId, userId); + return Ok(CommonDeleteResponse.Create(delete)); } /// @@ -239,16 +217,9 @@ namespace Timeline.Controllers { var userId = this.GetUserId(); - try - { - var timeline = await _service.CreateTimelineAsync(body.Name, userId); - var result = await Map(timeline); - return result; - } - catch (EntityAlreadyExistException e) when (e.EntityName == EntityNames.Timeline) - { - return BadRequest(ErrorResponse.TimelineController.NameConflict()); - } + var timeline = await _service.CreateTimelineAsync(body.Name, userId); + var result = await Map(timeline); + return result; } /// @@ -271,15 +242,8 @@ namespace Timeline.Controllers return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } - try - { - await _service.DeleteTimelineAsync(timelineId); - return Ok(); - } - catch (TimelineNotExistException) - { - return BadRequest(ErrorResponse.TimelineController.NotExist()); - } + await _service.DeleteTimelineAsync(timelineId); + return Ok(); } } } -- cgit v1.2.3