From f9e05ab54526055914c76ef9c7041ce83ce92b00 Mon Sep 17 00:00:00 2001 From: Sarah Faey Date: Thu, 1 Dec 2022 23:30:46 +0100 Subject: [PATCH] fixed deleting the user --- Lieb/Data/UserService.cs | 8 +++----- Lieb/Pages/User/ManageAccount.razor | 6 +----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Lieb/Data/UserService.cs b/Lieb/Data/UserService.cs index 3b773cd..31c49d9 100644 --- a/Lieb/Data/UserService.cs +++ b/Lieb/Data/UserService.cs @@ -103,17 +103,15 @@ namespace Lieb.Data await _discordService.RenameUser(user.Id, user.Name, GetMainAccount(user.Id).AccountName); } - public async Task DeleteUser(LiebUser user) + public async Task DeleteUser(ulong userId) { using var context = _contextFactory.CreateDbContext(); - + LiebUser user = GetLiebUser(userId); foreach(GuildWars2Account account in user.GuildWars2Accounts) { await _guildWars2AccountService.DeleteAccount(account.GuildWars2AccountId); } - context.RaidLogs.RemoveRange(context.RaidLogs.Where(r => r.UserId == user.Id).ToList()); - context.RaidSignUps.RemoveRange(context.RaidSignUps.Where(r => r.LiebUserId == user.Id)); - context.RoleAssignments.RemoveRange(context.RoleAssignments.Where(r => r.LiebUserId == user.Id)); + user.GuildWars2Accounts.Clear(); context.Remove(user); await context.SaveChangesAsync(); } diff --git a/Lieb/Pages/User/ManageAccount.razor b/Lieb/Pages/User/ManageAccount.razor index 8c1101a..ca8b1b7 100644 --- a/Lieb/Pages/User/ManageAccount.razor +++ b/Lieb/Pages/User/ManageAccount.razor @@ -112,11 +112,7 @@ bool confirmed = await JsRuntime.InvokeAsync("confirm", "Are you sure you want to delete this Website Account?\nThis will sign you off in every raid in which you are signed up."); if (confirmed) { - await UserService.DeleteUser(_user); - } - else - { - NavigationManager.NavigateTo("accountedit"); + await UserService.DeleteUser(_user.Id); } } } \ No newline at end of file