From a1f6b41accb47e4c1e1e0474148afa94732377da Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 7 Apr 2022 21:52:26 +0800
Subject: ...

---
 BackEnd/Timeline/Controllers/Resource.Designer.cs  |  9 +++++++++
 BackEnd/Timeline/Controllers/Resource.resx         |  3 +++
 BackEnd/Timeline/Controllers/TimelineController.cs | 16 ++++++++++++----
 3 files changed, 24 insertions(+), 4 deletions(-)

(limited to 'BackEnd/Timeline/Controllers')

diff --git a/BackEnd/Timeline/Controllers/Resource.Designer.cs b/BackEnd/Timeline/Controllers/Resource.Designer.cs
index eeb2f0fa..4c9da98a 100644
--- a/BackEnd/Timeline/Controllers/Resource.Designer.cs
+++ b/BackEnd/Timeline/Controllers/Resource.Designer.cs
@@ -111,6 +111,15 @@ namespace Timeline.Controllers {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Multiple timeline with the name exists. Please use new api to get timeline..
+        /// </summary>
+        internal static string MessageMultipleTimeline {
+            get {
+                return ResourceManager.GetString("MessageMultipleTimeline", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The old password is wrong..
         /// </summary>
diff --git a/BackEnd/Timeline/Controllers/Resource.resx b/BackEnd/Timeline/Controllers/Resource.resx
index b70e5230..004bd7cc 100644
--- a/BackEnd/Timeline/Controllers/Resource.resx
+++ b/BackEnd/Timeline/Controllers/Resource.resx
@@ -159,4 +159,7 @@
   <data name="MessageUsernameConflict" xml:space="preserve">
     <value>A user with given username already exists.</value>
   </data>
+  <data name="MessageMultipleTimeline" xml:space="preserve">
+    <value>Multiple timeline with the name exists. Please use new api to get timeline.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BackEnd/Timeline/Controllers/TimelineController.cs b/BackEnd/Timeline/Controllers/TimelineController.cs
index a6749706..c10a8793 100644
--- a/BackEnd/Timeline/Controllers/TimelineController.cs
+++ b/BackEnd/Timeline/Controllers/TimelineController.cs
@@ -117,13 +117,21 @@ namespace Timeline.Controllers
         /// <returns>The timeline info.</returns>
         [HttpGet("{timeline}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         public async Task<ActionResult<HttpTimeline>> TimelineGet([FromRoute][GeneralTimelineName] string timeline)
         {
-            var timelineId = await _service.GetTimelineIdByNameAsync(timeline);
-            var t = await _service.GetTimelineAsync(timelineId);
-            var result = await Map(t);
-            return result;
+            try
+            {
+                var timelineId = await _service.GetTimelineIdByNameAsync(timeline);
+                var t = await _service.GetTimelineAsync(timelineId);
+                var result = await Map(t);
+                return result;
+            }
+            catch (MultipleTimelineException)
+            {
+                return BadRequestWithCommonResponse(ErrorCodes.TimelineController.MultipleTimelineWithSameName, Resource.MessageMultipleTimeline);
+            }
         }
 
         /// <summary>
-- 
cgit v1.2.3