used split query

skrasekmichael · Mar 11, 2024 · f12691f · f12691f
1 parent bb96d9f
commit f12691f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/TeamUp.Application/Events/GetEvent/GetEventQueryHandler.cs b/src/TeamUp.Application/Events/GetEvent/GetEventQueryHandler.cs
@@ -22,11 +22,13 @@ public GetEventQueryHandler(IAppQueryContext appQueryContext)
 	public async Task<Result<EventResponse>> Handle(GetEventQuery query, CancellationToken ct)
 	{
 		var team = await _appQueryContext.Teams
+			.AsSplitQuery()
 			.Include(team => team.Members)
 			.Select(team => new
 			{
 				team.Id,
 				Event = _appQueryContext.Events
+					.AsSplitQuery()
 					.Where(e => e.Id == query.EventId && e.TeamId == team.Id)
 					.Select(e => new EventResponse
 					{

diff --git a/src/TeamUp.Infrastructure/Persistence/Domain/Teams/TeamRepository.cs b/src/TeamUp.Infrastructure/Persistence/Domain/Teams/TeamRepository.cs
@@ -21,6 +21,7 @@ public TeamRepository(ApplicationDbContext context)
 	public async Task<Team?> GetTeamByIdAsync(TeamId teamId, CancellationToken ct = default)
 	{
 		return await _context.Teams
+			.AsSplitQuery()
 			.Include(team => team.Members)
 			.Include(team => team.EventTypes)
 			.FirstOrDefaultAsync(team => team.Id == teamId, ct);

diff --git a/tests/TeamUp.Tests.EndToEnd/AppFactory.cs b/tests/TeamUp.Tests.EndToEnd/AppFactory.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 
@@ -31,6 +32,10 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
 			services.AddDbContext<ApplicationDbContext>(options =>
 			{
 				options.UseNpgsql(connectionString);
+				options.ConfigureWarnings(w =>
+				{
+					w.Throw(RelationalEventId.MultipleCollectionIncludeWarning);
+				});
 			});
 
 			//email