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

removed RaidLogs

Browse source
This commit is contained in:
Sarah Faey 2022-12-05 14:28:04 +01:00
parent de58541d0b
commit c96d34fc6a
10 changed files with 701 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lieb/Data/LiebContext.cs
View file

@ -24,7 +24,6 @@ namespace Lieb.Data
public DbSet<RaidTemplate> RaidTemplates { get; set; }
public DbSet<RaidReminder> RaidReminders { get; set; }
public DbSet<RaidSignUp> RaidSignUps { get; set; }
public DbSet<RaidLog> RaidLogs { get; set; }
public DbSet<DiscordRaidMessage> DiscordRaidMessages { get; set; }
public DbSet<DiscordSettings> DiscordSettings { get; set; }
@ -42,7 +41,6 @@ namespace Lieb.Data
modelBuilder.Entity<RaidTemplate>().ToTable("RaidTemplate");
modelBuilder.Entity<RaidReminder>().ToTable("RaidReminder");
modelBuilder.Entity<RaidSignUp>().ToTable("RaidSignUp");
modelBuilder.Entity<RaidLog>().ToTable("RaidLog");
modelBuilder.Entity<DiscordRaidMessage>().ToTable("DiscordRaidMessage");
modelBuilder.Entity<DiscordSettings>().ToTable("DiscordSettings");
}

29
Lieb/Data/RaidService.cs
View file

@ -77,9 +77,6 @@ namespace Lieb.Data
}
}
await context.SaveChangesAsync();
RaidLog log = RaidLog.CreateRaidLog(changedBy, raid);
await context.RaidLogs.AddAsync(log);
await context.SaveChangesAsync();
await _discordService.PostRaidMessage(raid.RaidId);
}
}
@ -96,35 +93,16 @@ namespace Lieb.Data
context.RaidSignUps.RemoveRange(raid.SignUps);
context.RaidRoles.RemoveRange(raid.Roles);
context.RaidLogs.RemoveRange(raid.RaidLogs);
context.RaidReminders.RemoveRange(raid.Reminders);
context.DiscordRaidMessages.RemoveRange(raid.DiscordRaidMessages);
await context.SaveChangesAsync();
raid.SignUps.Clear();
raid.Roles.Clear();
raid.RaidLogs.Clear();
raid.Reminders.Clear();
raid.DiscordRaidMessages.Clear();
context.Raids.Remove(raid);
await context.SaveChangesAsync();
if(userId != null)
{
LiebUser user = context.LiebUsers.FirstOrDefault(u => u.Id == userId);
if(user != null)
{
RaidLog logEntry = new RaidLog()
{
LogEntry = $"The Raid \"{raid.Title}\" was deleted by {user.Name}",
Time = DateTimeOffset.UtcNow,
Type = RaidLog.LogType.Raid,
UserId = userId
};
context.RaidLogs.Add(logEntry);
await context.SaveChangesAsync();
}
}
}
public async Task<bool> SignUp(int raidId, ulong liebUserId, int guildWars2AccountId, int plannedRoleId, SignUpType signUpType, ulong signedUpByUserId = 0)
@ -474,13 +452,6 @@ namespace Lieb.Data
private async Task LogSignUp(RaidSignUp signUp, string userName, ulong signedUpBy = 0)
{
ulong userId = signedUpBy > 0 ? signedUpBy : signUp.LiebUserId.Value;
RaidLog log = RaidLog.CreateSignUpLog(userId, signUp, userName);
using var context = _contextFactory.CreateDbContext();
await context.RaidLogs.AddAsync(log);
await context.SaveChangesAsync();
_ = SendDiscordSignUpLogMessage(signUp, userName, signedUpBy);
}

21
Lieb/Data/RaidTemplateService.cs
View file

@ -52,9 +52,6 @@ namespace Lieb.Data
context.DiscordRaidMessages.RemoveRange(messagesToDelete);
}
await context.SaveChangesAsync();
RaidLog log = RaidLog.CreateRaidTemplateLog(changedBy, template);
await context.RaidLogs.AddAsync(log);
await context.SaveChangesAsync();
}
}
@ -65,28 +62,12 @@ namespace Lieb.Data
context.RaidRoles.RemoveRange(template.Roles);
context.RaidReminders.RemoveRange(template.Reminders);
context.DiscordRaidMessages.RemoveRange(template.DiscordRaidMessages);
context.RaidLogs.RemoveRange(template.TemplateLogs);
await context.SaveChangesAsync();
template.Roles.Clear();
template.Reminders.Clear();
template.DiscordRaidMessages.Clear();
template.TemplateLogs.Clear();
context.RaidTemplates.Remove(template);
await context.SaveChangesAsync();
LiebUser user = context.LiebUsers.FirstOrDefault(u => u.Id == userId);
if(user != null)
{
RaidLog logEntry = new RaidLog()
{
LogEntry = $"The Template \"{template.Title}\" was deleted by {user.Name}",
Time = DateTimeOffset.UtcNow,
Type = RaidLog.LogType.RaidTemplate,
UserId = userId
};
context.RaidLogs.Add(logEntry);
await context.SaveChangesAsync();
}
await context.SaveChangesAsync();
}
public async Task CreateRaidFromTemplate(int raidTempalteId)

7
Lieb/Data/UserService.cs
View file

@ -129,13 +129,6 @@ namespace Lieb.Data
await _discordService.PostRaidMessage(raidId);
}
IEnumerable<RaidLog> logs = context.RaidLogs.Where(r => r.UserId == userId);
foreach(RaidLog log in logs)
{
log.UserId = null;
}
await context.SaveChangesAsync();
LiebUser user = GetLiebUser(userId);
foreach(GuildWars2Account account in user.GuildWars2Accounts)
{