1 files changed, 23 insertions, 62 deletions
diff --git a/BackEnd/Timeline/Controllers/TimelineController.cs b/BackEnd/Timeline/Controllers/TimelineController.cs
index 497d7893..f04982dc 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
     /// </summary>
     [ApiController]
     [Route("timelines")]
-    [CatchTimelineNotExistException]
     [ProducesErrorResponseType(typeof(CommonResponse))]
     public class TimelineController : Controller
     {
@@ -29,9 +27,6 @@ namespace Timeline.Controllers
         private readonly ITimelineService _service;
         private readonly IGenericMapper _mapper;
 
-        /// <summary>
-        /// 
-        /// </summary>
         public TimelineController(IUserService userService, ITimelineService service, IGenericMapper mapper)
         {
             _userService = userService;
@@ -87,7 +82,7 @@ namespace Timeline.Controllers
                     }
                     else
                     {
-                        return BadRequest(ErrorResponse.Common.CustomMessage_InvalidModel(Resources.Messages.TimelineController_QueryVisibilityUnknown, item));
+                        return this.BadRequestWithCommonResponse(ErrorCodes.Common.InvalidModel, string.Format(Resource.MessageTimelineListQueryVisibilityUnknown, visibility));
                     }
                 }
             }
@@ -103,9 +98,9 @@ namespace Timeline.Controllers
 
                     relationship = new TimelineUserRelationship(relationType, relatedUserId);
                 }
-                catch (UserNotExistException)
+                catch (EntityNotExistException)
                 {
-                    return BadRequest(ErrorResponse.TimelineController.QueryRelateNotExist());
+                    return this.BadRequestWithCommonResponse(ErrorCodes.TimelineController.QueryRelateNotExist, Resource.MessageTimelineListQueryRelateNotExist);
                 }
             }
 
@@ -148,20 +143,13 @@ namespace Timeline.Controllers
 
             if (!UserHasAllTimelineManagementPermission && !await _service.HasManagePermissionAsync(timelineId, this.GetUserId()))
             {
-                return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid());
+                return this.ForbidWithMessage();
             }
 
-            try
-            {
-                await _service.ChangePropertyAsync(timelineId, _mapper.AutoMapperMap<TimelineChangePropertyParams>(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<TimelineChangePropertyParams>(body));
+            var t = await _service.GetTimelineAsync(timelineId);
+            var result = await Map(t);
+            return result;
         }
 
         /// <summary>
@@ -181,19 +169,12 @@ namespace Timeline.Controllers
 
             if (!UserHasAllTimelineManagementPermission && !(await _service.HasManagePermissionAsync(timelineId, this.GetUserId())))
             {
-                return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid());
+                return this.ForbidWithMessage();
             }
 
-            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));
         }
 
         /// <summary>
@@ -213,19 +194,13 @@ namespace Timeline.Controllers
 
             if (!UserHasAllTimelineManagementPermission && !(await _service.HasManagePermissionAsync(timelineId, this.GetUserId())))
             {
-                return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid());
+                return this.ForbidWithMessage();
             }
 
-            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));
         }
 
         /// <summary>
@@ -242,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;
         }
 
         /// <summary>
@@ -271,18 +239,11 @@ namespace Timeline.Controllers
 
             if (!UserHasAllTimelineManagementPermission && !(await _service.HasManagePermissionAsync(timelineId, this.GetUserId())))
             {
-                return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid());
+                return this.ForbidWithMessage();
             }
 
-            try
-            {
-                await _service.DeleteTimelineAsync(timelineId);
-                return Ok();
-            }
-            catch (TimelineNotExistException)
-            {
-                return BadRequest(ErrorResponse.TimelineController.NotExist());
-            }
+            await _service.DeleteTimelineAsync(timelineId);
+            return Ok();
         }
     }
 }