From 191b92a161c4fdad532dbf471f5c33f8f4a97a23 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 7 Jan 2021 20:36:57 +0800
Subject: refactor: Highlight and bookmark service now use timeline id.

---
 .../Timeline/Controllers/BookmarkTimelineController.cs  | 17 ++++++++++-------
 .../Timeline/Controllers/HighlightTimelineController.cs | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'BackEnd/Timeline/Controllers')

diff --git a/BackEnd/Timeline/Controllers/BookmarkTimelineController.cs b/BackEnd/Timeline/Controllers/BookmarkTimelineController.cs
index 64cb8afa..4313115e 100644
--- a/BackEnd/Timeline/Controllers/BookmarkTimelineController.cs
+++ b/BackEnd/Timeline/Controllers/BookmarkTimelineController.cs
@@ -52,12 +52,13 @@ namespace Timeline.Controllers
         [ProducesResponseType(200)]
         [ProducesResponseType(400)]
         [ProducesResponseType(401)]
-        public async Task<ActionResult> Put([GeneralTimelineName] string timeline)
+        public async Task<ActionResult<CommonPutResponse>> Put([GeneralTimelineName] string timeline)
         {
             try
             {
-                await _service.AddBookmark(this.GetUserId(), timeline);
-                return Ok();
+                var timelineId = await _timelineService.GetTimelineIdByName(timeline);
+                var create = await _service.AddBookmark(this.GetUserId(), timelineId);
+                return CommonPutResponse.Create(create);
             }
             catch (TimelineNotExistException)
             {
@@ -74,12 +75,13 @@ namespace Timeline.Controllers
         [ProducesResponseType(200)]
         [ProducesResponseType(400)]
         [ProducesResponseType(401)]
-        public async Task<ActionResult> Delete([GeneralTimelineName] string timeline)
+        public async Task<ActionResult<CommonDeleteResponse>> Delete([GeneralTimelineName] string timeline)
         {
             try
             {
-                await _service.RemoveBookmark(this.GetUserId(), timeline);
-                return Ok();
+                var timelineId = await _timelineService.GetTimelineIdByName(timeline);
+                var delete = await _service.RemoveBookmark(this.GetUserId(), timelineId);
+                return CommonDeleteResponse.Create(delete);
             }
             catch (TimelineNotExistException)
             {
@@ -100,7 +102,8 @@ namespace Timeline.Controllers
         {
             try
             {
-                await _service.MoveBookmark(this.GetUserId(), request.Timeline, request.NewPosition!.Value);
+                var timelineId = await _timelineService.GetTimelineIdByName(request.Timeline);
+                await _service.MoveBookmark(this.GetUserId(), timelineId, request.NewPosition!.Value);
                 return Ok();
             }
             catch (TimelineNotExistException)
diff --git a/BackEnd/Timeline/Controllers/HighlightTimelineController.cs b/BackEnd/Timeline/Controllers/HighlightTimelineController.cs
index 685ec16f..cc19cada 100644
--- a/BackEnd/Timeline/Controllers/HighlightTimelineController.cs
+++ b/BackEnd/Timeline/Controllers/HighlightTimelineController.cs
@@ -51,12 +51,13 @@ namespace Timeline.Controllers
         [ProducesResponseType(400)]
         [ProducesResponseType(401)]
         [ProducesResponseType(403)]
-        public async Task<ActionResult> Put([GeneralTimelineName] string timeline)
+        public async Task<ActionResult<CommonPutResponse>> Put([GeneralTimelineName] string timeline)
         {
             try
             {
-                await _service.AddHighlightTimeline(timeline, this.GetUserId());
-                return Ok();
+                var timelineId = await _timelineService.GetTimelineIdByName(timeline);
+                var create = await _service.AddHighlightTimeline(timelineId, this.GetUserId());
+                return CommonPutResponse.Create(create);
             }
             catch (TimelineNotExistException)
             {
@@ -74,12 +75,13 @@ namespace Timeline.Controllers
         [ProducesResponseType(400)]
         [ProducesResponseType(401)]
         [ProducesResponseType(403)]
-        public async Task<ActionResult> Delete([GeneralTimelineName] string timeline)
+        public async Task<ActionResult<CommonDeleteResponse>> Delete([GeneralTimelineName] string timeline)
         {
             try
             {
-                await _service.RemoveHighlightTimeline(timeline, this.GetUserId());
-                return Ok();
+                var timelineId = await _timelineService.GetTimelineIdByName(timeline);
+                var delete = await _service.RemoveHighlightTimeline(timelineId, this.GetUserId());
+                return CommonDeleteResponse.Create(delete);
             }
             catch (TimelineNotExistException)
             {
@@ -100,7 +102,8 @@ namespace Timeline.Controllers
         {
             try
             {
-                await _service.MoveHighlightTimeline(body.Timeline, body.NewPosition!.Value);
+                var timelineId = await _timelineService.GetTimelineIdByName(body.Timeline);
+                await _service.MoveHighlightTimeline(timelineId, body.NewPosition!.Value);
                 return Ok();
             }
             catch (TimelineNotExistException)
-- 
cgit v1.2.3