WIP: Change UserController.

3 files changed, 23 insertions, 45 deletions

diff --git a/Timeline/Entities/Http/Common.cs b/Timeline/Entities/Http/Common.cs
index 7708927a..3a45a0ae 100644
--- a/Timeline/Entities/Http/Common.cs
+++ b/Timeline/Entities/Http/Common.cs
@@ -1,13 +1,13 @@
 namespace Timeline.Entities.Http
 {
-    public class CommonErrorResponse
+    public class CommonResponse
     {
-        public CommonErrorResponse()
+        public CommonResponse()
         {
 
         }
 
-        public CommonErrorResponse(int code, string message)
+        public CommonResponse(int code, string message)
         {
             Code = code;
             Message = message;
@@ -16,4 +16,22 @@
         public int Code { get; set; }
         public string Message { get; set; }
     }
+
+    public static class CommonPutResponse
+    {
+        public const int CreatedCode = 0;
+        public const int ModifiedCode = 1;
+
+        public static CommonResponse Created { get; } = new CommonResponse(CreatedCode, "A new item is created.");
+        public static CommonResponse Modified { get; } = new CommonResponse(ModifiedCode, "An existent item is modified.");
+    }
+
+    public static class CommonDeleteResponse
+    {
+        public const int DeletedCode = 0;
+        public const int NotExistsCode = 1;
+
+        public static CommonResponse Deleted { get; } = new CommonResponse(DeletedCode, "An existent item is deleted.");
+        public static CommonResponse NotExists { get; } = new CommonResponse(NotExistsCode, "The item does not exist.");
+    }
 }
diff --git a/Timeline/Entities/Http/User.cs b/Timeline/Entities/Http/User.cs
index f5d233cd..91423c7b 100644
--- a/Timeline/Entities/Http/User.cs
+++ b/Timeline/Entities/Http/User.cs
@@ -12,49 +12,9 @@
         public bool? IsAdmin { get; set; }
     }
 
-    public static class UserPutResponse
-    {
-        public const int CreatedCode = 0;
-        public const int ModifiedCode = 1;
-
-        public static CommonErrorResponse Created { get; } = new CommonErrorResponse(CreatedCode, "A new user is created.");
-        public static CommonErrorResponse Modified { get; } = new CommonErrorResponse(ModifiedCode, "A existing user is modified.");
-    }
-
-    public static class UserDeleteResponse
-    {
-        public const int DeletedCode = 0;
-        public const int NotExistsCode = 1;
-
-        public static CommonErrorResponse Deleted { get; } = new CommonErrorResponse(DeletedCode, "A existing user is deleted.");
-        public static CommonErrorResponse NotExists { get; } = new CommonErrorResponse(NotExistsCode, "User with given name does not exists.");
-    }
-
     public class ChangePasswordRequest
     {
         public string OldPassword { get; set; }
         public string NewPassword { get; set; }
     }
-
-    public static class ChangePasswordResponse
-    {
-        public const int SuccessCode = 0;
-        public const int BadOldPasswordCode = 1;
-        public const int NotExistsCode = 2;
-
-        public static CommonErrorResponse Success { get; } = new CommonErrorResponse(SuccessCode, "Success to change password.");
-        public static CommonErrorResponse BadOldPassword { get; } = new CommonErrorResponse(BadOldPasswordCode, "Old password is wrong.");
-        public static CommonErrorResponse NotExists { get; } = new CommonErrorResponse(NotExistsCode, "Username does not exists, please update token.");
-    }
-
-    public static class PutAvatarResponse
-    {
-        public const int SuccessCode = 0;
-        public const int ForbiddenCode = 1;
-        public const int NotExistsCode = 2;
-
-        public static CommonErrorResponse Success { get; } = new CommonErrorResponse(SuccessCode, "Success to upload avatar.");
-        public static CommonErrorResponse Forbidden { get; } = new CommonErrorResponse(ForbiddenCode, "You are not allowed to upload the user's avatar.");
-        public static CommonErrorResponse NotExists { get; } = new CommonErrorResponse(NotExistsCode, "The username does not exists. If you are a user, try update your token.");
-    }
 }
diff --git a/Timeline/Entities/UserUtility.cs b/Timeline/Entities/UserUtility.cs
index c8e82fba..cbbd391c 100644
--- a/Timeline/Entities/UserUtility.cs
+++ b/Timeline/Entities/UserUtility.cs
@@ -7,8 +7,8 @@ namespace Timeline.Entities
 {
     public static class UserUtility
     {
-        public const string UserRole = "user";
-        public const string AdminRole = "admin";
+        public const string UserRole = UserRoles.User;
+        public const string AdminRole = UserRoles.Admin;
 
         public static string[] UserRoleArray { get; } = new string[] { UserRole };
         public static string[] AdminRoleArray { get; } = new string[] { UserRole, AdminRole };