From 52acf41e331ddbd66befed4692c804b754ba7d5c Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 30 Jan 2020 20:26:52 +0800
Subject: ...

---
 Timeline/Services/UserService.cs | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

(limited to 'Timeline/Services/UserService.cs')

diff --git a/Timeline/Services/UserService.cs b/Timeline/Services/UserService.cs
index ff2306c5..1197bb73 100644
--- a/Timeline/Services/UserService.cs
+++ b/Timeline/Services/UserService.cs
@@ -43,6 +43,16 @@ namespace Timeline.Services
         /// <exception cref="UserNotExistException">Thrown when the user with given username does not exist.</exception>
         Task<User> GetUserByUsername(string username);
 
+        /// <summary>
+        /// Get the user id of given username.
+        /// </summary>
+        /// <param name="username">Username of the user.</param>
+        /// <returns>The id of the user.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="username"/> is null.</exception>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="username"/> is of bad format.</exception>
+        /// <exception cref="UserNotExistException">Thrown when the user with given username does not exist.</exception>
+        Task<long> GetUserIdByUsername(string username);
+
         /// <summary>
         /// List all users.
         /// </summary>
@@ -57,7 +67,7 @@ namespace Timeline.Services
         /// <returns>The id of the new user.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="info"/>is null.</exception>
         /// <exception cref="ArgumentException">Thrown when some fields in <paramref name="info"/> is bad.</exception>
-        /// <exception cref="ConfictException">Thrown when a user with given username already exists.</exception>
+        /// <exception cref="ConflictException">Thrown when a user with given username already exists.</exception>
         /// <remarks>
         /// <see cref="User.Username"/> must not be null and must be a valid username.
         /// <see cref="User.Password"/> must not be null or empty.
@@ -78,13 +88,12 @@ namespace Timeline.Services
         /// Only <see cref="User.Username"/>, <see cref="User.Administrator"/>, <see cref="User.Password"/> and <see cref="User.Nickname"/> will be used.
         /// If null, then not change.
         /// Other fields are ignored.
-        /// After modified, even if nothing is changed, version will increase.
+        /// Version will increase if password is changed.
         /// 
         /// <see cref="User.Username"/> must be a valid username if set.
         /// <see cref="User.Password"/> can't be empty if set.
         /// <see cref="User.Nickname"/> must be a valid nickname if set.
         /// 
-        /// Note: Whether <see cref="User.Version"/> is set or not, version will increase and not set to the specified value if there is one.
         /// </remarks>
         /// <seealso cref="ModifyUser(string, User)"/>
         Task ModifyUser(long id, User? info);
@@ -97,6 +106,7 @@ namespace Timeline.Services
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="username"/> is null.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="username"/> is of bad format or some fields in <paramref name="info"/> is bad.</exception>
         /// <exception cref="UserNotExistException">Thrown when user with given id does not exist.</exception>
+        /// <exception cref="ConflictException">Thrown when user with the newusername already exist.</exception>
         /// <remarks>
         /// Only <see cref="User.Administrator"/>, <see cref="User.Password"/> and <see cref="User.Nickname"/> will be used.
         /// If null, then not change.
@@ -184,7 +194,7 @@ namespace Timeline.Services
 
         private static void ThrowUsernameConflict()
         {
-            throw new ConfictException(ExceptionUsernameConflict);
+            throw new ConflictException(ExceptionUsernameConflict);
         }
 
         private static User CreateUserFromEntity(UserEntity entity)
@@ -245,6 +255,21 @@ namespace Timeline.Services
             return CreateUserFromEntity(entity);
         }
 
+        public async Task<long> GetUserIdByUsername(string username)
+        {
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            CheckUsernameFormat(username, nameof(username));
+
+            var entity = await _databaseContext.Users.Where(user => user.Username == username).Select(u => new { u.Id }).SingleOrDefaultAsync();
+
+            if (entity == null)
+                throw new UserNotExistException(username);
+
+            return entity.Id;
+        }
+
         public async Task<User[]> GetUsers()
         {
             var entities = await _databaseContext.Users.ToArrayAsync();
@@ -325,6 +350,7 @@ namespace Timeline.Services
                 if (password != null)
                 {
                     entity.Password = _passwordService.HashPassword(password);
+                    entity.Version += 1;
                 }
 
                 var administrator = info.Administrator;
@@ -339,8 +365,6 @@ namespace Timeline.Services
                     entity.Nickname = nickname;
                 }
             }
-
-            entity.Version += 1;
         }
 
 
-- 
cgit v1.2.3