From c3369742b6e68714d0a7df46a99a0798eb2d6940 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Tue, 11 Aug 2020 01:48:57 +0800
Subject: Handle post deletion on user deletion correctly.

---
 Timeline/Services/UserService.cs | 44 ----------------------------------------
 1 file changed, 44 deletions(-)

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

diff --git a/Timeline/Services/UserService.cs b/Timeline/Services/UserService.cs
index 4e56c86a..c186c170 100644
--- a/Timeline/Services/UserService.cs
+++ b/Timeline/Services/UserService.cs
@@ -126,22 +126,6 @@ namespace Timeline.Services
         /// <seealso cref="ModifyUser(long, User)"/>
         Task<User> ModifyUser(string username, User? info);
 
-        /// <summary>
-        /// Delete a user of given id.
-        /// </summary>
-        /// <param name="id">Id of the user to delete.</param>
-        /// <returns>True if user is deleted, false if user not exist.</returns>
-        Task<bool> DeleteUser(long id);
-
-        /// <summary>
-        /// Delete a user of given username.
-        /// </summary>
-        /// <param name="username">Username of the user to delete. Can't be null.</param>
-        /// <returns>True if user is deleted, false if user not exist.</returns>
-        /// <exception cref="ArgumentNullException">Thrown if <paramref name="username"/> is null.</exception>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="username"/> is of bad format.</exception>
-        Task<bool> DeleteUser(string username);
-
         /// <summary>
         /// Try to change a user's password with old password.
         /// </summary>
@@ -428,34 +412,6 @@ namespace Timeline.Services
             return CreateUserFromEntity(entity);
         }
 
-        public async Task<bool> DeleteUser(long id)
-        {
-            var user = await _databaseContext.Users.Where(u => u.Id == id).SingleOrDefaultAsync();
-            if (user == null)
-                return false;
-
-            _databaseContext.Users.Remove(user);
-            await _databaseContext.SaveChangesAsync();
-            _logger.LogInformation(Log.Format(LogDatabaseRemove, ("Id", id), ("Username", user.Username)));
-            return true;
-        }
-
-        public async Task<bool> DeleteUser(string username)
-        {
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-            CheckUsernameFormat(username, nameof(username));
-
-            var user = await _databaseContext.Users.Where(u => u.Username == username).SingleOrDefaultAsync();
-            if (user == null)
-                return false;
-
-            _databaseContext.Users.Remove(user);
-            await _databaseContext.SaveChangesAsync();
-            _logger.LogInformation(Log.Format(LogDatabaseRemove, ("Id", user.Id), ("Username", username)));
-            return true;
-        }
-
         public async Task ChangePassword(long id, string oldPassword, string newPassword)
         {
             if (oldPassword == null)
-- 
cgit v1.2.3