From dcdc891925bbdd584f6b8815ab4858d2829e0fb5 Mon Sep 17 00:00:00 2001 From: "t.ruspekhofer" Date: Wed, 6 Apr 2022 23:20:29 +0200 Subject: [PATCH] Renamed PlannedRaidRole to RaidRole --- Lieb/Data/DbInitializer.cs | 10 +++--- Lieb/Data/LiebContext.cs | 2 ++ Lieb/Data/RaidRandomizerService.cs | 10 +++--- Lieb/Data/RaidService.cs | 36 +++++++++---------- Lieb/Pages/GuildWars2/BuildEdit.razor | 2 +- Lieb/Pages/GuildWars2/BuildOverview.razor | 2 +- Lieb/Pages/GuildWars2/RaidLogs.razor | 2 +- Lieb/Pages/Raids/RaidEdit.razor | 4 +-- Lieb/Pages/Raids/RaidOverview.razor | 20 ++++++++--- Lieb/Pages/Raids/RaidOverview.razor.css | 7 ++++ Lieb/Pages/Raids/RaidRoles.razor | 2 +- Lieb/Pages/Raids/SignedUpUsers.razor | 2 +- Lieb/Pages/User/ManageAccount.razor | 2 +- Lieb/Pages/User/ManageGuildWars2Account.razor | 2 +- Lieb/Pages/User/UserEdit.razor | 2 +- Lieb/Pages/User/UserOverview.razor | 2 +- Shared/Models/GuildWars2/Raid/RaidSignUp.cs | 4 +-- 17 files changed, 65 insertions(+), 46 deletions(-) create mode 100644 Lieb/Pages/Raids/RaidOverview.razor.css diff --git a/Lieb/Data/DbInitializer.cs b/Lieb/Data/DbInitializer.cs index c0fedf1..b1fe83a 100644 --- a/Lieb/Data/DbInitializer.cs +++ b/Lieb/Data/DbInitializer.cs @@ -158,11 +158,11 @@ namespace Lieb.Data var signUps = new RaidSignUp[] { - new RaidSignUp{GuildWars2AccountId = linaith.GuildWars2AccountId, LiebUserId = users[0].LiebUserId, PlannedRaidRoleId = ele.RaidRoleId, RaidId = raid.RaidId, SignUpType = SignUpType.SignedUp }, - new RaidSignUp{GuildWars2AccountId = hierpiepts.GuildWars2AccountId, LiebUserId = users[1].LiebUserId, PlannedRaidRoleId = flexTest1.RaidRoleId, RaidId = raid.RaidId, SignUpType = SignUpType.SignedUp }, - new RaidSignUp{GuildWars2AccountId = bloodseeker.GuildWars2AccountId, LiebUserId = users[2].LiebUserId, PlannedRaidRoleId = flexTest2.RaidRoleId, RaidId = raid.RaidId, SignUpType = SignUpType.SignedUp }, - new RaidSignUp{GuildWars2AccountId = hierpiepts.GuildWars2AccountId, LiebUserId = users[1].LiebUserId, PlannedRaidRoleId = flexTest2.RaidRoleId, RaidId = raid.RaidId, SignUpType = SignUpType.Flex }, - new RaidSignUp{GuildWars2AccountId = bloodseeker.GuildWars2AccountId, LiebUserId = users[2].LiebUserId, PlannedRaidRoleId = flexTest3.RaidRoleId, RaidId = raid.RaidId, SignUpType = SignUpType.Flex } + new RaidSignUp{GuildWars2AccountId = linaith.GuildWars2AccountId, LiebUserId = users[0].LiebUserId, RaidRoleId = ele.RaidRoleId, RaidId = raid.RaidId, SignUpType = SignUpType.SignedUp }, + new RaidSignUp{GuildWars2AccountId = hierpiepts.GuildWars2AccountId, LiebUserId = users[1].LiebUserId, RaidRoleId = flexTest1.RaidRoleId, RaidId = raid.RaidId, SignUpType = SignUpType.SignedUp }, + new RaidSignUp{GuildWars2AccountId = bloodseeker.GuildWars2AccountId, LiebUserId = users[2].LiebUserId, RaidRoleId = flexTest2.RaidRoleId, RaidId = raid.RaidId, SignUpType = SignUpType.SignedUp }, + new RaidSignUp{GuildWars2AccountId = hierpiepts.GuildWars2AccountId, LiebUserId = users[1].LiebUserId, RaidRoleId = flexTest2.RaidRoleId, RaidId = raid.RaidId, SignUpType = SignUpType.Flex }, + new RaidSignUp{GuildWars2AccountId = bloodseeker.GuildWars2AccountId, LiebUserId = users[2].LiebUserId, RaidRoleId = flexTest3.RaidRoleId, RaidId = raid.RaidId, SignUpType = SignUpType.Flex } }; context.RaidSignUps.AddRange(signUps); diff --git a/Lieb/Data/LiebContext.cs b/Lieb/Data/LiebContext.cs index 47954ff..6184920 100644 --- a/Lieb/Data/LiebContext.cs +++ b/Lieb/Data/LiebContext.cs @@ -25,6 +25,7 @@ namespace Lieb.Data public DbSet RaidReminders { get; set; } public DbSet RaidSignUps { get; set; } public DbSet RaidSignUpHistories { get; set; } + public DbSet DiscordRaidMessages { get; set; } protected override void OnModelCreating(ModelBuilder modelBuilder) @@ -41,6 +42,7 @@ namespace Lieb.Data modelBuilder.Entity().ToTable("RaidReminder"); modelBuilder.Entity().ToTable("RaidSignUp"); modelBuilder.Entity().ToTable("RaidSignUpHistory"); + modelBuilder.Entity().ToTable("DiscordRaidMessage"); } } } diff --git a/Lieb/Data/RaidRandomizerService.cs b/Lieb/Data/RaidRandomizerService.cs index 51300a4..c011075 100644 --- a/Lieb/Data/RaidRandomizerService.cs +++ b/Lieb/Data/RaidRandomizerService.cs @@ -28,7 +28,7 @@ namespace Lieb.Data .ThenInclude(a => a.EquippedBuilds) .ThenInclude(e => e.GuildWars2Build) .Include(r => r.SignUps) - .ThenInclude(s => s.PlannedRaidRole) + .ThenInclude(s => s.RaidRole) .FirstOrDefault(r => r.RaidId == raidId); if (raid == null || raid.RaidType == RaidType.Planned) @@ -71,7 +71,7 @@ namespace Lieb.Data role.Name = "No class found."; } raid.Roles.Add(role); - signUp.PlannedRaidRole = role; + signUp.RaidRole = role; } } @@ -95,7 +95,7 @@ namespace Lieb.Data role.Name = "No class found."; } raid.Roles.Add(role); - signUp.PlannedRaidRole = role; + signUp.RaidRole = role; } } @@ -117,7 +117,7 @@ namespace Lieb.Data role.Name = userBuild.Value.BuildName; raid.Roles.Add(role); RaidSignUp signUp = raid.SignUps.FirstOrDefault(s => s.LiebUserId == userBuild.Key); - signUp.PlannedRaidRole = role; + signUp.RaidRole = role; } } @@ -329,7 +329,7 @@ namespace Lieb.Data List rolesToDelete = new List(); foreach (RaidRole role in raid.Roles) { - if (!role.IsRandomSignUpRole && raid.SignUps.FirstOrDefault(s => s.PlannedRaidRoleId == role.RaidRoleId) == null) + if (!role.IsRandomSignUpRole && raid.SignUps.FirstOrDefault(s => s.RaidRoleId == role.RaidRoleId) == null) { rolesToDelete.Add(role); } diff --git a/Lieb/Data/RaidService.cs b/Lieb/Data/RaidService.cs index a4dc798..b5219fe 100644 --- a/Lieb/Data/RaidService.cs +++ b/Lieb/Data/RaidService.cs @@ -25,7 +25,7 @@ namespace Lieb.Data .Include(r => r.SignUps) .ThenInclude(s => s.GuildWars2Account) .Include(r => r.SignUps) - .ThenInclude(s => s.PlannedRaidRole) + .ThenInclude(s => s.RaidRole) .ToList(); } @@ -41,7 +41,7 @@ namespace Lieb.Data .Include(r => r.SignUps) .ThenInclude(s => s.GuildWars2Account) .Include(r => r.SignUps) - .ThenInclude(s => s.PlannedRaidRole) + .ThenInclude(s => s.RaidRole) .FirstOrDefault(r => r.RaidId == raidId); } @@ -67,7 +67,7 @@ namespace Lieb.Data RaidRole randomRole = raid.Roles.FirstOrDefault(r => r.IsRandomSignUpRole); foreach (RaidSignUp signUp in raid.SignUps) { - signUp.PlannedRaidRole = randomRole; + signUp.RaidRole = randomRole; } context.RaidRoles.RemoveRange(raid.Roles.Where(r => !r.IsRandomSignUpRole)); } @@ -103,14 +103,14 @@ namespace Lieb.Data { ChangeSignUpType(raidId, liebUserId, plannedRoleId, signUpType); } - else if (!signUps.Where(r => r.PlannedRaidRoleId == plannedRoleId).Any()) + else if (!signUps.Where(r => r.RaidRoleId == plannedRoleId).Any()) { context.RaidSignUps.Add(new RaidSignUp() { GuildWars2AccountId = guildWars2AccountId, RaidId = raidId, LiebUserId = liebUserId, - PlannedRaidRoleId = plannedRoleId, + RaidRoleId = plannedRoleId, SignUpType = signUpType }); await context.SaveChangesAsync(); @@ -132,10 +132,10 @@ namespace Lieb.Data //change and delete Role for Random Raids Raid? raid = context.Raids.Include(r => r.Roles).FirstOrDefault(r => r.RaidId == raidId); - if(raid != null && raid.RaidType != RaidType.Planned && !signUp.PlannedRaidRole.IsRandomSignUpRole) + if(raid != null && raid.RaidType != RaidType.Planned && !signUp.RaidRole.IsRandomSignUpRole) { - context.RaidRoles.Remove(signUp.PlannedRaidRole); - signUp.PlannedRaidRole = raid.Roles.FirstOrDefault(r => r.IsRandomSignUpRole); + context.RaidRoles.Remove(signUp.RaidRole); + signUp.RaidRole = raid.Roles.FirstOrDefault(r => r.IsRandomSignUpRole); } } @@ -165,18 +165,18 @@ namespace Lieb.Data List signUps = context.RaidSignUps.Where(x => x.RaidId == raidId && x.LiebUserId == liebUserId).ToList(); RaidSignUp? signUp = signUps.FirstOrDefault(x => x.SignUpType != SignUpType.Flex); - RaidSignUp? flexSignUp = signUps.FirstOrDefault(x => x.SignUpType == SignUpType.Flex && x.PlannedRaidRoleId == plannedRoleId); + RaidSignUp? flexSignUp = signUps.FirstOrDefault(x => x.SignUpType == SignUpType.Flex && x.RaidRoleId == plannedRoleId); //change Flex to current role if (flexSignUp != null && signUp != null) { - flexSignUp.PlannedRaidRoleId = signUp.PlannedRaidRoleId; + flexSignUp.RaidRoleId = signUp.RaidRoleId; } //change to new role if (signUp != null) { - signUp.PlannedRaidRoleId = plannedRoleId; + signUp.RaidRoleId = plannedRoleId; signUp.SignUpType = signUpType; } context.SaveChanges(); @@ -191,7 +191,7 @@ namespace Lieb.Data using var context = _contextFactory.CreateDbContext(); - List signUps = context.RaidSignUps.Where(s => s.PlannedRaidRoleId == plannedRoleId).ToList(); + List signUps = context.RaidSignUps.Where(s => s.RaidRoleId == plannedRoleId).ToList(); RaidRole? role = context.RaidRoles .FirstOrDefault(r => r.RaidRoleId == plannedRoleId); @@ -237,9 +237,9 @@ namespace Lieb.Data // new sign up is available if there are free spots and the user is not signed up or still in the random role RaidSignUp? signUp = raid.SignUps.FirstOrDefault(s => s.LiebUserId == liebUserId); return raid.SignUps.Where(s => s.SignUpType == SignUpType.SignedUp).Count() < role.Spots - && (signUp == null || signUp.PlannedRaidRoleId == plannedRoleId || signUp.SignUpType == SignUpType.SignedOff); + && (signUp == null || signUp.RaidRoleId == plannedRoleId || signUp.SignUpType == SignUpType.SignedOff); } - return raid.SignUps.Where(s => s.LiebUserId == liebUserId && s.PlannedRaidRoleId == plannedRoleId).Any(); + return raid.SignUps.Where(s => s.LiebUserId == liebUserId && s.RaidRoleId == plannedRoleId).Any(); } } @@ -257,16 +257,16 @@ namespace Lieb.Data return false; } - foreach (int userId in raid.SignUps.Where(s => s.PlannedRaidRoleId == plannedRoleId && s.SignUpType == SignUpType.SignedUp).Select(s => s.LiebUserId)) + foreach (int userId in raid.SignUps.Where(s => s.RaidRoleId == plannedRoleId && s.SignUpType == SignUpType.SignedUp).Select(s => s.LiebUserId)) { foreach (RaidSignUp signUp in raid.SignUps.Where(s => s.LiebUserId == userId && s.SignUpType == SignUpType.Flex)) { - if (!checkedRoleIds.Contains(signUp.PlannedRaidRoleId) - && await IsRoleSignUpAllowed(raid, userId, signUp.PlannedRaidRoleId, SignUpType.SignedUp, moveFlexUser, checkedRoleIds)) + if (!checkedRoleIds.Contains(signUp.RaidRoleId) + && await IsRoleSignUpAllowed(raid, userId, signUp.RaidRoleId, SignUpType.SignedUp, moveFlexUser, checkedRoleIds)) { if (moveFlexUser) { - ChangeSignUpType(raid.RaidId, userId, signUp.PlannedRaidRoleId, SignUpType.SignedUp); + ChangeSignUpType(raid.RaidId, userId, signUp.RaidRoleId, SignUpType.SignedUp); } return true; } diff --git a/Lieb/Pages/GuildWars2/BuildEdit.razor b/Lieb/Pages/GuildWars2/BuildEdit.razor index fab2a43..02c5508 100644 --- a/Lieb/Pages/GuildWars2/BuildEdit.razor +++ b/Lieb/Pages/GuildWars2/BuildEdit.razor @@ -8,7 +8,7 @@ @inject IJSRuntime JsRuntime -

BuildEdit

+

Build Edit

diff --git a/Lieb/Pages/GuildWars2/BuildOverview.razor b/Lieb/Pages/GuildWars2/BuildOverview.razor index aee8b60..2caaf90 100644 --- a/Lieb/Pages/GuildWars2/BuildOverview.razor +++ b/Lieb/Pages/GuildWars2/BuildOverview.razor @@ -4,7 +4,7 @@ @inject GuildWars2BuildService GuildWars2BuildService -

BuildOverview

+

Build Overview

diff --git a/Lieb/Pages/GuildWars2/RaidLogs.razor b/Lieb/Pages/GuildWars2/RaidLogs.razor index 5e8bf4c..5c8b026 100644 --- a/Lieb/Pages/GuildWars2/RaidLogs.razor +++ b/Lieb/Pages/GuildWars2/RaidLogs.razor @@ -8,7 +8,7 @@ @inject AuthenticationStateProvider AuthenticationStateProvider -

RaidLogs

+

Raid Logs

To: - RaidGroup: + Raid Group: