Sarah/Lieb-Website
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

merged LiebUserId with DiscordId

Browse source
This commit is contained in:
t.ruspekhofer 2022-05-17 23:14:58 +02:00
parent 49374412b3
commit d54ce50336
19 changed files with 109 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Lieb/Data/DbInitializer.cs
View file

@ -40,11 +40,11 @@ namespace Lieb.Data
GuildWars2Account bloodseeker = new GuildWars2Account() { AccountName = "Bloodseeker.2043" }; GuildWars2Account bloodseeker = new GuildWars2Account() { AccountName = "Bloodseeker.2043" };
var users = new LiebUser[] var users = new LiebUser[]
{ {
//new LiebUser{DiscordUserId=0, Name="Sarah", Birthday=DateTime.Parse("1992-01-15"), GuildWars2Accounts = new List<GuildWars2Account>(){ linaith, sarah} }, new LiebUser{Id=0, Name="Sarah", Birthday=DateTime.Parse("1992-01-15"), GuildWars2Accounts = new List<GuildWars2Account>(){ linaith, sarah} },
new LiebUser{DiscordUserId=194863625477816321, Name="Sarah", Birthday=DateTime.Parse("1992-01-15"), GuildWars2Accounts = new List<GuildWars2Account>(){ linaith, sarah} }, //new LiebUser{Id=194863625477816321, Name="Sarah", Birthday=DateTime.Parse("1992-01-15"), GuildWars2Accounts = new List<GuildWars2Account>(){ linaith, sarah} },
#if DEBUG #if DEBUG
new LiebUser{DiscordUserId=1, Name="Lisa", GuildWars2Accounts = new List<GuildWars2Account>(){ hierpiepts}}, new LiebUser{Id=1, Name="Lisa", GuildWars2Accounts = new List<GuildWars2Account>(){ hierpiepts}},
new LiebUser{DiscordUserId=2, Name="Simon", GuildWars2Accounts = new List<GuildWars2Account>(){ bloodseeker}} new LiebUser{Id=2, Name="Simon", GuildWars2Accounts = new List<GuildWars2Account>(){ bloodseeker}}
#endif #endif
}; };
@ -59,18 +59,18 @@ namespace Lieb.Data
var assignments = new RoleAssignment[] var assignments = new RoleAssignment[]
{ {
new RoleAssignment{LiebUserId = users[0].LiebUserId, LiebRoleId = AdminRoleId }, new RoleAssignment{LiebUserId = users[0].Id, LiebRoleId = AdminRoleId },
new RoleAssignment{LiebUserId = users[0].LiebUserId, LiebRoleId = GuildLeadRoleId }, new RoleAssignment{LiebUserId = users[0].Id, LiebRoleId = GuildLeadRoleId },
new RoleAssignment{LiebUserId = users[0].LiebUserId, LiebRoleId = RaidLeadRoleId }, new RoleAssignment{LiebUserId = users[0].Id, LiebRoleId = RaidLeadRoleId },
new RoleAssignment{LiebUserId = users[0].LiebUserId, LiebRoleId = UserRoleId } new RoleAssignment{LiebUserId = users[0].Id, LiebRoleId = UserRoleId }
#if DEBUG #if DEBUG
,new RoleAssignment{LiebUserId = users[1].LiebUserId, LiebRoleId = AdminRoleId }, ,new RoleAssignment{LiebUserId = users[1].Id, LiebRoleId = AdminRoleId },
new RoleAssignment{LiebUserId = users[1].LiebUserId, LiebRoleId = GuildLeadRoleId }, new RoleAssignment{LiebUserId = users[1].Id, LiebRoleId = GuildLeadRoleId },
new RoleAssignment{LiebUserId = users[1].LiebUserId, LiebRoleId = RaidLeadRoleId }, new RoleAssignment{LiebUserId = users[1].Id, LiebRoleId = RaidLeadRoleId },
new RoleAssignment{LiebUserId = users[1].LiebUserId, LiebRoleId = UserRoleId }, new RoleAssignment{LiebUserId = users[1].Id, LiebRoleId = UserRoleId },
new RoleAssignment{LiebUserId = users[2].LiebUserId, LiebRoleId = GuildLeadRoleId }, new RoleAssignment{LiebUserId = users[2].Id, LiebRoleId = GuildLeadRoleId },
new RoleAssignment{LiebUserId = users[2].LiebUserId, LiebRoleId = RaidLeadRoleId }, new RoleAssignment{LiebUserId = users[2].Id, LiebRoleId = RaidLeadRoleId },
new RoleAssignment{LiebUserId = users[2].LiebUserId, LiebRoleId = UserRoleId } new RoleAssignment{LiebUserId = users[2].Id, LiebRoleId = UserRoleId }
#endif #endif
}; };
@ -158,11 +158,11 @@ namespace Lieb.Data
var signUps = new RaidSignUp[] var signUps = new RaidSignUp[]
{ {
new RaidSignUp{GuildWars2AccountId = linaith.GuildWars2AccountId, LiebUserId = users[0].LiebUserId, RaidRoleId = ele.RaidRoleId, RaidId = raid.RaidId, SignUpType = SignUpType.SignedUp }, new RaidSignUp{GuildWars2AccountId = linaith.GuildWars2AccountId, LiebUserId = users[0].Id, 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 = hierpiepts.GuildWars2AccountId, LiebUserId = users[1].Id, 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 = bloodseeker.GuildWars2AccountId, LiebUserId = users[2].Id, 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 = hierpiepts.GuildWars2AccountId, LiebUserId = users[1].Id, 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 } new RaidSignUp{GuildWars2AccountId = bloodseeker.GuildWars2AccountId, LiebUserId = users[2].Id, RaidRoleId = flexTest3.RaidRoleId, RaidId = raid.RaidId, SignUpType = SignUpType.Flex }
}; };
context.RaidSignUps.AddRange(signUps); context.RaidSignUps.AddRange(signUps);

4
Lieb/Data/GuildWars2AccountService.cs
View file

@ -22,14 +22,14 @@ namespace Lieb.Data
.FirstOrDefault(a => a.GuildWars2AccountId == gw2AccountId); .FirstOrDefault(a => a.GuildWars2AccountId == gw2AccountId);
} }
public async Task AddOrEditAccount(GuildWars2Account account, int userId) public async Task AddOrEditAccount(GuildWars2Account account, ulong userId)
{ {
if (account != null) if (account != null)
{ {
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
if (account.GuildWars2AccountId == 0) if (account.GuildWars2AccountId == 0)
{ {
LiebUser? user = context.LiebUsers.FirstOrDefault(u => u.LiebUserId == userId); LiebUser? user = context.LiebUsers.FirstOrDefault(u => u.Id == userId);
if(user != null) if(user != null)
{ {
user.GuildWars2Accounts.Add(account); user.GuildWars2Accounts.Add(account);

20
Lieb/Data/RaidRandomizerService.cs
View file

@ -101,7 +101,7 @@ namespace Lieb.Data
private void RandomizeWithBoons(Raid raid) private void RandomizeWithBoons(Raid raid)
{ {
Dictionary<int, GuildWars2Build> signedUpUsers= new Dictionary<int, GuildWars2Build>(); Dictionary<ulong, GuildWars2Build> signedUpUsers= new Dictionary<ulong, GuildWars2Build>();
foreach (RaidSignUp signUp in raid.SignUps) foreach (RaidSignUp signUp in raid.SignUps)
{ {
if (signUp.GuildWars2Account.EquippedBuilds.Count > 0) if (signUp.GuildWars2Account.EquippedBuilds.Count > 0)
@ -121,7 +121,7 @@ namespace Lieb.Data
} }
} }
private void BalanceRoles(Raid raid, Dictionary<int, GuildWars2Build> signedUpUsers, int recusrionDepth = 0) private void BalanceRoles(Raid raid, Dictionary<ulong, GuildWars2Build> signedUpUsers, int recusrionDepth = 0)
{ {
int Alac = 0; int Alac = 0;
int Quick = 0; int Quick = 0;
@ -180,7 +180,7 @@ namespace Lieb.Data
} }
} }
private void ReduceAlac(Raid raid, Dictionary<int, GuildWars2Build> signedUpUsers, int currentAlac) private void ReduceAlac(Raid raid, Dictionary<ulong, GuildWars2Build> signedUpUsers, int currentAlac)
{ {
foreach (var userBuild in signedUpUsers) foreach (var userBuild in signedUpUsers)
{ {
@ -198,7 +198,7 @@ namespace Lieb.Data
} }
} }
private void IncreaseAlac(Raid raid, Dictionary<int, GuildWars2Build> signedUpUsers, int currentAlac) private void IncreaseAlac(Raid raid, Dictionary<ulong, GuildWars2Build> signedUpUsers, int currentAlac)
{ {
foreach (var userBuild in signedUpUsers) foreach (var userBuild in signedUpUsers)
{ {
@ -216,7 +216,7 @@ namespace Lieb.Data
} }
} }
private void ReduceQuick(Raid raid, Dictionary<int, GuildWars2Build> signedUpUsers, int currentQuick) private void ReduceQuick(Raid raid, Dictionary<ulong, GuildWars2Build> signedUpUsers, int currentQuick)
{ {
foreach (var userBuild in signedUpUsers) foreach (var userBuild in signedUpUsers)
{ {
@ -234,7 +234,7 @@ namespace Lieb.Data
} }
} }
private void IncreaseQuick(Raid raid, Dictionary<int, GuildWars2Build> signedUpUsers, int currentQuick) private void IncreaseQuick(Raid raid, Dictionary<ulong, GuildWars2Build> signedUpUsers, int currentQuick)
{ {
foreach (var userBuild in signedUpUsers) foreach (var userBuild in signedUpUsers)
{ {
@ -252,7 +252,7 @@ namespace Lieb.Data
} }
} }
private void ReduceMight(Raid raid, Dictionary<int, GuildWars2Build> signedUpUsers, int currentMight) private void ReduceMight(Raid raid, Dictionary<ulong, GuildWars2Build> signedUpUsers, int currentMight)
{ {
foreach (var userBuild in signedUpUsers) foreach (var userBuild in signedUpUsers)
{ {
@ -270,7 +270,7 @@ namespace Lieb.Data
} }
} }
private void IncreaseMight(Raid raid, Dictionary<int, GuildWars2Build> signedUpUsers, int currentMight) private void IncreaseMight(Raid raid, Dictionary<ulong, GuildWars2Build> signedUpUsers, int currentMight)
{ {
foreach (var userBuild in signedUpUsers) foreach (var userBuild in signedUpUsers)
{ {
@ -288,7 +288,7 @@ namespace Lieb.Data
} }
} }
private void ReduceHeal(Raid raid, Dictionary<int, GuildWars2Build> signedUpUsers, int currentHeal) private void ReduceHeal(Raid raid, Dictionary<ulong, GuildWars2Build> signedUpUsers, int currentHeal)
{ {
foreach (var userBuild in signedUpUsers) foreach (var userBuild in signedUpUsers)
{ {
@ -306,7 +306,7 @@ namespace Lieb.Data
} }
} }
private void IncreaseHeal(Raid raid, Dictionary<int, GuildWars2Build> signedUpUsers, int currentHeal) private void IncreaseHeal(Raid raid, Dictionary<ulong, GuildWars2Build> signedUpUsers, int currentHeal)
{ {
foreach (var userBuild in signedUpUsers) foreach (var userBuild in signedUpUsers)
{ {

20
Lieb/Data/RaidService.cs
View file

@ -90,7 +90,7 @@ namespace Lieb.Data
await context.SaveChangesAsync(); await context.SaveChangesAsync();
} }
public async Task SignUp(int raidId, int liebUserId, int guildWars2AccountId, int plannedRoleId, SignUpType signUpType) public async Task SignUp(int raidId, ulong liebUserId, int guildWars2AccountId, int plannedRoleId, SignUpType signUpType)
{ {
if (!IsRoleSignUpAllowed(raidId, liebUserId, plannedRoleId, signUpType, true)) if (!IsRoleSignUpAllowed(raidId, liebUserId, plannedRoleId, signUpType, true))
{ {
@ -117,7 +117,7 @@ namespace Lieb.Data
} }
} }
public async Task SignOff(int raidId, int liebUserId) public async Task SignOff(int raidId, ulong liebUserId)
{ {
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
//remove Flex Sign Ups //remove Flex Sign Ups
@ -142,7 +142,7 @@ namespace Lieb.Data
await context.SaveChangesAsync(); await context.SaveChangesAsync();
} }
public async Task ChangeAccount(int raidId, int liebUserId, int guildWars2AccountId) public async Task ChangeAccount(int raidId, ulong liebUserId, int guildWars2AccountId)
{ {
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
List<RaidSignUp> signUps = context.RaidSignUps.Where(x => x.RaidId == raidId && x.LiebUserId == liebUserId).ToList(); List<RaidSignUp> signUps = context.RaidSignUps.Where(x => x.RaidId == raidId && x.LiebUserId == liebUserId).ToList();
@ -153,7 +153,7 @@ namespace Lieb.Data
await context.SaveChangesAsync(); await context.SaveChangesAsync();
} }
public void ChangeSignUpType(int raidId, int liebUserId, int plannedRoleId, SignUpType signUpType) public void ChangeSignUpType(int raidId, ulong liebUserId, int plannedRoleId, SignUpType signUpType)
{ {
if (!IsRoleSignUpAllowed(raidId, liebUserId, plannedRoleId, signUpType, true)) if (!IsRoleSignUpAllowed(raidId, liebUserId, plannedRoleId, signUpType, true))
{ {
@ -182,7 +182,7 @@ namespace Lieb.Data
context.SaveChanges(); context.SaveChanges();
} }
public bool IsRoleSignUpAllowed(int liebUserId, int plannedRoleId, SignUpType signUpType) public bool IsRoleSignUpAllowed(ulong liebUserId, int plannedRoleId, SignUpType signUpType)
{ {
if(signUpType == SignUpType.Backup || signUpType == SignUpType.Flex || signUpType == SignUpType.SignedOff) if(signUpType == SignUpType.Backup || signUpType == SignUpType.Flex || signUpType == SignUpType.SignedOff)
{ {
@ -205,7 +205,7 @@ namespace Lieb.Data
return signUps.Where(s => s.LiebUserId == liebUserId && s.SignUpType == SignUpType.SignedUp).Any(); return signUps.Where(s => s.LiebUserId == liebUserId && s.SignUpType == SignUpType.SignedUp).Any();
} }
public bool IsRoleSignUpAllowed(int raidId, int liebUserId, int plannedRoleId, SignUpType signUpType, bool moveFlexUser) public bool IsRoleSignUpAllowed(int raidId, ulong liebUserId, int plannedRoleId, SignUpType signUpType, bool moveFlexUser)
{ {
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
Raid? raid = context.Raids Raid? raid = context.Raids
@ -243,7 +243,7 @@ namespace Lieb.Data
} }
} }
private async Task<bool> IsRoleSignUpAllowed(Raid raid, int liebUserId, int plannedRoleId, SignUpType signUpType, bool moveFlexUser, List<int> checkedRoleIds) private async Task<bool> IsRoleSignUpAllowed(Raid raid, ulong liebUserId, int plannedRoleId, SignUpType signUpType, bool moveFlexUser, List<int> checkedRoleIds)
{ {
if (IsRoleSignUpAllowed(liebUserId, plannedRoleId, signUpType)) if (IsRoleSignUpAllowed(liebUserId, plannedRoleId, signUpType))
return true; return true;
@ -257,7 +257,7 @@ namespace Lieb.Data
return false; return false;
} }
foreach (int userId in raid.SignUps.Where(s => s.RaidRoleId == plannedRoleId && s.SignUpType == SignUpType.SignedUp).Select(s => s.LiebUserId)) foreach (ulong 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)) foreach (RaidSignUp signUp in raid.SignUps.Where(s => s.LiebUserId == userId && s.SignUpType == SignUpType.Flex))
{ {
@ -275,7 +275,7 @@ namespace Lieb.Data
return false; return false;
} }
public bool IsRaidSignUpAllowed(int liebUserId, int raidId, out string errorMessage) public bool IsRaidSignUpAllowed(ulong liebUserId, int raidId, out string errorMessage)
{ {
errorMessage = string.Empty; errorMessage = string.Empty;
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
@ -293,7 +293,7 @@ namespace Lieb.Data
.Include(u => u.GuildWars2Accounts) .Include(u => u.GuildWars2Accounts)
.ThenInclude(a => a.EquippedBuilds) .ThenInclude(a => a.EquippedBuilds)
.AsNoTracking() .AsNoTracking()
.FirstOrDefault(r => r.LiebUserId == liebUserId); .FirstOrDefault(r => r.Id == liebUserId);
if (user == null) if (user == null)
{ {
errorMessage = "User not found."; errorMessage = "User not found.";

89
Lieb/Data/UserService.cs
View file

@ -25,9 +25,9 @@ namespace Lieb.Data
.ToList(); .ToList();
} }
public LiebUser GetLiebUser(ulong discordId) public LiebUser GetLiebUser(ulong userId)
{ {
if (discordId > 0) if (userId > 0)
{ {
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
return context.LiebUsers return context.LiebUsers
@ -36,56 +36,48 @@ namespace Lieb.Data
.ThenInclude(b => b.GuildWars2Build) .ThenInclude(b => b.GuildWars2Build)
.Include(u => u.RoleAssignments) .Include(u => u.RoleAssignments)
.ThenInclude(r => r.LiebRole) .ThenInclude(r => r.LiebRole)
.FirstOrDefault(u => u.DiscordUserId == discordId); .FirstOrDefault(u => u.Id == userId);
} }
else else
return new LiebUser(); return new LiebUser();
} }
public LiebUser GetLiebUser(int userId) public LiebUser GetLiebUserGW2AccountOnly(ulong userId)
{ {
using var context = _contextFactory.CreateDbContext(); if (userId > 0)
return context.LiebUsers
.Include(u => u.GuildWars2Accounts)
.ThenInclude(a => a.EquippedBuilds)
.ThenInclude(b => b.GuildWars2Build)
.Include(u => u.RoleAssignments)
.ThenInclude(r => r.LiebRole)
.AsNoTracking()
.FirstOrDefault(u => u.LiebUserId == userId);
}
public LiebUser GetLiebUserGW2AccountOnly(ulong discordId)
{
if (discordId > 0)
{ {
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
return context.LiebUsers return context.LiebUsers
.Include(u => u.GuildWars2Accounts) .Include(u => u.GuildWars2Accounts)
.ThenInclude(a => a.EquippedBuilds) .ThenInclude(a => a.EquippedBuilds)
.FirstOrDefault(u => u.DiscordUserId == discordId); .FirstOrDefault(u => u.Id == userId);
} }
else else
return new LiebUser(); return new LiebUser();
} }
public LiebUser GetLiebGW2AccountOnly(int userId) public async Task CreateUser(ulong discordId, string userName)
{ {
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
return context.LiebUsers LiebUser newUser = new LiebUser()
.Include(u => u.GuildWars2Accounts)
.FirstOrDefault(u => u.LiebUserId == userId);
}
public async Task<int> GetLiebUserId(ulong discordId)
{
if (discordId > 0)
{ {
using var context = _contextFactory.CreateDbContext(); Id = discordId,
return (await context.LiebUsers.FirstOrDefaultAsync(u => u.DiscordUserId == discordId)).LiebUserId; Name = userName
};
context.LiebUsers.Add(newUser);
await context.SaveChangesAsync();
LiebRole standardRole = await context.LiebRoles.FirstOrDefaultAsync(m => m.RoleName == Constants.Roles.User.Name);
if (standardRole != null)
{
RoleAssignment roleAssignment = new RoleAssignment()
{
LiebRoleId = standardRole.LiebRoleId,
LiebUserId = newUser.Id
};
context.RoleAssignments.Add(roleAssignment);
await context.SaveChangesAsync();
} }
else
return -1;
} }
public async Task EditUser(LiebUser user) public async Task EditUser(LiebUser user)
@ -93,7 +85,7 @@ namespace Lieb.Data
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
LiebUser? userToChange = context.LiebUsers LiebUser? userToChange = context.LiebUsers
.Include(u => u.GuildWars2Accounts) .Include(u => u.GuildWars2Accounts)
.FirstOrDefault(u => u.LiebUserId == user.LiebUserId); .FirstOrDefault(u => u.Id == user.Id);
if(userToChange != null) if(userToChange != null)
{ {
@ -104,10 +96,10 @@ namespace Lieb.Data
await context.SaveChangesAsync(); await context.SaveChangesAsync();
} }
public async Task UpdateBannedUntil(int userId, DateTime? date) public async Task UpdateBannedUntil(ulong userId, DateTime? date)
{ {
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
LiebUser? user = await context.LiebUsers.FirstOrDefaultAsync(u => u.LiebUserId == userId); LiebUser? user = await context.LiebUsers.FirstOrDefaultAsync(u => u.Id == userId);
if (user == null) if (user == null)
return; return;
@ -117,12 +109,12 @@ namespace Lieb.Data
await context.SaveChangesAsync(); await context.SaveChangesAsync();
} }
public async Task AddRoleToUser(int userId, int roleId) public async Task AddRoleToUser(ulong userId, int roleId)
{ {
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
LiebUser? user = await context.LiebUsers LiebUser? user = await context.LiebUsers
.Include(u => u.RoleAssignments) .Include(u => u.RoleAssignments)
.FirstOrDefaultAsync(u => u.LiebUserId == userId); .FirstOrDefaultAsync(u => u.Id == userId);
user.RoleAssignments.Add(new RoleAssignment() user.RoleAssignments.Add(new RoleAssignment()
{ {
LiebUserId = userId, LiebUserId = userId,
@ -131,12 +123,12 @@ namespace Lieb.Data
await context.SaveChangesAsync(); await context.SaveChangesAsync();
} }
public async Task RemoveRoleFromUser(int userId, int roleId) public async Task RemoveRoleFromUser(ulong userId, int roleId)
{ {
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
LiebUser? user = await context.LiebUsers LiebUser? user = await context.LiebUsers
.Include(u => u.RoleAssignments) .Include(u => u.RoleAssignments)
.FirstOrDefaultAsync(u => u.LiebUserId == userId); .FirstOrDefaultAsync(u => u.Id == userId);
RoleAssignment assignmentToRemove = user.RoleAssignments.FirstOrDefault(r => r.LiebRoleId == roleId); RoleAssignment assignmentToRemove = user.RoleAssignments.FirstOrDefault(r => r.LiebRoleId == roleId);
if(assignmentToRemove != null) if(assignmentToRemove != null)
{ {
@ -145,29 +137,14 @@ namespace Lieb.Data
await context.SaveChangesAsync(); await context.SaveChangesAsync();
} }
public int GetPowerLevel(int userId) public int GetPowerLevel(ulong userId)
{ {
using var context = _contextFactory.CreateDbContext(); using var context = _contextFactory.CreateDbContext();
LiebUser? user = context.LiebUsers LiebUser? user = context.LiebUsers
.Include(u => u.RoleAssignments) .Include(u => u.RoleAssignments)
.ThenInclude(r => r.LiebRole) .ThenInclude(r => r.LiebRole)
.AsNoTracking() .AsNoTracking()
.FirstOrDefault(u => u.LiebUserId == userId); .FirstOrDefault(u => u.Id == userId);
if (user != null)
{
return user.RoleAssignments.Max(a => a.LiebRole.Level);
}
return 0;
}
public int GetPowerLevel(ulong discordId)
{
using var context = _contextFactory.CreateDbContext();
LiebUser? user = context.LiebUsers
.Include(u => u.RoleAssignments)
.ThenInclude(r => r.LiebRole)
.AsNoTracking()
.FirstOrDefault(u => u.DiscordUserId == discordId);
if (user != null) if (user != null)
{ {
return user.RoleAssignments.Max(a => a.LiebRole.Level); return user.RoleAssignments.Max(a => a.LiebRole.Level);

27
Lieb/DiscordOAuth2/DiscordHandler.cs
View file

@ -13,12 +13,14 @@ namespace Discord.OAuth2
{ {
internal class DiscordHandler : OAuthHandler<DiscordOptions> internal class DiscordHandler : OAuthHandler<DiscordOptions>
{ {
private readonly Lieb.Data.LiebContext _LiebDbcontext; private readonly LiebContext _dbContext;
private readonly UserService _userService;
public DiscordHandler(IOptionsMonitor<DiscordOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock, Lieb.Data.LiebContext context) public DiscordHandler(IOptionsMonitor<DiscordOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock, LiebContext context, UserService userService)
: base(options, logger, encoder, clock) : base(options, logger, encoder, clock)
{ {
_LiebDbcontext = context; _dbContext = context;
_userService = userService;
} }
protected override async Task<AuthenticationTicket> CreateTicketAsync(ClaimsIdentity identity, AuthenticationProperties properties, OAuthTokenResponse tokens) protected override async Task<AuthenticationTicket> CreateTicketAsync(ClaimsIdentity identity, AuthenticationProperties properties, OAuthTokenResponse tokens)
@ -48,7 +50,7 @@ namespace Discord.OAuth2
private async Task<OAuthCreatingTicketContext> ManageUserRights(OAuthCreatingTicketContext context) private async Task<OAuthCreatingTicketContext> ManageUserRights(OAuthCreatingTicketContext context)
{ {
ulong discordId = ulong.Parse(context.Identity.Claims.FirstOrDefault(x => x.Type == ClaimTypes.NameIdentifier).Value); ulong discordId = ulong.Parse(context.Identity.Claims.FirstOrDefault(x => x.Type == ClaimTypes.NameIdentifier).Value);
LiebUser? user = await _LiebDbcontext.LiebUsers.Include(u => u.RoleAssignments).ThenInclude(r => r.LiebRole).FirstOrDefaultAsync(m => m.DiscordUserId == discordId); LiebUser? user = await _dbContext.LiebUsers.Include(u => u.RoleAssignments).ThenInclude(r => r.LiebRole).FirstOrDefaultAsync(m => m.Id == discordId);
if (user != null) if (user != null)
{ {
if (user.BannedUntil == null || user.BannedUntil < DateTime.UtcNow) if (user.BannedUntil == null || user.BannedUntil < DateTime.UtcNow)
@ -61,22 +63,9 @@ namespace Discord.OAuth2
} }
else else
{ {
LiebRole standardRole = await _LiebDbcontext.LiebRoles.FirstOrDefaultAsync(m => m.RoleName == Constants.Roles.User.Name);
string userName = context.Identity.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Name).Value; string userName = context.Identity.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Name).Value;
LiebUser newUser = new LiebUser()
{ _userService.CreateUser(discordId, userName);
DiscordUserId = discordId,
Name = userName
};
_LiebDbcontext.LiebUsers.Add(newUser);
await _LiebDbcontext.SaveChangesAsync();
RoleAssignment roleAssignment = new RoleAssignment()
{
LiebRoleId = standardRole.LiebRoleId,
LiebUserId = newUser.LiebUserId
};
_LiebDbcontext.RoleAssignments.Add(roleAssignment);
await _LiebDbcontext.SaveChangesAsync();
context.Identity.AddClaim(new Claim(Constants.ClaimType, Constants.Roles.User.Name)); context.Identity.AddClaim(new Claim(Constants.ClaimType, Constants.Roles.User.Name));
} }

8
Lieb/Pages/Raids/RaidDetails.razor
View file

@ -17,7 +17,7 @@
@if (_user != null && _isRaidSignUpAllowed) @if (_user != null && _isRaidSignUpAllowed)
{ {
<div class="signUpStatusTooltip"> <div class="signUpStatusTooltip">
@if(_raid.SignUps.Where(s => s.LiebUserId == _user.LiebUserId && s.SignUpType != SignUpType.SignedOff).Any()) @if(_raid.SignUps.Where(s => s.LiebUserId == _user.Id && s.SignUpType != SignUpType.SignedOff).Any())
{ {
<span class="oi oi-badge" style="color:green"></span> <span class="oi oi-badge" style="color:green"></span>
<span class="tooltiptext">You are signed up</span> <span class="tooltiptext">You are signed up</span>
@ -76,7 +76,7 @@
<AuthorizeView> <AuthorizeView>
<button class="controlButton raidButton" @onclick="() => SignOffClicked()">Sign Off</button> <button class="controlButton raidButton" @onclick="() => SignOffClicked()">Sign Off</button>
@if (_raid.RaidOwnerId == _user.LiebUserId || _user.RoleAssignments.Max(a => a.LiebRole.Level) >= Constants.RaidEditPowerLevel) @if (_raid.RaidOwnerId == _user.Id || _user.RoleAssignments.Max(a => a.LiebRole.Level) >= Constants.RaidEditPowerLevel)
{ {
<button class="controlButton raidButton" @onclick="() => EditClicked()">Edit</button> <button class="controlButton raidButton" @onclick="() => EditClicked()">Edit</button>
@if (_raid.RaidType != RaidType.Planned) @if (_raid.RaidType != RaidType.Planned)
@ -108,7 +108,7 @@
protected override async Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{ {
_isRaidSignUpAllowed = _user != null && RaidService.IsRaidSignUpAllowed(_user.LiebUserId, _raid.RaidId, out _errorMessage); _isRaidSignUpAllowed = _user != null && RaidService.IsRaidSignUpAllowed(_user.Id, _raid.RaidId, out _errorMessage);
_startTime = await TimeZoneService.GetLocalDateTime(_raid.StartTimeUTC); _startTime = await TimeZoneService.GetLocalDateTime(_raid.StartTimeUTC);
_endTime = await TimeZoneService.GetLocalDateTime(_raid.EndTimeUTC); _endTime = await TimeZoneService.GetLocalDateTime(_raid.EndTimeUTC);
@ -117,7 +117,7 @@
async Task SignOffClicked() async Task SignOffClicked()
{ {
await RaidService.SignOff(_raid.RaidId, _user.LiebUserId); await RaidService.SignOff(_raid.RaidId, _user.Id);
_raid = RaidService.GetRaid(_raid.RaidId); _raid = RaidService.GetRaid(_raid.RaidId);
} }

4
Lieb/Pages/Raids/RaidEdit.razor
View file

@ -188,7 +188,7 @@
{ {
_raid = RaidService.GetRaid(parsedId); _raid = RaidService.GetRaid(parsedId);
if (_raid != null && (_raid.RaidOwnerId == _user.LiebUserId if (_raid != null && (_raid.RaidOwnerId == _user.Id
|| _user.RoleAssignments.Max(a => a.LiebRole.Level) >= Constants.RaidEditPowerLevel)) || _user.RoleAssignments.Max(a => a.LiebRole.Level) >= Constants.RaidEditPowerLevel))
{ {
_startTime = await TimeZoneService.GetLocalDateTime(_raid.StartTimeUTC); _startTime = await TimeZoneService.GetLocalDateTime(_raid.StartTimeUTC);
@ -273,7 +273,7 @@
if (_raid.RaidOwnerId == 0) if (_raid.RaidOwnerId == 0)
{ {
_raid.RaidOwnerId = _user.LiebUserId; _raid.RaidOwnerId = _user.Id;
} }
await RaidService.AddOrEditRaid(_raid, _rolesToDelete, new List<RaidReminder>()); await RaidService.AddOrEditRaid(_raid, _rolesToDelete, new List<RaidReminder>());

4
Lieb/Pages/Raids/RaidRoles.razor
View file

@ -99,7 +99,7 @@
[Parameter] [Parameter]
public bool _isRaidSignUpAllowed { get; set; } public bool _isRaidSignUpAllowed { get; set; }
private int _liebUserId { get; set; } = -1; private ulong _liebUserId { get; set; } = 0;
private List<GuildWars2Account> _usableAccounts; private List<GuildWars2Account> _usableAccounts;
@ -125,7 +125,7 @@
{ {
_usableAccounts = _user.GuildWars2Accounts.Where(a => a.EquippedBuilds.Count > 0).ToList(); _usableAccounts = _user.GuildWars2Accounts.Where(a => a.EquippedBuilds.Count > 0).ToList();
} }
_liebUserId = _user.LiebUserId; _liebUserId = _user.Id;
} }
_expandableRoles = new List<ExpandableRole>(); _expandableRoles = new List<ExpandableRole>();
foreach(RaidRole role in _raid.Roles) foreach(RaidRole role in _raid.Roles)

2
Lieb/Pages/Raids/RaidTemplateDetails.razor
View file

@ -60,7 +60,7 @@
<AuthorizeView> <AuthorizeView>
@if (_template.RaidOwnerId == _user.LiebUserId || _user.RoleAssignments.Max(a => a.LiebRole.Level) >= Constants.RaidEditPowerLevel) @if (_template.RaidOwnerId == _user.Id || _user.RoleAssignments.Max(a => a.LiebRole.Level) >= Constants.RaidEditPowerLevel)
{ {
<button class="controlButton raidButton" @onclick="() => EditClicked()">Edit</button> <button class="controlButton raidButton" @onclick="() => EditClicked()">Edit</button>
} }

4
Lieb/Pages/Raids/RaidTemplateEdit.razor
View file

@ -210,7 +210,7 @@
{ {
_template = RaidTemplateService.GetTemplate(parsedId); _template = RaidTemplateService.GetTemplate(parsedId);
if (_template != null && (_template.RaidOwnerId == _user.LiebUserId if (_template != null && (_template.RaidOwnerId == _user.Id
|| _user.RoleAssignments.Max(a => a.LiebRole.Level) >= Constants.RaidEditPowerLevel)) || _user.RoleAssignments.Max(a => a.LiebRole.Level) >= Constants.RaidEditPowerLevel))
{ {
_startTime = _template.StartTime; _startTime = _template.StartTime;
@ -290,7 +290,7 @@
if (_template.RaidOwnerId == 0) if (_template.RaidOwnerId == 0)
{ {
_template.RaidOwnerId = _user.LiebUserId; _template.RaidOwnerId = _user.Id;
} }
await RaidTemplateService.AddOrEditTemplate(_template, _rolesToDelete, new List<RaidReminder>()); await RaidTemplateService.AddOrEditTemplate(_template, _rolesToDelete, new List<RaidReminder>());

2
Lieb/Pages/Raids/SignedUpUsers.razor
View file

@ -61,7 +61,7 @@
public Raid _raid { get; set; } public Raid _raid { get; set; }
[Parameter] [Parameter]
public int _liebUserId { get; set; } = -1; public ulong _liebUserId { get; set; } = 0;
[Parameter] [Parameter]
public List<GuildWars2Account> _usableAccounts { get; set; } public List<GuildWars2Account> _usableAccounts { get; set; }

2
Lieb/Pages/User/ManageGuildWars2Account.razor
View file

@ -161,7 +161,7 @@
private async Task HandleValidSubmit() private async Task HandleValidSubmit()
{ {
await GuildWars2AccountService.AddOrEditAccount(_account, _user.LiebUserId); await GuildWars2AccountService.AddOrEditAccount(_account, _user.Id);
_account = GuildWars2AccountService.GetAccount(_account.GuildWars2AccountId); _account = GuildWars2AccountService.GetAccount(_account.GuildWars2AccountId);
_saveMessage = "changes saved successfully"; _saveMessage = "changes saved successfully";
} }

12
Lieb/Pages/User/UserEdit.razor
View file

@ -64,7 +64,7 @@
@code { @code {
[Parameter] [Parameter]
public string userId { get; set; } public string _userId { get; set; }
private LiebUser _user; private LiebUser _user;
private int _editingUserRights = 0; private int _editingUserRights = 0;
@ -85,7 +85,7 @@
} }
} }
if(!string.IsNullOrEmpty(userId) && int.TryParse(userId, out int parsedId)) if(!string.IsNullOrEmpty(_userId) && ulong.TryParse(_userId, out ulong parsedId))
{ {
_user = UserService.GetLiebUser(parsedId); _user = UserService.GetLiebUser(parsedId);
_roles = UserService.GetLiebRoles(); _roles = UserService.GetLiebRoles();
@ -105,21 +105,21 @@
RoleAssignment roleAssignment = new RoleAssignment() RoleAssignment roleAssignment = new RoleAssignment()
{ {
LiebRoleId = role.LiebRoleId, LiebRoleId = role.LiebRoleId,
LiebUserId = _user.LiebUserId LiebUserId = _user.Id
}; };
await UserService.AddRoleToUser(_user.LiebUserId, role.LiebRoleId); await UserService.AddRoleToUser(_user.Id, role.LiebRoleId);
_user.RoleAssignments.Add(roleAssignment); _user.RoleAssignments.Add(roleAssignment);
} }
else if(!isChecked && assignment != null) else if(!isChecked && assignment != null)
{ {
await UserService.RemoveRoleFromUser(_user.LiebUserId, role.LiebRoleId); await UserService.RemoveRoleFromUser(_user.Id, role.LiebRoleId);
_user.RoleAssignments.Remove(assignment); _user.RoleAssignments.Remove(assignment);
} }
} }
private async Task HandleValidSubmit() private async Task HandleValidSubmit()
{ {
await UserService.UpdateBannedUntil(_user.LiebUserId, _user.BannedUntil); await UserService.UpdateBannedUntil(_user.Id, _user.BannedUntil);
if(_user.BannedUntil >= DateTime.Now.Date) if(_user.BannedUntil >= DateTime.Now.Date)
{ {
_submitMessage = "user banned successfully"; _submitMessage = "user banned successfully";

2
Lieb/Pages/User/UserOverview.razor
View file

@ -63,7 +63,7 @@
{ {
<tr> <tr>
<td class="nav-item px-3"> <td class="nav-item px-3">
@{string navLink = $"useredit/{@user.LiebUserId}";} @{string navLink = $"useredit/{@user.Id}";}
<NavLink class="nav-link" href="@navLink">@user.Name</NavLink> <NavLink class="nav-link" href="@navLink">@user.Name</NavLink>
</td> </td>
<td>@foreach(var account in user.GuildWars2Accounts){<div>@account.AccountName </div> }</td> <td>@foreach(var account in user.GuildWars2Accounts){<div>@account.AccountName </div> }</td>

2
Shared/Models/GuildWars2/Raid/RaidBase.cs
View file

@ -31,7 +31,7 @@ namespace Lieb.Models.GuildWars2.Raid
public bool MoveFlexUsers { get; set; } = true; public bool MoveFlexUsers { get; set; } = true;
public int RaidOwnerId { get; set; } public ulong RaidOwnerId { get; set; }
//role name, number of spots //role name, number of spots
public ICollection<RaidRole> Roles { get; set; } = new HashSet<RaidRole>(); public ICollection<RaidRole> Roles { get; set; } = new HashSet<RaidRole>();

2
Shared/Models/GuildWars2/Raid/RaidSignUp.cs
View file

@ -14,7 +14,7 @@
public int RaidSignUpId { get; set; } public int RaidSignUpId { get; set; }
public int RaidId { get; set; } public int RaidId { get; set; }
public int LiebUserId { get; set; } public ulong LiebUserId { get; set; }
public int GuildWars2AccountId { get; set; } public int GuildWars2AccountId { get; set; }
public int RaidRoleId { get; set; } public int RaidRoleId { get; set; }

5
Shared/Models/LiebUser.cs
View file

@ -1,12 +1,13 @@
using Lieb.Models.GuildWars2; using Lieb.Models.GuildWars2;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Lieb.Models namespace Lieb.Models
{ {
public class LiebUser public class LiebUser
{ {
public int LiebUserId { get; set; } [DatabaseGenerated(DatabaseGeneratedOption.None)]
public ulong DiscordUserId { get; set; } public ulong Id { get; set; }
[Required] [Required]
[StringLength(40, ErrorMessage = "Name too long (40 character limit).")] [StringLength(40, ErrorMessage = "Name too long (40 character limit).")]

2
Shared/Models/RoleAssignment.cs
View file

@ -6,7 +6,7 @@
public int LiebRoleId { get; set; } public int LiebRoleId { get; set; }
public int LiebUserId { get; set; } public ulong LiebUserId { get; set; }
public LiebRole LiebRole { get; set; } public LiebRole LiebRole { get; set; }
public LiebUser LiebUser { get; set; } public LiebUser LiebUser { get; set; }
} }