Added account management sites

Lieb/Data/GuildWars2AccountService.cs

@@ -13,72 +13,80 @@ namespace Lieb.Data
             _contextFactory = contextFactory;
         }
 
-        public async Task AddAccount(GuildWars2Account guildWars2Account, ulong discordId)
+        public GuildWars2Account GetAccount(int gw2AccountId)
         {
             using var context = _contextFactory.CreateDbContext();
-            LiebUser liebUser = await context.LiebUsers.FirstOrDefaultAsync(u => u.DiscordUserId == discordId);
+            return context.GuildWars2Accounts
-            if (liebUser != null)
+                .Include(a => a.EquippedBuilds)
-            {
+                .ThenInclude(e => e.GuildWars2Build)
-                liebUser.GuildWars2Accounts.Add(guildWars2Account);
+                .FirstOrDefault(a => a.GuildWars2AccountId == gw2AccountId);
-                await context.SaveChangesAsync();
-            }
         }
 
-        public async Task UpdateAccount(int guildWars2AccountId, string accountName, string apiKey)
+        public async Task AddOrEditAccount(GuildWars2Account account, int userId)
         {
-            using var context = _contextFactory.CreateDbContext();
-            GuildWars2Account account = await context.GuildWars2Accounts.FirstOrDefaultAsync(u => u.GuildWars2AccountId == guildWars2AccountId);
             if (account != null)
             {
-                account.ApiKey = apiKey;
+                using var context = _contextFactory.CreateDbContext();
-                if (!string.IsNullOrEmpty(accountName))
+                if (account.GuildWars2AccountId == 0)
                 {
-                    account.AccountName = accountName;
+                    //context.GuildWars2Accounts.Add(account);
+                    LiebUser user = context.LiebUsers.FirstOrDefault(u => u.LiebUserId == userId);
+                    if(user != null)
+                    {
+                        user.GuildWars2Accounts.Add(account);
+                    }
+                    await context.SaveChangesAsync();
+                }
+                else
+                {
+                    GuildWars2Account accountToChange = context.GuildWars2Accounts
+                        .Include(a => a.EquippedBuilds)
+                        .Include(e => e.EquippedBuilds)
+                        .FirstOrDefault(a => a.GuildWars2AccountId == account.GuildWars2AccountId);
+
+                    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();
                 }
-                await context.SaveChangesAsync();
             }
         }
 
-        public async Task RemoveAccount()
+
+        public async Task DeleteAccount(int accountId)
         {
             using var context = _contextFactory.CreateDbContext();
-
+            GuildWars2Account? account = await context.GuildWars2Accounts.FirstOrDefaultAsync(b => b.GuildWars2AccountId == accountId);
-        }
+            if (account != null)
-
+            {
-        public async Task AddBuildToAccount()
+                context.Equipped.RemoveRange(account.EquippedBuilds);
-        {
+                await context.SaveChangesAsync();
-            using var context = _contextFactory.CreateDbContext();
+                context.GuildWars2Accounts.Remove(account);
-
+                await context.SaveChangesAsync();
-        }
+            }
-
-        public async Task RemoveBuildFromAccount()
-        {
-            using var context = _contextFactory.CreateDbContext();
-
-        }
-
-        public async Task<List<GuildWars2Build>> GetBuilds()
-        {
-            using var context = _contextFactory.CreateDbContext();
-            return context.GuildWars2Builds.ToList();
-        }
-
-        public async Task CreateBuild()
-        {
-            using var context = _contextFactory.CreateDbContext();
-            await context.SaveChangesAsync();
-        }
-
-        public async Task UpdateBuild()
-        {
-            using var context = _contextFactory.CreateDbContext();
-            await context.SaveChangesAsync();
-        }
-
-        public async Task DeleteBuild()
-        {
-            using var context = _contextFactory.CreateDbContext();
-            await context.SaveChangesAsync();
         }
     }
 }

Lieb/Data/RaidService.cs

@@ -76,7 +76,8 @@ namespace Lieb.Data
                     raidToChange.DiscordChannelId = raid.DiscordChannelId;
                     raidToChange.DiscordGuildId = raid.DiscordGuildId;
 
-                    foreach(PlannedRaidRole role in raidToChange.Roles)
+                    List<PlannedRaidRole> rolesToRemove = new List<PlannedRaidRole>();
+                    foreach (PlannedRaidRole role in raidToChange.Roles)
                     {
                         PlannedRaidRole? newRole = raid.Roles.FirstOrDefault(r => r.PlannedRaidRoleId == role.PlannedRaidRoleId);
                         if(newRole != null)
@@ -87,15 +88,20 @@ namespace Lieb.Data
                         }
                         else
                         {
-                            raidToChange.Roles.Remove(role);
+                            rolesToRemove.Add(role);
-                            context.PlannedRaidRoles.Remove(role);
                         }
                     }
+                    foreach(PlannedRaidRole role in rolesToRemove)
+                    {
+                        raidToChange.Roles.Remove(role);
+                        context.PlannedRaidRoles.Remove(role);
+                    }
                     foreach (PlannedRaidRole role in raid.Roles.Where(r => r.PlannedRaidRoleId == 0))
                     {
                         raidToChange.Roles.Add(role);
                     }
 
+                    List<RaidReminder> reminderToRemove = new List<RaidReminder>();
                     foreach (RaidReminder reminder in raidToChange.Reminders)
                     {
                         RaidReminder? newReminder = raid.Reminders.FirstOrDefault(r => r.RaidReminderId == reminder.RaidReminderId);
@@ -109,10 +115,14 @@ namespace Lieb.Data
                         }
                         else
                         {
-                            raidToChange.Reminders.Remove(reminder);
+                            reminderToRemove.Add(reminder);
-                            context.RaidReminders.Remove(reminder);
                         }
                     }
+                    foreach(RaidReminder reminder in reminderToRemove)
+                    {
+                        raidToChange.Reminders.Remove(reminder);
+                        context.RaidReminders.Remove(reminder);
+                    }
                     foreach (PlannedRaidRole role in raid.Roles.Where(r => r.PlannedRaidRoleId == 0))
                     {
                         raidToChange.Roles.Add(role);

Lieb/Data/UserService.cs

@@ -1,4 +1,5 @@
 using Lieb.Models;
+using Lieb.Models.GuildWars2;
 using Microsoft.EntityFrameworkCore;
 
 namespace Lieb.Data
@@ -52,5 +53,21 @@ namespace Lieb.Data
             else
                 return -1;
         }
+
+        public async Task EditUser(LiebUser user)
+        {
+            using var context = _contextFactory.CreateDbContext();
+            LiebUser? userToChange = context.LiebUsers
+            .Include(u => u.GuildWars2Accounts)
+            .FirstOrDefault(u => u.LiebUserId == user.LiebUserId);
+
+            if(userToChange != null)
+            {
+                userToChange.Name = user.Name;
+                userToChange.Pronouns = user.Pronouns;
+                userToChange.Birthday = user.Birthday;
+            }
+            await context.SaveChangesAsync();
+        }
     }
 }

Lieb/Models/GuildWars2/GuildWars2Account.cs

@@ -1,9 +1,13 @@
-namespace Lieb.Models.GuildWars2
+using System.ComponentModel.DataAnnotations;
+
+namespace Lieb.Models.GuildWars2
 {
     public class GuildWars2Account
     {
         public int GuildWars2AccountId { get; set; }
         public string ApiKey { get; set; } = string.Empty;
+        [Required]
+        [RegularExpression("^[a-zA-z ]{3,27}\\.[0-9]{4}$", ErrorMessage = "Invalid Account Name")]
         public string AccountName { get; set; } = string.Empty;
         public ICollection<Equipped> EquippedBuilds { get; set; } = new List<Equipped>();
 

Lieb/Pages/GuildWars2/BuildEdit.razor

@@ -98,7 +98,7 @@
 
     async Task DeleteBuildClicked()
     {
-        bool confirmed = await JsRuntime.InvokeAsync<bool>("confirm", "Are you sure?");
+        bool confirmed = await JsRuntime.InvokeAsync<bool>("confirm", "Are you sure you want to delete this Build?");
         if (confirmed)
         {
             await GuildWars2BuildService.DeleteBuild(_build.GuildWars2BuildId);

Lieb/Pages/Raids/RaidDetails.razor

@@ -140,10 +140,10 @@
 <AuthorizeView Policy="RaidLead">
     <div class="nav-item px-3">
         @{string navLink = $"raidedit/{@Raid.RaidId}";}
-            <NavLink class="nav-link" href="@navLink">
+        <NavLink class="nav-link" href="@navLink">
-                <span class="oi oi-plus" aria-hidden="true"></span> Edit
+            <span class="oi oi-plus" aria-hidden="true"></span> Edit
-            </NavLink>
+        </NavLink>
-        </div>
+    </div>
 </AuthorizeView>
 </body>
 

Lieb/Pages/Raids/RaidEdit.razor

@@ -150,7 +150,7 @@
 
     async Task DeleteRaidClicked()
     {
-        bool confirmed = await JsRuntime.InvokeAsync<bool>("confirm", "Are you sure?");
+        bool confirmed = await JsRuntime.InvokeAsync<bool>("confirm", "Are you sure you want to delete the raid?");
         if (confirmed)
         {
             await RaidService.DeleteRaid(_raid.RaidId);
@@ -171,5 +171,6 @@
         }
 
         await RaidService.AddOrEditRaid(_raid);
+        NavigationManager.NavigateTo("raidoverview");
     }
 }

Lieb/Pages/User/ManageAccount.razor

@@ -0,0 +1,78 @@
+@page "/accountedit"
+@using Lieb.Data
+@using Lieb.Models
+@using Lieb.Models.GuildWars2
+@using System.ComponentModel.DataAnnotations
+@using System.Security.Claims
+@inject UserService UserService
+@inject NavigationManager NavigationManager
+@inject AuthenticationStateProvider AuthenticationStateProvider
+
+<h3>ManageAccount</h3>
+
+<AuthorizeView Context="authorizationContext">
+    <Authorized>
+    <EditForm Model="@_user" OnValidSubmit="@HandleValidSubmit">
+        <DataAnnotationsValidator />
+        <ValidationSummary />
+    
+        <p>
+            <label>
+                Name:
+                <InputText @bind-Value="_user.Name" />
+            </label>
+        </p>
+        <p>
+            <label>
+                Pronouns:
+                <InputText @bind-Value="_user.Pronouns" />
+            </label>
+        </p>
+        
+        <p>
+            <label>
+                Birthday:
+                <InputDate @bind-Value="_user.Birthday" />
+            </label>
+        </p>
+        
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="gw2accountedit">
+                <span class="oi oi-plus" aria-hidden="true"></span> Add Account
+            </NavLink>
+        </div>
+
+        @foreach(GuildWars2Account account in _user.GuildWars2Accounts)
+        {
+            <div class="nav-item px-3">
+                @{string navLink = $"gw2accountedit/{@account.GuildWars2AccountId}";}
+                <NavLink class="nav-link" href="@navLink">@account.AccountName</NavLink>
+            </div>
+        }
+        
+        <br />
+        <button type="submit">Submit</button>
+
+    </EditForm>
+</Authorized>
+</AuthorizeView>
+
+
+@code {
+
+    public LiebUser _user;
+
+    protected override async Task OnInitializedAsync()
+    {
+        var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+
+        ulong discordId = ulong.Parse(authState.User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value);
+        _user = UserService.GetLiebUserSmall(discordId);
+    }
+
+
+    private async Task HandleValidSubmit()
+    {
+        await UserService.EditUser(_user);
+    }
+}

Lieb/Pages/User/ManageGuildWars2Account.razor

@@ -0,0 +1,145 @@
+@page "/gw2accountedit"
+@page "/gw2accountedit/{gw2Id}"
+@using Lieb.Data
+@using Lieb.Models
+@using Lieb.Models.GuildWars2
+@using System.ComponentModel.DataAnnotations
+@using System.Security.Claims
+@inject GuildWars2AccountService GuildWars2AccountService
+@inject GuildWars2BuildService GuildWars2BuildService
+@inject UserService UserService
+@inject NavigationManager NavigationManager
+@inject AuthenticationStateProvider AuthenticationStateProvider
+@inject IJSRuntime JsRuntime
+
+<h3>ManageGuildWars2Account</h3>
+
+<AuthorizeView Context="authorizationContext">
+    <Authorized>
+        <EditForm Model="@_account" OnValidSubmit="@HandleValidSubmit">
+            <DataAnnotationsValidator />
+            <ValidationSummary />
+    
+            <p>
+                <label>
+                    Account name:
+                    <InputText @bind-Value="_account.AccountName" />
+                </label>
+            </p>
+            <p>
+                <label>
+                    Api-Key:
+                    <InputText @bind-Value="_account.ApiKey" />
+                </label>
+            </p>
+
+            
+             <table>
+                <tr>
+                    <th></th>
+                    <th>can Tank</th>
+                    <th>Build</th>
+                </tr>
+        
+            
+                <label>Equipped Builds</label>
+                @foreach (Equipped equippedBuild in _account.EquippedBuilds)
+                {
+                    <tr>
+                        <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>
+                    </tr>
+                }
+            </table> 
+                
+            <p>
+                <label>Existing Builds</label>
+                @foreach (GuildWars2Build build in GuildWars2BuildService.GetBuilds())
+                {
+                    if(!_account.EquippedBuilds.Where(e => e.GuildWars2BuildId == build.GuildWars2BuildId).Any())
+                    {
+                        <div><button type=button @onclick="() => AddBuildlicked(build)">Add</button>@build.BuildName</div>
+                    }
+                }
+            </p>
+        
+
+            <br />
+            <button type="submit">Submit</button>
+
+        </EditForm>
+        <br/>
+        <button type=button @onclick="() => DeleteAccountClicked()">Delete Account</button>
+    </Authorized>
+</AuthorizeView>
+
+
+@code {
+
+    [Parameter]
+    public string gw2Id { get; set; }
+
+    public GuildWars2Account _account;
+
+    private LiebUser _user;
+
+    protected override async Task OnInitializedAsync()
+    {
+        var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+        ulong discordId = ulong.Parse(authState.User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value);
+        _user = UserService.GetLiebUserSmall(discordId);
+
+        if(!string.IsNullOrEmpty(gw2Id) && int.TryParse(gw2Id, out int parsedId) && _user.GuildWars2Accounts.Where(a => a.GuildWars2AccountId == parsedId).Any())
+        {
+            _account = GuildWars2AccountService.GetAccount(parsedId);
+        }
+        else
+        {
+            _account = new GuildWars2Account();
+        }
+    }
+
+    async Task AddBuildlicked(GuildWars2Build build)
+    {
+        Equipped equipped = new Equipped()
+            {
+                GuildWars2AccountId = _account.GuildWars2AccountId,
+                GuildWars2Account = _account,
+                GuildWars2BuildId = build.GuildWars2BuildId,
+                GuildWars2Build = build
+            };
+        _account.EquippedBuilds.Add(equipped);
+    }
+
+
+    async Task RemoveBuildClicked(int buildId)
+    {
+        Equipped equipped = _account.EquippedBuilds.FirstOrDefault(e => e.GuildWars2BuildId == buildId);
+        if (equipped != null)
+        {
+            _account.EquippedBuilds.Remove(equipped);
+        }
+    }
+
+    async Task TankingStatusChanged(Equipped equipped, ChangeEventArgs args)
+    {
+        equipped.CanTank =bool.Parse(args.Value.ToString());
+    }
+
+    async Task DeleteAccountClicked()
+    {
+        bool confirmed = await JsRuntime.InvokeAsync<bool>("confirm", "Are you sure you want to delete this Account?\nThis will sign you off in every raid in which you are signed up with this account.");
+        if (confirmed)
+        {
+            await GuildWars2AccountService.DeleteAccount(_account.GuildWars2AccountId);
+            NavigationManager.NavigateTo("accountedit");
+        }
+    }
+
+    private async Task HandleValidSubmit()
+    {
+        await GuildWars2AccountService.AddOrEditAccount(_account, _user.LiebUserId);
+        NavigationManager.NavigateTo("accountedit");
+    }
+}

Lieb/Shared/NavMenu.razor

@@ -24,6 +24,11 @@
                 <span class="oi oi-list-rich" aria-hidden="true"></span> Build Overview
             </NavLink>
         </div>
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="accountedit">
+                <span class="oi oi-list-rich" aria-hidden="true"></span> Account
+            </NavLink>
+        </div>
     </nav>
 </div>