Merge pull request #267 from crupest/backend

春节大换血 Spring festival big change.

7 files changed, 57 insertions, 78 deletions

diff --git a/BackEnd/Timeline/Models/Http/ErrorResponse.cs b/BackEnd/Timeline/Models/Http/ErrorResponse.cs
index 1bc46680..3812471d 100644
--- a/BackEnd/Timeline/Models/Http/ErrorResponse.cs
+++ b/BackEnd/Timeline/Models/Http/ErrorResponse.cs
@@ -253,17 +253,6 @@ namespace Timeline.Models.Http
             {

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

             }

-

-            public static CommonResponse PostNoData(params object?[] formatArgs)

-            {

-                return new CommonResponse(ErrorCodes.TimelineController.PostNoData, string.Format(TimelineController_PostNoData, formatArgs));

-            }

-

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

-            {

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

-            }

-

         }

 

     }

diff --git a/BackEnd/Timeline/Models/Http/HttpTimelinePost.cs b/BackEnd/Timeline/Models/Http/HttpTimelinePost.cs
index 5981d7a4..26e1a92d 100644
--- a/BackEnd/Timeline/Models/Http/HttpTimelinePost.cs
+++ b/BackEnd/Timeline/Models/Http/HttpTimelinePost.cs
@@ -1,7 +1,9 @@
 using System;

+using System.Collections.Generic;

 

 namespace Timeline.Models.Http

 {

+

     /// <summary>

     /// Info of a post.

     /// </summary>

@@ -9,10 +11,10 @@ namespace Timeline.Models.Http
     {

         public HttpTimelinePost() { }

 

-        public HttpTimelinePost(long id, HttpTimelinePostContent? content, bool deleted, DateTime time, HttpUser? author, string? color, DateTime lastUpdated)

+        public HttpTimelinePost(long id, List<HttpTimelinePostDataDigest> dataList, bool deleted, DateTime time, HttpUser? author, string? color, DateTime lastUpdated)

         {

             Id = id;

-            Content = content;

+            DataList = dataList;

             Deleted = deleted;

             Time = time;

             Author = author;

@@ -25,9 +27,11 @@ namespace Timeline.Models.Http
         /// </summary>

         public long Id { get; set; }

         /// <summary>

-        /// Content of the post. May be null if post is deleted.

+        /// The data list.

         /// </summary>

-        public HttpTimelinePostContent? Content { get; set; }

+#pragma warning disable CA2227

+        public List<HttpTimelinePostDataDigest> DataList { get; set; } = default!;

+#pragma warning restore CA2227

         /// <summary>

         /// True if post is deleted.

         /// </summary>

diff --git a/BackEnd/Timeline/Models/Http/HttpTimelinePostContent.cs b/BackEnd/Timeline/Models/Http/HttpTimelinePostContent.cs
deleted file mode 100644
index 55ff1ac2..00000000
--- a/BackEnd/Timeline/Models/Http/HttpTimelinePostContent.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace Timeline.Models.Http

-{

-    /// <summary>

-    /// Info of post content.

-    /// </summary>

-    public class HttpTimelinePostContent

-    {

-        public HttpTimelinePostContent() { }

-

-        public HttpTimelinePostContent(string type, string? text, string? url, string? eTag)

-        {

-            Type = type;

-            Text = text;

-            Url = url;

-            ETag = eTag;

-        }

-

-        /// <summary>

-        /// Type of the post content.

-        /// </summary>

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

-        /// <summary>

-        /// If post is of text type. This is the text.

-        /// </summary>

-        public string? Text { get; set; }

-        /// <summary>

-        /// If post is of image type. This is the image url.

-        /// </summary>

-        public string? Url { get; set; }

-        /// <summary>

-        /// If post has data (currently it means it's a image post), this is the data etag.

-        /// </summary>

-        public string? ETag { get; set; }

-    }

-}

diff --git a/BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequest.cs b/BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequest.cs
index b25adf36..2a973c72 100644
--- a/BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequest.cs
+++ b/BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequest.cs
@@ -1,4 +1,5 @@
 using System;

+using System.Collections.Generic;

 using System.ComponentModel.DataAnnotations;

 using Timeline.Models.Validation;

 

@@ -7,10 +8,14 @@ namespace Timeline.Models.Http
     public class HttpTimelinePostCreateRequest

     {

         /// <summary>

-        /// Content of the new post.

+        /// Data list of the new content.

         /// </summary>

         [Required]

-        public HttpTimelinePostCreateRequestContent Content { get; set; } = default!;

+        [MinLength(1)]

+        [MaxLength(100)]

+#pragma warning disable CA2227

+        public List<HttpTimelinePostCreateRequestData> DataList { get; set; } = default!;

+#pragma warning restore CA2227

 

         /// <summary>

         /// Time of the post. If not set, current time will be used.

diff --git a/BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequestContent.cs b/BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequestContent.cs
deleted file mode 100644
index 12ab407f..00000000
--- a/BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequestContent.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.ComponentModel.DataAnnotations;

-using Timeline.Models.Validation;

-

-namespace Timeline.Models.Http

-{

-    /// <summary>

-    /// Content of post create request.

-    /// </summary>

-    public class HttpTimelinePostCreateRequestContent

-    {

-        /// <summary>

-        /// Type of post content.

-        /// </summary>

-        [Required]

-        [TimelinePostContentType]

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

-        /// <summary>

-        /// If post is of text type, this is the text.

-        /// </summary>

-        public string? Text { get; set; }

-        /// <summary>

-        /// If post is of image type, this is base64 of image data.

-        /// </summary>

-        public string? Data { get; set; }

-    }

-}

diff --git a/BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequestData.cs b/BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequestData.cs
new file mode 100644
index 00000000..94ee5aa7
--- /dev/null
+++ b/BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequestData.cs
@@ -0,0 +1,19 @@
+using System.ComponentModel.DataAnnotations;

+

+namespace Timeline.Models.Http

+{

+    public class HttpTimelinePostCreateRequestData

+    {

+        /// <summary>

+        /// Mime type of the data.

+        /// </summary>

+        [Required]

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

+

+        /// <summary>

+        /// Base64 of data.

+        /// </summary>

+        [Required]

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

+    }

+}

diff --git a/BackEnd/Timeline/Models/Http/HttpTimelinePostDataDigest.cs b/BackEnd/Timeline/Models/Http/HttpTimelinePostDataDigest.cs
new file mode 100644
index 00000000..61d35e15
--- /dev/null
+++ b/BackEnd/Timeline/Models/Http/HttpTimelinePostDataDigest.cs
@@ -0,0 +1,23 @@
+using System;

+

+namespace Timeline.Models.Http

+{

+    public class HttpTimelinePostDataDigest

+    {

+        public HttpTimelinePostDataDigest()

+        {

+

+        }

+

+        public HttpTimelinePostDataDigest(string kind, string eTag, DateTime lastUpdated)

+        {

+            Kind = kind;

+            ETag = eTag;

+            LastUpdated = lastUpdated;

+        }

+

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

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

+        public DateTime LastUpdated { get; set; }

+    }

+}