lancommander-ref/LANCommander
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make SyncRelationCollectionAsync only match existing records

Browse source
This commit is contained in:
Pat Hartl 2025-12-03 18:55:52 -06:00
parent 908f20800c
commit 5b444f91e7
2 changed files with 10 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

58
LANCommander.Server.ImportExport/Importers/GameImporter.cs
View file

@ -53,6 +53,7 @@ public class GameImporter(
try
{
await gameService.AddAsync(game);
await UpdateRelationshipsAsync();
return true;
}
@ -87,6 +88,7 @@ public class GameImporter(
existing.UpdatedBy = await userService.GetAsync(record.UpdatedBy);
await gameService.UpdateAsync(existing);
await UpdateRelationshipsAsync();
return true;
}
@ -102,7 +104,7 @@ public class GameImporter(
return await gameService.ExistsAsync(g => g.Id == record.Id || g.Title == record.Title);
}
public async Task FinalizeAsync()
public async Task UpdateRelationshipsAsync()
{
if (ImportContext.Manifest is not Game)
return;
@ -113,84 +115,42 @@ public class GameImporter(
return;
var game = await gameService
.Include(g => g.Collections)
.Include(g => g.Developers)
.Include(g => g.Genres)
.Include(g => g.Platforms)
.Include(g => g.Publishers)
.Include(g => g.Tags)
.GetAsync(manifest.Id);
await gameService.SyncRelatedCollectionAsync(
game,
g => g.Collections,
manifest.Collections,
r => c => c.Name == r.Name,
(c, rc) =>
{
c.Name = rc.Name;
c.CreatedOn = rc.CreatedOn;
c.UpdatedOn = rc.UpdatedOn;
});
r => c => c.Name == r.Name);
await gameService.SyncRelatedCollectionAsync(
game,
g => g.Developers,
manifest.Developers,
r => c => c.Name == r.Name,
(d, rd) =>
{
d.Name = rd.Name;
d.CreatedOn = rd.CreatedOn;
d.UpdatedOn = rd.UpdatedOn;
});
r => c => c.Name == r.Name);
await gameService.SyncRelatedCollectionAsync(
game,
g => g.Genres,
manifest.Genres,
r => g => g.Name == r.Name,
(g, gr) =>
{
g.Name = gr.Name;
g.CreatedOn = gr.CreatedOn;
g.UpdatedOn = gr.UpdatedOn;
});
r => g => g.Name == r.Name);
await gameService.SyncRelatedCollectionAsync(
game,
g => g.Platforms,
manifest.Platforms,
r => p => p.Name == r.Name,
(p, pr) =>
{
p.Name = pr.Name;
p.CreatedOn = pr.CreatedOn;
p.UpdatedOn = pr.UpdatedOn;
});
r => p => p.Name == r.Name);
await gameService.SyncRelatedCollectionAsync(
game,
g => g.Publishers,
manifest.Publishers,
r => p => p.Name == r.Name,
(p, pr) =>
{
p.Name = pr.Name;
p.CreatedOn = pr.CreatedOn;
p.UpdatedOn = pr.UpdatedOn;
});
r => p => p.Name == r.Name);
await gameService.SyncRelatedCollectionAsync(
game,
g => g.Tags,
manifest.Tags,
r => t => t.Name == r.Name,
(t, tr) =>
{
t.Name = tr.Name;
t.CreatedOn = tr.CreatedOn;
t.UpdatedOn = tr.UpdatedOn;
});
r => t => t.Name == r.Name);
}
}

12
LANCommander.Server.Services/_BaseDatabaseService.cs
View file

@ -384,8 +384,7 @@ namespace LANCommander.Server.Services
T entity,
Expression<Func<T, ICollection<TChild>>> navigationProperty,
IEnumerable<U> records,
Func<U, Expression<Func<TChild, bool>>> matchExpression,
Action<TChild, U> updateAction) where TChild : class where T : class
Func<U, Expression<Func<TChild, bool>>> matchExpression) where TChild : class where T : class
{
using var context = await dbContextFactory.CreateDbContextAsync();
@ -431,17 +430,8 @@ namespace LANCommander.Server.Services
if (!collection.Contains(existingChild))
collection.Add(existingChild);
updateAction(existingChild, record);
matchedChildren.Add(existingChild);
}
else
{
var newChild = Activator.CreateInstance<TChild>();
updateAction(newChild, record);
collection.Add(newChild);
matchedChildren.Add(newChild);
}
}
var toDelete = collection.Where(child => !matchedChildren.Contains(child));