From 4ea535d93753826ec900879560d876cec4d58c38 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 10 Feb 2021 02:03:06 +0800
Subject: ...

---
 BackEnd/Timeline/Models/Http/HttpTimelinePost.cs   | 11 ++++---
 .../Models/Http/HttpTimelinePostContent.cs         | 35 ----------------------
 .../Models/Http/HttpTimelinePostCreateRequest.cs   | 22 ++++++++++++--
 .../Http/HttpTimelinePostCreateRequestContent.cs   | 26 ----------------
 .../Models/Http/HttpTimelinePostDataDigest.cs      | 23 ++++++++++++++
 5 files changed, 48 insertions(+), 69 deletions(-)
 delete mode 100644 BackEnd/Timeline/Models/Http/HttpTimelinePostContent.cs
 delete mode 100644 BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequestContent.cs
 create mode 100644 BackEnd/Timeline/Models/Http/HttpTimelinePostDataDigest.cs

(limited to 'BackEnd/Timeline/Models/Http')

diff --git a/BackEnd/Timeline/Models/Http/HttpTimelinePost.cs b/BackEnd/Timeline/Models/Http/HttpTimelinePost.cs
index 5981d7a4..165c92da 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;
@@ -24,10 +26,7 @@ namespace Timeline.Models.Http
         /// Post id.
         /// </summary>
         public long Id { get; set; }
-        /// <summary>
-        /// Content of the post. May be null if post is deleted.
-        /// </summary>
-        public HttpTimelinePostContent? Content { get; set; }
+        public List<HttpTimelinePostDataDigest> DataList { get; set; } = default!;
         /// <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..20d1a25b 100644
--- a/BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequest.cs
+++ b/BackEnd/Timeline/Models/Http/HttpTimelinePostCreateRequest.cs
@@ -1,16 +1,34 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Timeline.Models.Validation;
 
 namespace Timeline.Models.Http
 {
+    public class HttpTimelinePostCreateRequestData
+    {
+        /// <summary>
+        /// Kind of the data.
+        /// </summary>
+        [Required]
+        [TimelinePostDataKind]
+        public string Kind { get; set; } = default!;
+
+        /// <summary>
+        /// The true data. If kind is text or markdown, this is a string. If kind is image, this is base64 of data.
+        /// </summary>
+        [Required]
+        public string Data { get; set; } = default!;
+    }
+
     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)]
+        public List<HttpTimelinePostCreateRequestData> DataList { get; set; } = default!;
 
         /// <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/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; }
+    }
+}
-- 
cgit v1.2.3