Merge pull request #69 from crupest/image

Post image feature.

8 files changed, 313 insertions, 105 deletions

diff --git a/Timeline/Models/Http/ErrorResponse.cs b/Timeline/Models/Http/ErrorResponse.cs
index 9f7e70e1..bb9c44df 100644
--- a/Timeline/Models/Http/ErrorResponse.cs
+++ b/Timeline/Models/Http/ErrorResponse.cs
@@ -242,44 +242,39 @@ namespace Timeline.Models.Http
 

         }

 

-        public static class TimelineCommon

+        public static class TimelineController

         {

 

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

             {

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

+                return new CommonResponse(ErrorCodes.TimelineController.NameConflict, string.Format(TimelineController_NameConflict, formatArgs));

             }

 

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

             {

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

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

             }

 

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

             {

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

+                return new CommonResponse(ErrorCodes.TimelineController.NotExist, string.Format(TimelineController_NotExist, formatArgs));

             }

 

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

             {

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

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

             }

 

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

             {

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

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

             }

 

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

             {

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

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

             }

 

-        }

-

-        public static class TimelineController

-        {

-

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

             {

                 return new CommonResponse(ErrorCodes.TimelineController.QueryRelateNotExist, string.Format(TimelineController_QueryRelateNotExist, formatArgs));

@@ -290,6 +285,26 @@ namespace Timeline.Models.Http
                 return new CommonResponse(ErrorCodes.TimelineController.QueryRelateNotExist, string.Format(message, formatArgs));

             }

 

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

+            {

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

+            }

+

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

+            {

+                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/Timeline/Models/Http/Timeline.cs b/Timeline/Models/Http/Timeline.cs
new file mode 100644
index 00000000..9e2aefd0
--- /dev/null
+++ b/Timeline/Models/Http/Timeline.cs
@@ -0,0 +1,130 @@
+using AutoMapper;

+using Microsoft.AspNetCore.Mvc;

+using Microsoft.AspNetCore.Mvc.Infrastructure;

+using Microsoft.AspNetCore.Mvc.Routing;

+using System;

+using System.Collections.Generic;

+using Timeline.Controllers;

+

+namespace Timeline.Models.Http

+{

+    public class TimelinePostContentInfo

+    {

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

+        public string? Text { get; set; }

+        public string? Url { get; set; }

+    }

+

+    public class TimelinePostInfo

+    {

+        public long Id { get; set; }

+        public TimelinePostContentInfo Content { get; set; } = default!;

+        public DateTime Time { get; set; }

+        public UserInfo Author { get; set; } = default!;

+        public DateTime LastUpdated { get; set; } = default!;

+    }

+

+    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; } = default!;

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

+    }

+

+    public class TimelineInfoLinks

+    {

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

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

+    }

+

+    public class TimelineInfoLinksValueResolver : IValueResolver<Timeline, TimelineInfo, TimelineInfoLinks>

+    {

+        private readonly IActionContextAccessor _actionContextAccessor;

+        private readonly IUrlHelperFactory _urlHelperFactory;

+

+        public TimelineInfoLinksValueResolver(IActionContextAccessor actionContextAccessor, IUrlHelperFactory urlHelperFactory)

+        {

+            _actionContextAccessor = actionContextAccessor;

+            _urlHelperFactory = urlHelperFactory;

+        }

+

+        public TimelineInfoLinks Resolve(Timeline source, TimelineInfo destination, TimelineInfoLinks destMember, ResolutionContext context)

+        {

+            if (_actionContextAccessor.ActionContext == null)

+                throw new InvalidOperationException("No action context, can't fill urls.");

+

+            var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext);

+

+

+            return new TimelineInfoLinks

+            {

+                Self = urlHelper.ActionLink(nameof(TimelineController.TimelineGet), nameof(TimelineController)[0..^nameof(Controller).Length], new { source.Name }),

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

+            };

+        }

+    }

+

+    public class TimelinePostContentResolver : IValueResolver<TimelinePost, TimelinePostInfo, TimelinePostContentInfo>

+    {

+        private readonly IActionContextAccessor _actionContextAccessor;

+        private readonly IUrlHelperFactory _urlHelperFactory;

+

+        public TimelinePostContentResolver(IActionContextAccessor actionContextAccessor, IUrlHelperFactory urlHelperFactory)

+        {

+            _actionContextAccessor = actionContextAccessor;

+            _urlHelperFactory = urlHelperFactory;

+        }

+

+        public TimelinePostContentInfo Resolve(TimelinePost source, TimelinePostInfo destination, TimelinePostContentInfo destMember, ResolutionContext context)

+        {

+            if (_actionContextAccessor.ActionContext == null)

+                throw new InvalidOperationException("No action context, can't fill urls.");

+

+            var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext);

+

+            var sourceContent = source.Content;

+

+            if (sourceContent is TextTimelinePostContent textContent)

+            {

+                return new TimelinePostContentInfo

+                {

+                    Type = TimelinePostContentTypes.Text,

+                    Text = textContent.Text

+                };

+            }

+            else if (sourceContent is ImageTimelinePostContent imageContent)

+            {

+                return new TimelinePostContentInfo

+                {

+                    Type = TimelinePostContentTypes.Image,

+                    Url = urlHelper.ActionLink(

+                        action: nameof(TimelineController.PostDataGet),

+                        controller: nameof(TimelineController)[0..^nameof(Controller).Length],

+                        values: new { Name = source.TimelineName, Id = source.Id })

+                };

+            }

+            else

+            {

+                throw new InvalidOperationException("Unknown content type.");

+            }

+        }

+    }

+

+    public class TimelineInfoAutoMapperProfile : Profile

+    {

+        public TimelineInfoAutoMapperProfile()

+        {

+            CreateMap<Timeline, TimelineInfo>().ForMember(u => u._links, opt => opt.MapFrom<TimelineInfoLinksValueResolver>());

+            CreateMap<TimelinePost, TimelinePostInfo>().ForMember(p => p.Content, opt => opt.MapFrom<TimelinePostContentResolver>());

+            CreateMap<TimelinePatchRequest, TimelineChangePropertyRequest>();

+        }

+    }

+}

diff --git a/Timeline/Models/Http/TimelineCommon.cs b/Timeline/Models/Http/TimelineCommon.cs
deleted file mode 100644
index d0dfd837..00000000
--- a/Timeline/Models/Http/TimelineCommon.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using Microsoft.AspNetCore.Mvc;

-using System;

-using System.Collections.Generic;

-using Timeline.Controllers;

-

-namespace Timeline.Models.Http

-{

-    public enum TimelineVisibility

-    {

-        /// <summary>

-        /// All people including those without accounts.

-        /// </summary>

-        Public,

-        /// <summary>

-        /// Only people signed in.

-        /// </summary>

-        Register,

-        /// <summary>

-        /// Only member.

-        /// </summary>

-        Private

-    }

-

-    public class TimelinePostInfo

-    {

-        public long Id { get; set; }

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

-        public DateTime Time { get; set; }

-        public UserInfo Author { get; set; } = default!;

-        public DateTime LastUpdated { get; set; } = default!;

-    }

-

-    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 TimelineInfoLinks

-    {

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

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

-    }

-

-    public static class TimelineInfoExtensions

-    {

-        public static TimelineInfo FillLinks(this TimelineInfo info, IUrlHelper urlHelper)

-        {

-            if (info == null)

-                throw new ArgumentNullException(nameof(info));

-            if (urlHelper == null)

-                throw new ArgumentNullException(nameof(urlHelper));

-

-            if (string.IsNullOrEmpty(info.Name))

-            {

-                info._links = new TimelineInfoLinks

-                {

-                    Self = urlHelper.ActionLink(nameof(PersonalTimelineController.TimelineGet), nameof(PersonalTimelineController)[0..^nameof(Controller).Length], new { info.Owner.Username }),

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

-                };

-            }

-            else

-            {

-                info._links = new TimelineInfoLinks

-                {

-                    Self = urlHelper.ActionLink(nameof(TimelineController.TimelineGet), nameof(TimelineController)[0..^nameof(Controller).Length], new { info.Name }),

-                    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 6d461bb9..3e2e6b58 100644
--- a/Timeline/Models/Http/TimelineController.cs
+++ b/Timeline/Models/Http/TimelineController.cs
@@ -4,10 +4,18 @@ using Timeline.Models.Validation;
 

 namespace Timeline.Models.Http

 {

+    public class TimelinePostCreateRequestContent

+    {

+        [Required]

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

+        public string? Text { get; set; }

+        public string? Data { get; set; }

+    }

+

     public class TimelinePostCreateRequest

     {

-        [Required(AllowEmptyStrings = true)]

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

+        [Required]

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

 

         public DateTime? Time { get; set; }

     }

diff --git a/Timeline/Models/Http/UserInfo.cs b/Timeline/Models/Http/UserInfo.cs
index 68c6d8bd..b4bf14c1 100644
--- a/Timeline/Models/Http/UserInfo.cs
+++ b/Timeline/Models/Http/UserInfo.cs
@@ -2,8 +2,8 @@
 using Microsoft.AspNetCore.Mvc;

 using Microsoft.AspNetCore.Mvc.Infrastructure;

 using Microsoft.AspNetCore.Mvc.Routing;

+using System;

 using Timeline.Controllers;

-using Timeline.Services;

 

 namespace Timeline.Models.Http

 {

@@ -12,9 +12,9 @@ namespace Timeline.Models.Http
         public string Username { get; set; } = default!;

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

         public bool? Administrator { get; set; } = default!;

-#pragma warning disable CA1707 

-        public UserInfoLinks? _links { get; set; }

-#pragma warning restore CA1707

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

+        public UserInfoLinks _links { get; set; } = default!;

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

     }

 

     public class UserInfoLinks

@@ -24,7 +24,7 @@ namespace Timeline.Models.Http
         public string Timeline { get; set; } = default!;

     }

 

-    public class UserInfoLinksValueResolver : IValueResolver<User, UserInfo, UserInfoLinks?>

+    public class UserInfoLinksValueResolver : IValueResolver<User, UserInfo, UserInfoLinks>

     {

         private readonly IActionContextAccessor _actionContextAccessor;

         private readonly IUrlHelperFactory _urlHelperFactory;

@@ -35,17 +35,17 @@ namespace Timeline.Models.Http
             _urlHelperFactory = urlHelperFactory;

         }

 

-        public UserInfoLinks? Resolve(User source, UserInfo destination, UserInfoLinks? destMember, ResolutionContext context)

+        public UserInfoLinks Resolve(User source, UserInfo destination, UserInfoLinks destMember, ResolutionContext context)

         {

             if (_actionContextAccessor.ActionContext == null)

-                return null;

+                throw new InvalidOperationException("No action context, can't fill urls.");

 

             var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext);

             var result = new UserInfoLinks

             {

                 Self = urlHelper.ActionLink(nameof(UserController.Get), nameof(UserController)[0..^nameof(Controller).Length], new { destination.Username }),

                 Avatar = urlHelper.ActionLink(nameof(UserAvatarController.Get), nameof(UserAvatarController)[0..^nameof(Controller).Length], new { destination.Username }),

-                Timeline = urlHelper.ActionLink(nameof(PersonalTimelineController.TimelineGet), nameof(PersonalTimelineController)[0..^nameof(Controller).Length], new { destination.Username })

+                Timeline = urlHelper.ActionLink(nameof(TimelineController.TimelineGet), nameof(TimelineController)[0..^nameof(Controller).Length], new { Name = "@" + destination.Username })

             };

             return result;

         }

diff --git a/Timeline/Models/Timeline.cs b/Timeline/Models/Timeline.cs
new file mode 100644
index 00000000..803a5c5c
--- /dev/null
+++ b/Timeline/Models/Timeline.cs
@@ -0,0 +1,87 @@
+using System;

+using System.Collections.Generic;

+

+namespace Timeline.Models

+{

+    public enum TimelineVisibility

+    {

+        /// <summary>

+        /// All people including those without accounts.

+        /// </summary>

+        Public,

+        /// <summary>

+        /// Only people signed in.

+        /// </summary>

+        Register,

+        /// <summary>

+        /// Only member.

+        /// </summary>

+        Private

+    }

+

+    public static class TimelinePostContentTypes

+    {

+        public const string Text = "text";

+        public const string Image = "image";

+    }

+

+    public interface ITimelinePostContent

+    {

+        public string Type { get; }

+    }

+

+    public class TextTimelinePostContent : ITimelinePostContent

+    {

+        public TextTimelinePostContent(string text) { Text = text; }

+

+        public string Type { get; } = TimelinePostContentTypes.Text;

+        public string Text { get; set; }

+    }

+

+    public class ImageTimelinePostContent : ITimelinePostContent

+    {

+        public ImageTimelinePostContent(string dataTag) { DataTag = dataTag; }

+

+        public string Type { get; } = TimelinePostContentTypes.Image;

+        public string DataTag { get; set; }

+    }

+

+    public class TimelinePost

+    {

+        public TimelinePost(long id, ITimelinePostContent content, DateTime time, User author, DateTime lastUpdated, string timelineName)

+        {

+            Id = id;

+            Content = content;

+            Time = time;

+            Author = author;

+            LastUpdated = lastUpdated;

+            TimelineName = timelineName;

+        }

+

+        public long Id { get; set; }

+        public ITimelinePostContent Content { get; set; }

+        public DateTime Time { get; set; }

+        public User Author { get; set; }

+        public DateTime LastUpdated { get; set; }

+        public string TimelineName { get; set; }

+    }

+

+#pragma warning disable CA1724 // Type names should not match namespaces

+    public class Timeline

+#pragma warning restore CA1724 // Type names should not match namespaces

+    {

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

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

+        public User Owner { get; set; } = default!;

+        public TimelineVisibility Visibility { get; set; }

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

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

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

+    }

+

+    public class TimelineChangePropertyRequest

+    {

+        public string? Description { get; set; }

+        public TimelineVisibility? Visibility { get; set; }

+    }

+}

diff --git a/Timeline/Models/User.cs b/Timeline/Models/User.cs
new file mode 100644
index 00000000..37777eba
--- /dev/null
+++ b/Timeline/Models/User.cs
@@ -0,0 +1,18 @@
+namespace Timeline.Models

+{

+    public class User

+    {

+        public string? Username { get; set; }

+        public string? Nickname { get; set; }

+

+        #region adminsecret

+        public bool? Administrator { get; set; }

+        #endregion adminsecret

+

+        #region secret

+        public long? Id { get; set; }

+        public string? Password { get; set; }

+        public long? Version { get; set; }

+        #endregion secret

+    }

+}

diff --git a/Timeline/Models/Validation/GeneralTimelineNameValidator.cs b/Timeline/Models/Validation/GeneralTimelineNameValidator.cs
new file mode 100644
index 00000000..e1c96fbd
--- /dev/null
+++ b/Timeline/Models/Validation/GeneralTimelineNameValidator.cs
@@ -0,0 +1,33 @@
+using System;

+

+namespace Timeline.Models.Validation

+{

+    public class GeneralTimelineNameValidator : Validator<string>

+    {

+        private readonly UsernameValidator _usernameValidator = new UsernameValidator();

+        private readonly TimelineNameValidator _timelineNameValidator = new TimelineNameValidator();

+

+        protected override (bool, string) DoValidate(string value)

+        {

+            if (value.StartsWith('@'))

+            {

+                return _usernameValidator.Validate(value.Substring(1));

+            }

+            else

+            {

+                return _timelineNameValidator.Validate(value);

+            }

+        }

+    }

+

+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter,

+        AllowMultiple = false)]

+    public class GeneralTimelineNameAttribute : ValidateWithAttribute

+    {

+        public GeneralTimelineNameAttribute()

+            : base(typeof(GeneralTimelineNameValidator))

+        {

+

+        }

+    }

+}