Merge pull request #158 from crupest/dev

Develop new features of back end.

4 files changed, 232 insertions, 6 deletions

diff --git a/Timeline.Tests/Helpers/HttpResponseExtensions.cs b/Timeline.Tests/Helpers/HttpResponseExtensions.cs
new file mode 100644
index 00000000..2bd497f1
--- /dev/null
+++ b/Timeline.Tests/Helpers/HttpResponseExtensions.cs
@@ -0,0 +1,35 @@
+using System.Net.Http;

+using System.Text.Json;

+using System.Text.Json.Serialization;

+using System.Threading.Tasks;

+using Timeline.Models.Converters;

+using Timeline.Models.Http;

+

+namespace Timeline.Tests.Helpers

+{

+    public static class HttpResponseExtensions

+    {

+        public static JsonSerializerOptions JsonSerializerOptions { get; }

+

+        static HttpResponseExtensions()

+        {

+            JsonSerializerOptions = new JsonSerializerOptions

+            {

+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase

+            };

+            JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());

+            JsonSerializerOptions.Converters.Add(new JsonDateTimeConverter());

+        }

+

+        public static async Task<T> ReadBodyAsJsonAsync<T>(this HttpResponseMessage response)

+        {

+            var stream = await response.Content.ReadAsStreamAsync();

+            return await JsonSerializer.DeserializeAsync<T>(stream, JsonSerializerOptions);

+        }

+

+        public static Task<CommonResponse> ReadBodyAsCommonResponseAsync(this HttpResponseMessage response)

+        {

+            return response.ReadBodyAsJsonAsync<CommonResponse>();

+        }

+    }

+}

diff --git a/Timeline.Tests/IntegratedTests/TimelineTest.cs b/Timeline.Tests/IntegratedTests/TimelineTest.cs
index 3b4b1754..ec46b96a 100644
--- a/Timeline.Tests/IntegratedTests/TimelineTest.cs
+++ b/Timeline.Tests/IntegratedTests/TimelineTest.cs
@@ -488,7 +488,7 @@ namespace Timeline.Tests.IntegratedTests
 

                 {

                     var res = await client.DeleteAsync("timelines/t1");

-                    res.Should().HaveStatusCode(HttpStatusCode.NotFound);

+                    res.Should().HaveStatusCode(400);

                 }

             }

         }

@@ -545,15 +545,15 @@ namespace Timeline.Tests.IntegratedTests
             }

             {

                 var res = await client.PatchAsJsonAsync(generator("notexist", null), new TimelinePatchRequest { });

-                res.Should().HaveStatusCode(404).And.HaveCommonBody(errorCode);

+                res.Should().HaveStatusCode(400).And.HaveCommonBody(errorCode);

             }

             {

                 var res = await client.PutAsync(generator("notexist", "members/user1"), null);

-                res.Should().HaveStatusCode(404).And.HaveCommonBody(errorCode);

+                res.Should().HaveStatusCode(400).And.HaveCommonBody(errorCode);

             }

             {

                 var res = await client.DeleteAsync(generator("notexist", "members/user1"));

-                res.Should().HaveStatusCode(404).And.HaveCommonBody(errorCode);

+                res.Should().HaveStatusCode(400).And.HaveCommonBody(errorCode);

             }

             {

                 var res = await client.GetAsync(generator("notexist", "posts"));

@@ -561,11 +561,11 @@ namespace Timeline.Tests.IntegratedTests
             }

             {

                 var res = await client.PostAsJsonAsync(generator("notexist", "posts"), TimelineHelper.TextPostCreateRequest("aaa"));

-                res.Should().HaveStatusCode(404).And.HaveCommonBody(errorCode);

+                res.Should().HaveStatusCode(400).And.HaveCommonBody(errorCode);

             }

             {

                 var res = await client.DeleteAsync(generator("notexist", "posts/123"));

-                res.Should().HaveStatusCode(404).And.HaveCommonBody(errorCode);

+                res.Should().HaveStatusCode(400).And.HaveCommonBody(errorCode);

             }

             {

                 var res = await client.GetAsync(generator("notexist", "posts/123/data"));

@@ -1407,5 +1407,117 @@ namespace Timeline.Tests.IntegratedTests
                     .Which.Should().BeEquivalentTo(timeline);

             }

         }

+

+        [Theory]

+        [MemberData(nameof(TimelineUrlGeneratorData))]

+        public async Task Title(TimelineUrlGenerator urlGenerator)

+        {

+            using var client = await CreateClientAsUser();

+

+            {

+                var res = await client.GetAsync(urlGenerator(1));

+                var timeline = res.Should().HaveStatusCode(200)

+                    .And.HaveJsonBody<TimelineInfo>()

+                    .Which;

+                timeline.Title.Should().Be(timeline.Name);

+            }

+

+            {

+                var res = await client.PatchAsJsonAsync(urlGenerator(1), new TimelinePatchRequest { Title = "atitle" });

+                res.Should().HaveStatusCode(200)

+                    .And.HaveJsonBody<TimelineInfo>()

+                    .Which.Title.Should().Be("atitle");

+            }

+

+            {

+                var res = await client.GetAsync(urlGenerator(1));

+                res.Should().HaveStatusCode(200)

+                    .And.HaveJsonBody<TimelineInfo>()

+                    .Which.Title.Should().Be("atitle");

+            }

+        }

+

+        [Fact]

+        public async Task ChangeName()

+        {

+            {

+                using var client = await CreateDefaultClient();

+                var res = await client.PostAsJsonAsync("timelineop/changename", new TimelineChangeNameRequest { OldName = "t1", NewName = "tttttttt" });

+                res.Should().HaveStatusCode(401);

+            }

+

+            {

+                using var client = await CreateClientAs(2);

+                var res = await client.PostAsJsonAsync("timelineop/changename", new TimelineChangeNameRequest { OldName = "t1", NewName = "tttttttt" });

+                res.Should().HaveStatusCode(403);

+            }

+

+            using (var client = await CreateClientAsUser())

+            {

+                {

+                    var res = await client.PostAsJsonAsync("timelineop/changename", new TimelineChangeNameRequest { OldName = "!!!", NewName = "tttttttt" });

+                    res.Should().BeInvalidModel();

+                }

+

+                {

+                    var res = await client.PostAsJsonAsync("timelineop/changename", new TimelineChangeNameRequest { OldName = "ttt", NewName = "!!!!" });

+                    res.Should().BeInvalidModel();

+                }

+

+                {

+                    var res = await client.PostAsJsonAsync("timelineop/changename", new TimelineChangeNameRequest { OldName = "ttttt", NewName = "tttttttt" });

+                    res.Should().HaveStatusCode(400).And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.TimelineController.NotExist);

+                }

+

+                {

+                    var res = await client.PostAsJsonAsync("timelineop/changename", new TimelineChangeNameRequest { OldName = "t1", NewName = "newt" });

+                    res.Should().HaveStatusCode(200).And.HaveJsonBody<TimelineInfo>().Which.Name.Should().Be("newt");

+                }

+

+                {

+                    var res = await client.GetAsync("timelines/t1");

+                    res.Should().HaveStatusCode(404);

+                }

+

+                {

+                    var res = await client.GetAsync("timelines/newt");

+                    res.Should().HaveStatusCode(200).And.HaveJsonBody<TimelineInfo>().Which.Name.Should().Be("newt");

+                }

+            }

+        }

+

+        [Theory]

+        [MemberData(nameof(TimelineUrlGeneratorData))]

+        public async Task PostDataETag(TimelineUrlGenerator urlGenerator)

+        {

+            using var client = await CreateClientAsUser();

+

+            long id;

+            string etag;

+

+            {

+                var res = await client.PostAsJsonAsync(urlGenerator(1, "posts"), new TimelinePostCreateRequest

+                {

+                    Content = new TimelinePostCreateRequestContent

+                    {

+                        Type = TimelinePostContentTypes.Image,

+                        Data = Convert.ToBase64String(ImageHelper.CreatePngWithSize(100, 50))

+                    }

+                });

+                res.Should().HaveStatusCode(200);

+                var body = await res.ReadBodyAsJsonAsync<TimelinePostInfo>();

+                body.Content.ETag.Should().NotBeNullOrEmpty();

+

+                id = body.Id;

+                etag = body.Content.ETag;

+            }

+

+            {

+                var res = await client.GetAsync(urlGenerator(1, $"posts/{id}/data"));

+                res.Should().HaveStatusCode(200);

+                res.Headers.ETag.Should().NotBeNull();

+                res.Headers.ETag.ToString().Should().Be(etag);

+            }

+        }

     }

 }

diff --git a/Timeline.Tests/IntegratedTests/UserAvatarTest.cs b/Timeline.Tests/IntegratedTests/UserAvatarTest.cs
index 507b05ba..f2796005 100644
--- a/Timeline.Tests/IntegratedTests/UserAvatarTest.cs
+++ b/Timeline.Tests/IntegratedTests/UserAvatarTest.cs
@@ -10,6 +10,7 @@ using System.IO;
 using System.Net;

 using System.Net.Http;

 using System.Net.Http.Headers;

+using System.Net.Mime;

 using System.Threading.Tasks;

 using Timeline.Models.Http;

 using Timeline.Services;

@@ -222,5 +223,29 @@ namespace Timeline.Tests.IntegratedTests
                 }

             }

         }

+

+        [Fact]

+        public async Task AvatarPutReturnETag()

+        {

+            using var client = await CreateClientAsUser();

+

+            EntityTagHeaderValue etag;

+

+            {

+                var image = ImageHelper.CreatePngWithSize(100, 100);

+                var res = await client.PutByteArrayAsync("users/user1/avatar", image, PngFormat.Instance.DefaultMimeType);

+                res.Should().HaveStatusCode(200);

+                etag = res.Headers.ETag;

+                etag.Should().NotBeNull();

+                etag.Tag.Should().NotBeNullOrEmpty();

+            }

+

+            {

+                var res = await client.GetAsync("users/user1/avatar");

+                res.Should().HaveStatusCode(200);

+                res.Headers.ETag.Should().Be(etag);

+                res.Headers.ETag.Tag.Should().Be(etag.Tag);

+            }

+        }

     }

 }
\ No newline at end of file
diff --git a/Timeline.Tests/Services/TimelineServiceTest.cs b/Timeline.Tests/Services/TimelineServiceTest.cs
index 36e5ed0c..5a774b78 100644
--- a/Timeline.Tests/Services/TimelineServiceTest.cs
+++ b/Timeline.Tests/Services/TimelineServiceTest.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Timeline.Entities;

 using Timeline.Models;

 using Timeline.Services;

+using Timeline.Services.Exceptions;

 using Timeline.Tests.Helpers;

 using Xunit;

 

@@ -271,5 +272,58 @@ namespace Timeline.Tests.Services
                 posts.Should().HaveCount(4);

             }

         }

+

+        [Theory]

+        [InlineData("@admin")]

+        [InlineData("tl")]

+        public async Task Title(string timelineName)

+        {

+            var _ = TimelineHelper.ExtractTimelineName(timelineName, out var isPersonal);

+            if (!isPersonal)

+                await _timelineService.CreateTimeline(timelineName, await _userService.GetUserIdByUsername("user"));

+

+            {

+                var timeline = await _timelineService.GetTimeline(timelineName);

+                timeline.Title.Should().Be(timelineName);

+            }

+

+            {

+                await _timelineService.ChangeProperty(timelineName, new TimelineChangePropertyRequest { Title = null });

+                var timeline = await _timelineService.GetTimeline(timelineName);

+                timeline.Title.Should().Be(timelineName);

+            }

+

+            {

+                await _timelineService.ChangeProperty(timelineName, new TimelineChangePropertyRequest { Title = "atitle" });

+                var timeline = await _timelineService.GetTimeline(timelineName);

+                timeline.Title.Should().Be("atitle");

+            }

+        }

+

+        [Fact]

+        public async Task ChangeName()

+        {

+            _clock.ForwardCurrentTime();

+

+            await _timelineService.Awaiting(s => s.ChangeTimelineName("!!!", "newtl")).Should().ThrowAsync<ArgumentException>();

+            await _timelineService.Awaiting(s => s.ChangeTimelineName("tl", "!!!")).Should().ThrowAsync<ArgumentException>();

+            await _timelineService.Awaiting(s => s.ChangeTimelineName("tl", "newtl")).Should().ThrowAsync<TimelineNotExistException>();

+

+            await _timelineService.CreateTimeline("tl", await _userService.GetUserIdByUsername("user"));

+            await _timelineService.CreateTimeline("tl2", await _userService.GetUserIdByUsername("user"));

+

+            await _timelineService.Awaiting(s => s.ChangeTimelineName("tl", "tl2")).Should().ThrowAsync<EntityAlreadyExistException>();

+

+            var time = _clock.ForwardCurrentTime();

+

+            await _timelineService.ChangeTimelineName("tl", "newtl");

+

+            {

+                var timeline = await _timelineService.GetTimeline("newtl");

+                timeline.Name.Should().Be("newtl");

+                timeline.LastModified.Should().Be(time);

+                timeline.NameLastModified.Should().Be(time);

+            }

+        }

     }

 }