...

4 files changed, 107 insertions, 2 deletions

diff --git a/Timeline/Controllers/TimelineController.cs b/Timeline/Controllers/TimelineController.cs
index 0e5483fa..38fe7475 100644
--- a/Timeline/Controllers/TimelineController.cs
+++ b/Timeline/Controllers/TimelineController.cs
@@ -123,8 +123,52 @@ namespace Timeline.Controllers
                 return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid());

             }

 

-            var res = await _service.CreatePost(name, id, body.Content, body.Time);

-            return res;

+            var content = body.Content;

+

+            TimelinePost post;

+

+            if (content.Type == TimelinePostContentTypes.Text)

+            {

+                var text = content.Text;

+                if (text == null)

+                {

+                    return BadRequest(ErrorResponse.Common.CustomMessage_InvalidModel(Resources.Messages.TimelineController_TextContentTextRequired));

+                }

+                post = await _service.CreateTextPost(name, id, text, body.Time);

+            }

+            else if (content.Type == TimelinePostContentTypes.Image)

+            {

+                var base64Data = content.Data;

+                if (base64Data == null)

+                {

+                    return BadRequest(ErrorResponse.Common.CustomMessage_InvalidModel(Resources.Messages.TimelineController_ImageContentDataRequired));

+                }

+                byte[] data;

+                try

+                {

+                    data = Convert.FromBase64String(base64Data);

+                }

+                catch (FormatException)

+                {

+                    return BadRequest(ErrorResponse.Common.CustomMessage_InvalidModel(Resources.Messages.TimelineController_ImageContentDataNotBase64));

+                }

+

+                try

+                {

+                    post = await _service.CreateImagePost(name, id, data, body.Time);

+                }

+                catch (ImageException)

+                {

+                    return BadRequest(ErrorResponse.Common.CustomMessage_InvalidModel(Resources.Messages.TimelineController_ImageContentDataNotImage));

+                }

+            }

+            else

+            {

+                return BadRequest(ErrorResponse.Common.CustomMessage_InvalidModel(Resources.Messages.TimelineController_ContentUnknownType));

+            }

+

+            var result = _mapper.Map<TimelinePostInfo>(post);

+            return result;

         }

 

         [HttpDelete("timelines/{name}/posts/{id}")]

diff --git a/Timeline/Models/Http/TimelineController.cs b/Timeline/Models/Http/TimelineController.cs
index ce5f3b98..3e2e6b58 100644
--- a/Timeline/Models/Http/TimelineController.cs
+++ b/Timeline/Models/Http/TimelineController.cs
@@ -14,6 +14,7 @@ namespace Timeline.Models.Http
 

     public class TimelinePostCreateRequest

     {

+        [Required]

         public TimelinePostCreateRequestContent Content { get; set; } = default!;

 

         public DateTime? Time { get; set; }

diff --git a/Timeline/Resources/Messages.Designer.cs b/Timeline/Resources/Messages.Designer.cs
index 4123cb8b..fb093f07 100644
--- a/Timeline/Resources/Messages.Designer.cs
+++ b/Timeline/Resources/Messages.Designer.cs
@@ -178,6 +178,42 @@ namespace Timeline.Resources {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to Unknown type of post content..

+        /// </summary>

+        internal static string TimelineController_ContentUnknownType {

+            get {

+                return ResourceManager.GetString("TimelineController_ContentUnknownType", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to Data field is not a valid base64 string in image content..

+        /// </summary>

+        internal static string TimelineController_ImageContentDataNotBase64 {

+            get {

+                return ResourceManager.GetString("TimelineController_ImageContentDataNotBase64", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to Data field is not a valid image after base64 decoding in image content..

+        /// </summary>

+        internal static string TimelineController_ImageContentDataNotImage {

+            get {

+                return ResourceManager.GetString("TimelineController_ImageContentDataNotImage", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to Data field is required for image content..

+        /// </summary>

+        internal static string TimelineController_ImageContentDataRequired {

+            get {

+                return ResourceManager.GetString("TimelineController_ImageContentDataRequired", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to The user specified by query param &quot;relate&quot; does not exist..

         /// </summary>

         internal static string TimelineController_QueryRelateNotExist {

@@ -196,6 +232,15 @@ namespace Timeline.Resources {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to Text field is required for text content..

+        /// </summary>

+        internal static string TimelineController_TextContentTextRequired {

+            get {

+                return ResourceManager.GetString("TimelineController_TextContentTextRequired", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to Username or password is invalid..

         /// </summary>

         internal static string TokenController_Create_BadCredential {

diff --git a/Timeline/Resources/Messages.resx b/Timeline/Resources/Messages.resx
index 865db524..6a4cb1b6 100644
--- a/Timeline/Resources/Messages.resx
+++ b/Timeline/Resources/Messages.resx
@@ -156,12 +156,27 @@
   <data name="TimelineCommon_NotExist" xml:space="preserve">

     <value>The timeline with given name does not exist.</value>

   </data>

+  <data name="TimelineController_ContentUnknownType" xml:space="preserve">

+    <value>Unknown type of post content.</value>

+  </data>

+  <data name="TimelineController_ImageContentDataNotBase64" xml:space="preserve">

+    <value>Data field is not a valid base64 string in image content.</value>

+  </data>

+  <data name="TimelineController_ImageContentDataNotImage" xml:space="preserve">

+    <value>Data field is not a valid image after base64 decoding in image content.</value>

+  </data>

+  <data name="TimelineController_ImageContentDataRequired" xml:space="preserve">

+    <value>Data field is required for image content.</value>

+  </data>

   <data name="TimelineController_QueryRelateNotExist" xml:space="preserve">

     <value>The user specified by query param "relate" does not exist.</value>

   </data>

   <data name="TimelineController_QueryVisibilityUnknown" xml:space="preserve">

     <value>'{0}' is an unkown visibility in the query parameter 'visibility'. </value>

   </data>

+  <data name="TimelineController_TextContentTextRequired" xml:space="preserve">

+    <value>Text field is required for text content.</value>

+  </data>

   <data name="TokenController_Create_BadCredential" xml:space="preserve">

     <value>Username or password is invalid.</value>

   </data>