reworked account pages

Lieb/Data/GuildWars2AccountService.cs

@@ -29,8 +29,7 @@ namespace Lieb.Data
                 using var context = _contextFactory.CreateDbContext();
                 if (account.GuildWars2AccountId == 0)
                 {
-                    //context.GuildWars2Accounts.Add(account);
+                    LiebUser? user = context.LiebUsers.FirstOrDefault(u => u.LiebUserId == userId);
-                    LiebUser user = context.LiebUsers.FirstOrDefault(u => u.LiebUserId == userId);
                     if(user != null)
                     {
                         user.GuildWars2Accounts.Add(account);
@@ -39,42 +38,20 @@ namespace Lieb.Data
                 }
                 else
                 {
-                    GuildWars2Account accountToChange = context.GuildWars2Accounts
+                    GuildWars2Account? accountToChange = context.GuildWars2Accounts
                         .Include(a => a.EquippedBuilds)
-                        .Include(e => e.EquippedBuilds)
                         .FirstOrDefault(a => a.GuildWars2AccountId == account.GuildWars2AccountId);
 
+                    if (accountToChange != null)
+                    {
                         accountToChange.AccountName = account.AccountName;
                         accountToChange.ApiKey = account.ApiKey;
 
-                    List<Equipped> toDelete = new List<Equipped>();
-                    foreach (Equipped equipped in accountToChange.EquippedBuilds)
-                    {
-                        Equipped? newEquipped = account.EquippedBuilds.FirstOrDefault(r => r.EquippedId == equipped.EquippedId);
-                        if (newEquipped != null)
-                        {
-                            equipped.CanTank = newEquipped.CanTank;
-                        }
-                        else
-                        {
-                            toDelete.Add(equipped);
-                        }
-                    }
-                    foreach(Equipped equipped in toDelete)
-                    {
-                        accountToChange.EquippedBuilds.Remove(equipped);
-                        context.Equipped.Remove(equipped);
-                    }
-                    foreach (Equipped equipped in account.EquippedBuilds.Where(r => r.EquippedId == 0))
-                    {
-                        accountToChange.EquippedBuilds.Add(equipped);
-                    }
-
                         await context.SaveChangesAsync();
                     }
                 }
             }
-
+        }
 
         public async Task DeleteAccount(int accountId)
         {
@@ -88,5 +65,57 @@ namespace Lieb.Data
                 await context.SaveChangesAsync();
             }
         }
+
+        public async Task AddBuild(int accountId, int buildId)
+        {
+            using var context = _contextFactory.CreateDbContext();
+            GuildWars2Account? account = context.GuildWars2Accounts
+                .Include(a => a.EquippedBuilds)
+                .FirstOrDefault(a => a.GuildWars2AccountId == accountId);
+
+            if (account != null)
+            {
+                account.EquippedBuilds.Add(new Equipped()
+                {
+                    GuildWars2AccountId = accountId,
+                    GuildWars2BuildId = buildId
+                });
+                await context.SaveChangesAsync();
+            }
+        }
+
+        public async Task RemoveBuild(int accountId, int buildId)
+        {
+            using var context = _contextFactory.CreateDbContext();
+            GuildWars2Account? account = context.GuildWars2Accounts
+                .Include(a => a.EquippedBuilds)
+                .FirstOrDefault(a => a.GuildWars2AccountId == accountId);
+            if (account != null)
+            {
+                Equipped? buildToRemove = account.EquippedBuilds.FirstOrDefault(b => b.GuildWars2BuildId == buildId);
+                if (buildToRemove != null)
+                {
+                    account.EquippedBuilds.Remove(buildToRemove);
+                    await context.SaveChangesAsync();
+                }
+            }
+        }
+
+        public async Task ChangeTankStatus(int accountId, int buildId, bool canTank)
+        {
+            using var context = _contextFactory.CreateDbContext();
+            GuildWars2Account? account = context.GuildWars2Accounts
+                .Include(a => a.EquippedBuilds)
+                .FirstOrDefault(a => a.GuildWars2AccountId == accountId);
+            if (account != null)
+            {
+                Equipped? build = account.EquippedBuilds.FirstOrDefault(b => b.GuildWars2BuildId == buildId);
+                if (build != null)
+                {
+                    build.CanTank = canTank;
+                    await context.SaveChangesAsync();
+                }
+            }
+        }
     }
 }

Lieb/Data/UserService.cs

@@ -103,43 +103,46 @@ namespace Lieb.Data
             await context.SaveChangesAsync();
         }
 
-        public async Task EditUserRoles(LiebUser user)
+        public async Task UpdateBannedUntil(int userId, DateTime? date)
-        {
-            if (user != null)
         {
             using var context = _contextFactory.CreateDbContext();
-                LiebUser? userToChange = await context.LiebUsers
+            LiebUser? user = await context.LiebUsers.FirstOrDefaultAsync(u => u.LiebUserId == userId);
-                    .Include(u => u.RoleAssignments)
-                    .FirstOrDefaultAsync(u => u.LiebUserId == user.LiebUserId);
 
-                if (userToChange == null)
+            if (user == null)
                 return;
 
-                userToChange.BannedUntil = user.BannedUntil;
+            user.BannedUntil = date;
-
-                List<RoleAssignment> toDelete = new List<RoleAssignment>();
-                foreach (RoleAssignment assignment in userToChange.RoleAssignments)
-                {
-                    RoleAssignment? newAssignment = user.RoleAssignments.FirstOrDefault(r => r.RoleAssignmentId == assignment.RoleAssignmentId);
-                    if (newAssignment == null)
-                    {
-                        toDelete.Add(assignment);
-                    }
-                }
-                foreach (RoleAssignment assignment in toDelete)
-                {
-                    userToChange.RoleAssignments.Remove(assignment);
-                    context.RoleAssignments.Remove(assignment);
-                }
-                foreach (RoleAssignment assignment in user.RoleAssignments.Where(r => r.RoleAssignmentId == 0))
-                {
-                    userToChange.RoleAssignments.Add(assignment);
-                }
 
             await context.SaveChangesAsync();
         }
+
+        public async Task AddRoleToUser(int userId, int roleId)
+        {
+            using var context = _contextFactory.CreateDbContext();
+            LiebUser? user = await context.LiebUsers
+                    .Include(u => u.RoleAssignments)
+                    .FirstOrDefaultAsync(u => u.LiebUserId == userId);
+            user.RoleAssignments.Add(new RoleAssignment()
+            {
+                LiebUserId = userId,
+                LiebRoleId = roleId
+            });
+            await context.SaveChangesAsync();
         }
 
+        public async Task RemoveRoleFromUser(int userId, int roleId)
+        {
+            using var context = _contextFactory.CreateDbContext();
+            LiebUser? user = await context.LiebUsers
+                    .Include(u => u.RoleAssignments)
+                    .FirstOrDefaultAsync(u => u.LiebUserId == userId);
+            RoleAssignment assignmentToRemove = user.RoleAssignments.FirstOrDefault(r => r.LiebRoleId == roleId);
+            if(assignmentToRemove != null)
+            {
+                user.RoleAssignments.Remove(assignmentToRemove);
+            }
+            await context.SaveChangesAsync();
+        }
 
         public List<LiebRole> GetLiebRoles()
         {

Lieb/Pages/User/ManageAccount.razor

@@ -14,8 +14,8 @@
     <Authorized>
     <EditForm Model="@_user" OnValidSubmit="@HandleValidSubmit">
         <DataAnnotationsValidator />
-        <ValidationSummary />
     
+        <p>@_saveMessage</p>
         <p>
             <label>
                 Name:
@@ -36,6 +36,13 @@
             </label>
         </p>
         
+        <br />
+        <button type="submit">Save</button>
+        <ValidationSummary />
+
+    </EditForm>
+    
+    <br />
     <div class="nav-item px-3">
         <NavLink class="nav-link" href="gw2accountedit">
             <span class="oi oi-plus" aria-hidden="true"></span> Add Guild Wars 2 Account
@@ -49,11 +56,6 @@
             <NavLink class="nav-link" href="@navLink">@account.AccountName</NavLink>
         </div>
     }
-        
-        <br />
-        <button type="submit">Submit</button>
-
-    </EditForm>
 </Authorized>
 </AuthorizeView>
 
@@ -61,6 +63,7 @@
 @code {
 
     public LiebUser _user;
+    private string _saveMessage = string.Empty;
 
     protected override async Task OnInitializedAsync()
     {
@@ -74,5 +77,6 @@
     private async Task HandleValidSubmit()
     {
         await UserService.EditUser(_user);
+        _saveMessage = "changes saved successfully";
     }
 }

Lieb/Pages/User/ManageGuildWars2Account.razor

@@ -18,8 +18,8 @@
     <Authorized>
         <EditForm Model="@_account" OnValidSubmit="@HandleValidSubmit">
             <DataAnnotationsValidator />
-            <ValidationSummary />
     
+            <p>@_saveMessage</p>
             <p>
                 <label>
                     Account name:
@@ -33,41 +33,19 @@
                 </label>
             </p>
 
+            <br />
+            <button type="submit">Save</button>
+            <ValidationSummary />
 
-            <label>Equipped Builds</label>
+        </EditForm>
-            <table>
+
-                <tr>
+        @if (_account.GuildWars2AccountId != 0)
-                    <th></th>
-                    <th>can Tank</th>
-                    <th>Build</th>
-                    <th>Class</th>
-                    <th>Elite</th>
-                    <th>Might</th>
-                    <th>Heal</th>
-                    <th>Quick</th>
-                    <th>Alac</th>
-                </tr>
-                @foreach (Equipped equippedBuild in _account.EquippedBuilds)
         {
-                    <tr>
+            <br />
-                        <td><button type=button @onclick="() => RemoveBuildClicked(equippedBuild.GuildWars2BuildId)">Remove</button></td>
-                        <td><input type="checkbox" checked="@equippedBuild.CanTank" @onchange="args => TankingStatusChanged(equippedBuild, args)" /></td>
-                        <td>@equippedBuild.GuildWars2Build.BuildName</td>
-                        <td>@equippedBuild.GuildWars2Build.Class.ToString()</td>
-                        <td>@equippedBuild.GuildWars2Build.EliteSpecialization.ToString()</td>
-                        <td>@equippedBuild.GuildWars2Build.Might.ToString()</td>
-                        <td>@equippedBuild.GuildWars2Build.Heal.ToString()</td>
-                        <td>@equippedBuild.GuildWars2Build.Quickness.ToString()</td>
-                        <td>@equippedBuild.GuildWars2Build.Alacrity.ToString()</td>
-                    </tr>
-                }
-            </table> 
-                
-            <p>
-                <label>Existing Builds</label>
             <table>
                 <tr>
-                    <th></th>
+                    <th>Equipped</th>
+                    <th>can Tank</th>
                     <th>Build</th>
                     <th>Class</th>
                     <th>Elite</th>
@@ -78,30 +56,32 @@
                 </tr>
                 @foreach (GuildWars2Build build in GuildWars2BuildService.GetBuilds())
                 {
-                    if(!_account.EquippedBuilds.Where(e => e.GuildWars2BuildId == build.GuildWars2BuildId).Any())
+                    Equipped? equippedBuild = _account.EquippedBuilds.FirstOrDefault(e => e.GuildWars2BuildId == build.GuildWars2BuildId);
+                    bool isEquipped = equippedBuild != null;
+                    bool canTank = false;
+                    if (isEquipped)
                     {
+                        canTank = equippedBuild.CanTank;
+                    }
+
                     <tr>
-                            <td><button type=button @onclick="() => AddBuildlicked(build)">Add</button></td>
+                        <td><input type="checkbox" checked="@isEquipped" @onchange="args => EquippedStatusChanged(build.GuildWars2BuildId, args)" /></td>
+                        <td><input type="checkbox" checked="@canTank" disabled="@(!isEquipped)" @onchange="args => TankingStatusChanged(build.GuildWars2BuildId, args)" /></td>
                         <td>@build.BuildName</td>
                         <td>@build.Class.ToString()</td>
                         <td>@build.EliteSpecialization.ToString()</td>
-                            <td>@build.Might.ToString()</td>
+                        <td><input type="checkbox" checked="@(build.Might > 0)" disabled="true" /></td>
-                            <td>@build.Heal.ToString()</td>
+                        <td><input type="checkbox" checked="@(build.Heal > 0)" disabled="true" /></td>
-                            <td>@build.Quickness.ToString()</td>
+                        <td><input type="checkbox" checked="@(build.Quickness > 0)" disabled="true" /></td>
-                            <td>@build.Alacrity.ToString()</td>
+                        <td><input type="checkbox" checked="@(build.Alacrity > 0)" disabled="true" /></td>
                     </tr>
                 }
-                }
             </table> 
-            </p>
             
-
-            <br />
-            <button type="submit">Submit</button>
-
-        </EditForm>
             <br/>
             <button type=button @onclick="() => DeleteAccountClicked()">Delete Account</button>
+        }
+             
     </Authorized>
 </AuthorizeView>
 
@@ -115,6 +95,8 @@
 
     private LiebUser _user;
 
+    private string _saveMessage = string.Empty;
+
     protected override async Task OnInitializedAsync()
     {
         var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
@@ -131,31 +113,24 @@
         }
     }
 
-    async Task AddBuildlicked(GuildWars2Build build)
+    async Task EquippedStatusChanged(int buildId, ChangeEventArgs args)
     {
-        Equipped equipped = new Equipped()
+        bool isEquipped = bool.Parse(args.Value.ToString());
+        if(isEquipped)
         {
-                GuildWars2AccountId = _account.GuildWars2AccountId,
+            await GuildWars2AccountService.AddBuild(_account.GuildWars2AccountId, buildId);
-                GuildWars2Account = _account,
+        }
-                GuildWars2BuildId = build.GuildWars2BuildId,
+        else
-                GuildWars2Build = build
+        {
-            };
+            await GuildWars2AccountService.RemoveBuild(_account.GuildWars2AccountId, buildId);
-        _account.EquippedBuilds.Add(equipped);
+        }
+        _account = GuildWars2AccountService.GetAccount(_account.GuildWars2AccountId);
     }
 
-
+    async Task TankingStatusChanged(int buildId, ChangeEventArgs args)
-    async Task RemoveBuildClicked(int buildId)
     {
-        Equipped equipped = _account.EquippedBuilds.FirstOrDefault(e => e.GuildWars2BuildId == buildId);
+        bool canTank = bool.Parse(args.Value.ToString());
-        if (equipped != null)
+        await GuildWars2AccountService.ChangeTankStatus(_account.GuildWars2AccountId, buildId, canTank);
-        {
-            _account.EquippedBuilds.Remove(equipped);
-        }
-    }
-
-    async Task TankingStatusChanged(Equipped equipped, ChangeEventArgs args)
-    {
-        equipped.CanTank =bool.Parse(args.Value.ToString());
     }
 
     async Task DeleteAccountClicked()
@@ -171,6 +146,7 @@
     private async Task HandleValidSubmit()
     {
         await GuildWars2AccountService.AddOrEditAccount(_account, _user.LiebUserId);
-        NavigationManager.NavigateTo("accountedit");
+        _account = GuildWars2AccountService.GetAccount(_account.GuildWars2AccountId);
+        _saveMessage = "changes saved successfully";
     }
 }

Lieb/Pages/User/UserEdit.razor

@@ -19,16 +19,28 @@
             
     <AuthorizeView Policy="@Constants.Roles.Admin" Context="authorizationContext">
         <Authorized>
+            <p>@_submitMessage</p>
             <p>
                 <label>
                     Banned Until:
                     <InputDate @bind-Value="_user.BannedUntil" />
                 </label>       
+                @if (_user.BannedUntil >= DateTime.Now.Date)
+                {
+                    <button type="submit">Ban</button>
+                }
+                else
+                {
+                    <button type="submit">Unban</button>
+            }
             </p>
         </Authorized>
     </AuthorizeView>
 
-    <table>
+</EditForm>
+
+
+<table>
     <tr>
         <th></th>
         <th>Role</th>
@@ -49,12 +61,8 @@
             }
         </tr>
     }
-    </table> 
+</table> 
-    <br />
+<br />
-    <button type="submit">Submit</button>
-
-</EditForm>
-
 
 @code {
 
@@ -64,6 +72,7 @@
     private LiebUser _user;
     private int _editingUserRights = 0;
     private List<LiebRole> _roles;
+    private string _submitMessage = string.Empty;
 
     protected override async Task OnInitializedAsync()
     {
@@ -101,17 +110,26 @@
                     LiebRoleId = role.LiebRoleId,
                     LiebUserId = _user.LiebUserId
                 };
+            await UserService.AddRoleToUser(_user.LiebUserId, role.LiebRoleId);
             _user.RoleAssignments.Add(roleAssignment);
         }
         else if(!isChecked && assignment != null)
         {
+            await UserService.RemoveRoleFromUser(_user.LiebUserId, role.LiebRoleId);
             _user.RoleAssignments.Remove(assignment);
         }
     }
 
     private async Task HandleValidSubmit()
     {
-        await UserService.EditUserRoles(_user);
+        await UserService.UpdateBannedUntil(_user.LiebUserId, _user.BannedUntil);
-        NavigationManager.NavigateTo("useroverview");
+        if(_user.BannedUntil >= DateTime.Now.Date)
+        {
+            _submitMessage = "user banned successfully";
+        }
+        else
+        {
+            _submitMessage = "user unbanned successfully";
+        }
     }
 }

Lieb/Pages/User/UserOverview.razor

@@ -38,11 +38,11 @@
         HashSet<LiebUser> foundUsers = new HashSet<LiebUser>();
         if(_bannedOnly)
         {
-            foreach(LiebUser user in _users.Where(u => u.Name.Contains(_searchString, StringComparison.OrdinalIgnoreCase) && u.BannedUntil > DateTime.Now))
+            foreach(LiebUser user in _users.Where(u => u.Name.Contains(_searchString, StringComparison.OrdinalIgnoreCase) && u.BannedUntil >= DateTime.Now.Date))
             {
                 foundUsers.Add(user);
             }
-            foreach(LiebUser user in _users.Where(u => u.GuildWars2Accounts.Where(a => a.AccountName.Contains(_searchString, StringComparison.OrdinalIgnoreCase)).Any() && u.BannedUntil > DateTime.Now))
+            foreach(LiebUser user in _users.Where(u => u.GuildWars2Accounts.Where(a => a.AccountName.Contains(_searchString, StringComparison.OrdinalIgnoreCase)).Any() && u.BannedUntil >= DateTime.Now.Date))
             {
                 foundUsers.Add(user);
             }
@@ -67,7 +67,10 @@
                 <NavLink class="nav-link" href="@navLink">@user.Name</NavLink>
             </td>
             <td>@foreach(var account in user.GuildWars2Accounts){<div>@account.AccountName </div> }</td>
+            @if(user.BannedUntil >= DateTime.Now.Date)
+            {
                 <td>@user.BannedUntil?.ToLongDateString()</td>
+            }
         </tr>
     }
 </table> 

Lieb/Shared/MainLayout.razor

@@ -14,7 +14,6 @@
         <div class="top-row px-4">
             <AuthorizeView>
             <Authorized>
-                <a href="accountedit">Hello, @context.User.Identity.Name!</a>
                 <a href="Account/Logout">Log out</a>
             </Authorized>
             <NotAuthorized>