Basically finish refactor of error codes.

5 files changed, 32 insertions, 34 deletions

diff --git a/Timeline.Tests/IntegratedTests/PersonalTimelineTest.cs b/Timeline.Tests/IntegratedTests/PersonalTimelineTest.cs
index c5d0addd..51e2d05e 100644
--- a/Timeline.Tests/IntegratedTests/PersonalTimelineTest.cs
+++ b/Timeline.Tests/IntegratedTests/PersonalTimelineTest.cs
@@ -98,14 +98,14 @@ namespace Timeline.Tests.IntegratedTests
                     new TimelineMemberChangeRequest { Add = new List<string> { "admin", "usernotexist" } });
                 res.Should().HaveStatusCode(400)
                     .And.HaveCommonBody()
-                    .Which.Code.Should().Be(ErrorCodes.Http.Timeline.ChangeMemberUserNotExist);
+                    .Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);
             }
             {
                 var res = await client.PostAsJsonAsync(changeUrl,
                     new TimelineMemberChangeRequest { Remove = new List<string> { "admin", "usernotexist" } });
                 res.Should().HaveStatusCode(400)
                     .And.HaveCommonBody()
-                    .Which.Code.Should().Be(ErrorCodes.Http.Timeline.ChangeMemberUserNotExist);
+                    .Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);
             }
             {
                 var res = await client.PostAsJsonAsync(changeUrl,
@@ -453,7 +453,7 @@ namespace Timeline.Tests.IntegratedTests
                         new TimelinePostDeleteRequest { Id = 30000 });
                     res.Should().HaveStatusCode(400)
                         .And.HaveCommonBody()
-                        .Which.Code.Should().Be(ErrorCodes.Http.Timeline.PostOperationDeleteNotExist);
+                        .Which.Code.Should().Be(ErrorCodes.TimelineController.PostOperationDelete_NotExist);
                 }
                 {
                     var res = await client.GetAsync("users/user/timeline/posts");
diff --git a/Timeline.Tests/IntegratedTests/TokenTest.cs b/Timeline.Tests/IntegratedTests/TokenTest.cs
index e62228fc..ecd5d0b8 100644
--- a/Timeline.Tests/IntegratedTests/TokenTest.cs
+++ b/Timeline.Tests/IntegratedTests/TokenTest.cs
@@ -8,7 +8,6 @@ using Timeline.Models.Http;
 using Timeline.Services;

 using Timeline.Tests.Helpers;

 using Xunit;

-using static Timeline.ErrorCodes.Http.Token;

 

 namespace Timeline.Tests.IntegratedTests

 {

@@ -66,7 +65,7 @@ namespace Timeline.Tests.IntegratedTests
                 new CreateTokenRequest { Username = username, Password = password });

             response.Should().HaveStatusCode(400)

                 .And.HaveCommonBody()

-                .Which.Code.Should().Be(Create.BadCredential);

+                .Which.Code.Should().Be(ErrorCodes.TokenController.Create_BadCredential);

         }

 

         [Fact]

@@ -97,7 +96,7 @@ namespace Timeline.Tests.IntegratedTests
                 new VerifyTokenRequest { Token = "bad token hahaha" });

             response.Should().HaveStatusCode(400)

                  .And.HaveCommonBody()

-                 .Which.Code.Should().Be(Verify.BadFormat);

+                 .Which.Code.Should().Be(ErrorCodes.TokenController.Verify_BadFormat);

         }

 

         [Fact]

@@ -117,7 +116,7 @@ namespace Timeline.Tests.IntegratedTests
                 new VerifyTokenRequest { Token = token }))

                 .Should().HaveStatusCode(400)

                 .And.HaveCommonBody()

-                .Which.Code.Should().Be(Verify.OldVersion);

+                .Which.Code.Should().Be(ErrorCodes.TokenController.Verify_OldVersion);

         }

 

         [Fact]

@@ -136,7 +135,7 @@ namespace Timeline.Tests.IntegratedTests
                 new VerifyTokenRequest { Token = token }))

                 .Should().HaveStatusCode(400)

                 .And.HaveCommonBody()

-                .Which.Code.Should().Be(Verify.UserNotExist);

+                .Which.Code.Should().Be(ErrorCodes.TokenController.Verify_UserNotExist);

         }

 

         //[Fact]

diff --git a/Timeline.Tests/IntegratedTests/UserAvatarTest.cs b/Timeline.Tests/IntegratedTests/UserAvatarTest.cs
index 25a7b675..a4e10634 100644
--- a/Timeline.Tests/IntegratedTests/UserAvatarTest.cs
+++ b/Timeline.Tests/IntegratedTests/UserAvatarTest.cs
@@ -13,11 +13,10 @@ using System.Net;
 using System.Net.Http;

 using System.Net.Http.Headers;

 using System.Threading.Tasks;

+using Timeline.Models.Http;

 using Timeline.Services;

 using Timeline.Tests.Helpers;

 using Xunit;

-using static Timeline.ErrorCodes.Http.Common;

-using static Timeline.ErrorCodes.Http.UserAvatar;

 

 namespace Timeline.Tests.IntegratedTests

 {

@@ -45,7 +44,7 @@ namespace Timeline.Tests.IntegratedTests
                     var res = await client.GetAsync("users/usernotexist/avatar");

                     res.Should().HaveStatusCode(404)

                         .And.HaveCommonBody()

-                        .Which.Code.Should().Be(Get.UserNotExist);

+                        .Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);

                 }

 

                 var env = Factory.Server.Host.Services.GetRequiredService<IWebHostEnvironment>();

@@ -85,7 +84,7 @@ namespace Timeline.Tests.IntegratedTests
                     request.Headers.TryAddWithoutValidation("If-None-Match", "\"dsdfd");

                     var res = await client.SendAsync(request);

                     res.Should().HaveStatusCode(HttpStatusCode.BadRequest)

-                        .And.HaveCommonBody().Which.Code.Should().Be(Header.IfNonMatch.BadFormat);

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.Common.Header.IfNonMatch_BadFormat);

                 }

 

                 {

@@ -115,7 +114,7 @@ namespace Timeline.Tests.IntegratedTests
                     content.Headers.ContentType = new MediaTypeHeaderValue("image/png");

                     var res = await client.PutAsync("users/user/avatar", content);

                     res.Should().HaveStatusCode(HttpStatusCode.BadRequest)

-                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.Http.Filter.Header.ContentLength.Missing); ;

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.Common.Header.ContentLength_Missing); ;

                 }

 

                 {

@@ -123,7 +122,7 @@ namespace Timeline.Tests.IntegratedTests
                     content.Headers.ContentLength = 1;

                     var res = await client.PutAsync("users/user/avatar", content);

                     res.Should().HaveStatusCode(HttpStatusCode.BadRequest)

-                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.Http.Filter.Header.ContentType.Missing);

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.Common.Header.ContentType_Missing);

                 }

 

                 {

@@ -132,7 +131,7 @@ namespace Timeline.Tests.IntegratedTests
                     content.Headers.ContentType = new MediaTypeHeaderValue("image/png");

                     var res = await client.PutAsync("users/user/avatar", content);

                     res.Should().HaveStatusCode(HttpStatusCode.BadRequest)

-                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.Http.Filter.Header.ContentLength.Zero);

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.Common.Header.ContentLength_Zero);

                 }

 

                 {

@@ -146,7 +145,7 @@ namespace Timeline.Tests.IntegratedTests
                     content.Headers.ContentType = new MediaTypeHeaderValue("image/png");

                     var res = await client.PutAsync("users/user/avatar", content);

                     res.Should().HaveStatusCode(HttpStatusCode.BadRequest)

-                        .And.HaveCommonBody().Which.Code.Should().Be(Content.TooBig);

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.Common.Content.TooBig);

                 }

 

                 {

@@ -155,7 +154,7 @@ namespace Timeline.Tests.IntegratedTests
                     content.Headers.ContentType = new MediaTypeHeaderValue("image/png");

                     var res = await client.PutAsync("users/user/avatar", content);

                     res.Should().HaveStatusCode(HttpStatusCode.BadRequest)

-                        .And.HaveCommonBody().Which.Code.Should().Be(Content.UnmatchedLength_Smaller);

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.Common.Content.UnmatchedLength_Smaller);

                 }

 

                 {

@@ -164,25 +163,25 @@ namespace Timeline.Tests.IntegratedTests
                     content.Headers.ContentType = new MediaTypeHeaderValue("image/png");

                     var res = await client.PutAsync("users/user/avatar", content);

                     res.Should().HaveStatusCode(HttpStatusCode.BadRequest)

-                        .And.HaveCommonBody().Which.Code.Should().Be(Content.UnmatchedLength_Bigger);

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.Common.Content.UnmatchedLength_Bigger);

                 }

 

                 {

                     var res = await client.PutByteArrayAsync("users/user/avatar", new[] { (byte)0x00 }, "image/png");

                     res.Should().HaveStatusCode(HttpStatusCode.BadRequest)

-                        .And.HaveCommonBody().Which.Code.Should().Be(Put.BadFormat_CantDecode);

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.UserAvatar.BadFormat_CantDecode);

                 }

 

                 {

                     var res = await client.PutByteArrayAsync("users/user/avatar", mockAvatar.Data, "image/jpeg");

                     res.Should().HaveStatusCode(HttpStatusCode.BadRequest)

-                        .And.HaveCommonBody().Which.Code.Should().Be(Put.BadFormat_UnmatchedFormat);

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.UserAvatar.BadFormat_UnmatchedFormat);

                 }

 

                 {

                     var res = await client.PutByteArrayAsync("users/user/avatar", ImageHelper.CreatePngWithSize(100, 200), "image/png");

                     res.Should().HaveStatusCode(HttpStatusCode.BadRequest)

-                        .And.HaveCommonBody().Which.Code.Should().Be(Put.BadFormat_BadSize);

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.UserAvatar.BadFormat_BadSize);

                 }

 

                 {

@@ -212,13 +211,13 @@ namespace Timeline.Tests.IntegratedTests
                 {

                     var res = await client.PutByteArrayAsync("users/admin/avatar", new[] { (byte)0x00 }, "image/png");

                     res.Should().HaveStatusCode(HttpStatusCode.Forbidden)

-                        .And.HaveCommonBody().Which.Code.Should().Be(Put.Forbid);

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.Common.Forbid);

                 }

 

                 {

                     var res = await client.DeleteAsync("users/admin/avatar");

                     res.Should().HaveStatusCode(HttpStatusCode.Forbidden)

-                        .And.HaveCommonBody().Which.Code.Should().Be(Delete.Forbid);

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.Common.Forbid);

                 }

 

                 for (int i = 0; i < 2; i++) // double delete should work.

@@ -246,13 +245,13 @@ namespace Timeline.Tests.IntegratedTests
                     var res = await client.PutByteArrayAsync("users/usernotexist/avatar", new[] { (byte)0x00 }, "image/png");

                     res.Should().HaveStatusCode(400)

                         .And.HaveCommonBody()

-                        .Which.Code.Should().Be(Put.UserNotExist);

+                        .Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);

                 }

 

                 {

                     var res = await client.DeleteAsync("users/usernotexist/avatar");

                     res.Should().HaveStatusCode(400)

-                        .And.HaveCommonBody().Which.Code.Should().Be(Delete.UserNotExist);

+                        .And.HaveCommonBody().Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);

                 }

             }

 

diff --git a/Timeline.Tests/IntegratedTests/UserDetailTest.cs b/Timeline.Tests/IntegratedTests/UserDetailTest.cs
index 932c287e..3781a816 100644
--- a/Timeline.Tests/IntegratedTests/UserDetailTest.cs
+++ b/Timeline.Tests/IntegratedTests/UserDetailTest.cs
@@ -4,6 +4,7 @@ using System.Net;
 using System.Net.Http.Headers;

 using System.Net.Mime;

 using System.Threading.Tasks;

+using Timeline.Models.Http;

 using Timeline.Tests.Helpers;

 using Xunit;

 

@@ -82,7 +83,7 @@ namespace Timeline.Tests.IntegratedTests
                     var res = await client.GetAsync(userNotExistUrl);

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

                         .And.HaveCommonBody()

-                        .Which.Code.Should().Be(ErrorCodes.Http.Filter.User.NotExist);

+                        .Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);

 

                 }

                 {

@@ -128,13 +129,13 @@ namespace Timeline.Tests.IntegratedTests
                     var res = await client.PutStringAsync(userNotExistUrl, "aaa");

                     res.Should().HaveStatusCode(HttpStatusCode.BadRequest)

                         .And.HaveCommonBody()

-                        .Which.Code.Should().Be(ErrorCodes.Http.Filter.User.NotExist);

+                        .Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);

                 }

                 {

                     var res = await client.DeleteAsync(userNotExistUrl);

                     res.Should().HaveStatusCode(HttpStatusCode.BadRequest)

                         .And.HaveCommonBody()

-                        .Which.Code.Should().Be(ErrorCodes.Http.Filter.User.NotExist);

+                        .Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);

                 }

                 var nickname = "nnn";

                 {

diff --git a/Timeline.Tests/IntegratedTests/UserTest.cs b/Timeline.Tests/IntegratedTests/UserTest.cs
index abfea18e..fbef6da3 100644
--- a/Timeline.Tests/IntegratedTests/UserTest.cs
+++ b/Timeline.Tests/IntegratedTests/UserTest.cs
@@ -7,7 +7,6 @@ using Timeline.Models;
 using Timeline.Models.Http;

 using Timeline.Tests.Helpers;

 using Xunit;

-using static Timeline.ErrorCodes.Http.User;

 

 namespace Timeline.Tests.IntegratedTests

 {

@@ -54,7 +53,7 @@ namespace Timeline.Tests.IntegratedTests
             var res = await client.GetAsync("users/usernotexist");

             res.Should().HaveStatusCode(404)

                 .And.HaveCommonBody()

-                .Which.Code.Should().Be(Get.NotExist);

+                .Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);

         }

 

         public static IEnumerable<object[]> Put_InvalidModel_Data()

@@ -118,7 +117,7 @@ namespace Timeline.Tests.IntegratedTests
             var res = await client.PatchAsJsonAsync("users/usernotexist", new UserPatchRequest { });

             res.Should().HaveStatusCode(404)

                 .And.HaveCommonBody()

-                .Which.Code.Should().Be(Patch.NotExist);

+                .Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);

         }

 

         [Fact]

@@ -198,7 +197,7 @@ namespace Timeline.Tests.IntegratedTests
                 new ChangeUsernameRequest { OldUsername = "usernotexist", NewUsername = "newUsername" });

             res.Should().HaveStatusCode(400)

                 .And.HaveCommonBody()

-                .Which.Code.Should().Be(Op.ChangeUsername.NotExist);

+                .Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);

         }

 

         [Fact]

@@ -209,7 +208,7 @@ namespace Timeline.Tests.IntegratedTests
                 new ChangeUsernameRequest { OldUsername = MockUser.User.Username, NewUsername = MockUser.Admin.Username });

             res.Should().HaveStatusCode(400)

                 .And.HaveCommonBody()

-                .Which.Code.Should().Be(Op.ChangeUsername.AlreadyExist);

+                .Which.Code.Should().Be(ErrorCodes.UserController.ChangeUsername_Conflict);

         }

 

         private async Task TestLogin(string username, string password)

@@ -256,7 +255,7 @@ namespace Timeline.Tests.IntegratedTests
             var res = await client.PostAsJsonAsync(changePasswordUrl, new ChangePasswordRequest { OldPassword = "???", NewPassword = "???" });

             res.Should().HaveStatusCode(400)

                 .And.HaveCommonBody()

-                .Which.Code.Should().Be(Op.ChangePassword.BadOldPassword);

+                .Which.Code.Should().Be(ErrorCodes.UserController.ChangePassword_BadOldPassword);

         }

 

         [Fact]