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

reworked account pages

Browse source
This commit is contained in:
t.ruspekhofer 2022-03-06 23:33:31 +01:00
parent e5b6fdba39
commit 2a26e7f8b5
7 changed files with 214 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

89
Lieb/Data/GuildWars2AccountService.cs
View file

@ -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,43 +38,21 @@ 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);
accountToChange.AccountName = account.AccountName;
accountToChange.ApiKey = account.ApiKey;
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);
}
await context.SaveChangesAsync();
}
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)
{
using var context = _contextFactory.CreateDbContext();
@ -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();
}
}
}
}
}

65
Lieb/Data/UserService.cs
View file

@ -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
.Include(u => u.RoleAssignments)
.FirstOrDefaultAsync(u => u.LiebUserId == user.LiebUserId);
using var context = _contextFactory.CreateDbContext();
LiebUser? user = await context.LiebUsers.FirstOrDefaultAsync(u => u.LiebUserId == userId);
if (userToChange == null)
return;
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();
}
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()
{