Merge pull request #57 from crupest/dev

Add normal timeline feature.

3 files changed, 80 insertions, 10 deletions

diff --git a/Timeline/Models/Http/ErrorResponse.cs b/Timeline/Models/Http/ErrorResponse.cs
index 87516638..0d23fe59 100644
--- a/Timeline/Models/Http/ErrorResponse.cs
+++ b/Timeline/Models/Http/ErrorResponse.cs
@@ -1,4 +1,5 @@
-using static Timeline.Resources.Messages;

+

+using static Timeline.Resources.Messages;

 

 namespace Timeline.Models.Http

 {

@@ -241,21 +242,41 @@ namespace Timeline.Models.Http
 

         }

 

-        public static class TimelineController

+        public static class TimelineCommon

         {

 

+            public static CommonResponse NameConflict(params object?[] formatArgs)

+            {

+                return new CommonResponse(ErrorCodes.TimelineCommon.NameConflict, string.Format(TimelineCommon_NameConflict, formatArgs));

+            }

+

+            public static CommonResponse CustomMessage_NameConflict(string message, params object?[] formatArgs)

+            {

+                return new CommonResponse(ErrorCodes.TimelineCommon.NameConflict, string.Format(message, formatArgs));

+            }

+

+            public static CommonResponse NotExist(params object?[] formatArgs)

+            {

+                return new CommonResponse(ErrorCodes.TimelineCommon.NotExist, string.Format(TimelineCommon_NotExist, formatArgs));

+            }

+

+            public static CommonResponse CustomMessage_NotExist(string message, params object?[] formatArgs)

+            {

+                return new CommonResponse(ErrorCodes.TimelineCommon.NotExist, string.Format(message, formatArgs));

+            }

+

             public static CommonResponse MemberPut_NotExist(params object?[] formatArgs)

             {

-                return new CommonResponse(ErrorCodes.TimelineController.MemberPut_NotExist, string.Format(TimelineController_MemberPut_NotExist, formatArgs));

+                return new CommonResponse(ErrorCodes.TimelineCommon.MemberPut_NotExist, string.Format(TimelineCommon_MemberPut_NotExist, formatArgs));

             }

 

             public static CommonResponse CustomMessage_MemberPut_NotExist(string message, params object?[] formatArgs)

             {

-                return new CommonResponse(ErrorCodes.TimelineController.MemberPut_NotExist, string.Format(message, formatArgs));

+                return new CommonResponse(ErrorCodes.TimelineCommon.MemberPut_NotExist, string.Format(message, formatArgs));

             }

 

         }

 

     }

 

-}
\ No newline at end of file
+}

diff --git a/Timeline/Models/Http/TimelineCommon.cs b/Timeline/Models/Http/TimelineCommon.cs
index febb8186..1cb47dac 100644
--- a/Timeline/Models/Http/TimelineCommon.cs
+++ b/Timeline/Models/Http/TimelineCommon.cs
@@ -1,5 +1,7 @@
-using System;

+using Microsoft.AspNetCore.Mvc;

+using System;

 using System.Collections.Generic;

+using Timeline.Controllers;

 

 namespace Timeline.Models.Http

 {

@@ -28,17 +30,56 @@ namespace Timeline.Models.Http
         public DateTime LastUpdated { get; set; } = default!;

     }

 

-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "This is a DTO class.")]

-    public class BaseTimelineInfo

+    public class TimelineInfo

     {

+        public string? Name { get; set; }

         public string Description { get; set; } = default!;

         public UserInfo Owner { get; set; } = default!;

         public TimelineVisibility Visibility { get; set; }

+#pragma warning disable CA2227 // Collection properties should be read only

         public List<UserInfo> Members { get; set; } = default!;

+#pragma warning restore CA2227 // Collection properties should be read only

+

+#pragma warning disable CA1707 // Identifiers should not contain underscores

+        public TimelineInfoLinks? _links { get; set; }

+#pragma warning restore CA1707 // Identifiers should not contain underscores

     }

 

-    public class TimelineInfo : BaseTimelineInfo

+    public class TimelineInfoLinks

     {

-        public string Name { get; set; } = default!;

+        public string Posts { get; set; } = default!;

+    }

+

+    public static class TimelineInfoExtensions

+    {

+        public static TimelineInfo FillLinksForPersonalTimeline(this TimelineInfo info, IUrlHelper urlHelper)

+        {

+            if (info == null)

+                throw new ArgumentNullException(nameof(info));

+            if (urlHelper == null)

+                throw new ArgumentNullException(nameof(urlHelper));

+

+            info._links = new TimelineInfoLinks

+            {

+                Posts = urlHelper.ActionLink(nameof(PersonalTimelineController.PostListGet), nameof(PersonalTimelineController)[0..^nameof(Controller).Length], new { info.Owner.Username })

+            };

+

+            return info;

+        }

+

+        public static TimelineInfo FillLinksForNormalTimeline(this TimelineInfo info, IUrlHelper urlHelper)

+        {

+            if (info == null)

+                throw new ArgumentNullException(nameof(info));

+            if (urlHelper == null)

+                throw new ArgumentNullException(nameof(urlHelper));

+

+            info._links = new TimelineInfoLinks

+            {

+                Posts = urlHelper.ActionLink(nameof(TimelineController.PostListGet), nameof(TimelineController)[0..^nameof(Controller).Length], new { info.Name })

+            };

+

+            return info;

+        }

     }

 }

diff --git a/Timeline/Models/Http/TimelineController.cs b/Timeline/Models/Http/TimelineController.cs
index f9a4d3e5..6d461bb9 100644
--- a/Timeline/Models/Http/TimelineController.cs
+++ b/Timeline/Models/Http/TimelineController.cs
@@ -1,5 +1,6 @@
 using System;

 using System.ComponentModel.DataAnnotations;

+using Timeline.Models.Validation;

 

 namespace Timeline.Models.Http

 {

@@ -11,6 +12,13 @@ namespace Timeline.Models.Http
         public DateTime? Time { get; set; }

     }

 

+    public class TimelineCreateRequest

+    {

+        [Required]

+        [TimelineName]

+        public string Name { get; set; } = default!;

+    }

+

     public class TimelinePatchRequest

     {

         public string? Description { get; set; }