INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-10 15:20:48 -05:00
Code Issues Releases Wiki Activity

add a check to make sure we're not breaking EFClient entries when updating

Browse Source 
make sure the alias is updated before banning the player as we want to link them together
update CoD4x parser to fix their breaking change
This commit is contained in:
RaidMax
2019-06-11 08:00:14 -05:00
parent 3016e68a6d
commit e8af8914d2
7 changed files with 46 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
SharedLibraryCore/Services/ClientService.cs
View File

@ -48,7 +48,7 @@ namespace SharedLibraryCore.Services
};
context.Clients.Add(client);
// they're just using a new GUID
if (aliasId.HasValue)
{
@ -272,18 +272,9 @@ namespace SharedLibraryCore.Services
}
}
public async Task<IList<EFClient>> Find(Func<EFClient, bool> e)
public Task<IList<EFClient>> Find(Func<EFClient, bool> e)
{
return await Task.Run(() =>
{
using (var context = new DatabaseContext(true))
{
return context.Clients
.Include(c => c.CurrentAlias)
.Include(c => c.AliasLink.Children)
.Where(e).ToList();
}
});
throw new NotImplementedException();
}
public async Task<EFClient> Get(int entityID)
@ -369,6 +360,11 @@ namespace SharedLibraryCore.Services
{
using (var context = new DatabaseContext())
{
if (temporalClient.LastConnection == DateTime.MinValue || temporalClient.Connections == 0 || temporalClient.TotalConnectionTime == 0)
{
throw new InvalidOperationException($"client {temporalClient} trying to update but parameters are invalid");
}
// grab the context version of the entity
var entity = context.Clients
.First(client => client.ClientId == temporalClient.ClientId);
@ -407,7 +403,7 @@ namespace SharedLibraryCore.Services
{
using (var ctx = new DatabaseContext(true))
{
return await ctx.Clients.AsNoTracking()
return await ctx.Clients
.CountAsync(_client => _client.Level == Permission.Owner);
}
}
@ -489,7 +485,7 @@ namespace SharedLibraryCore.Services
{
iqClients = iqClients.Where(_client => linkIds.Contains(_client.AliasLinkId));
}
// we want to project our results
var iqClientProjection = iqClients.OrderByDescending(_client => _client.LastConnection)
.Select(_client => new PlayerInfo()
@ -503,7 +499,7 @@ namespace SharedLibraryCore.Services
var iqClientsSql = iqClients.ToSql();
#endif
var clients = await iqClientProjection.ToListAsync();
// this is so we don't try to evaluate this in the linq to entities query
foreach (var client in clients)
{