Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions TournamentAPI/Brackets/BracketMutations.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using GreenDonut.Data;
using HotChocolate.Authorization;
using HotChocolate.Resolvers;
using Microsoft.EntityFrameworkCore;
Expand All @@ -13,10 +14,10 @@ namespace TournamentAPI.Brackets;
public static partial class BracketMutations
{
[UseFirstOrDefault]
[UseProjection]
[Authorize]
public static async Task<IQueryable<Bracket>?> GenerateBracket(
int tournamentId,
QueryContext<Bracket> query,
ClaimsPrincipal userClaims,
ApplicationDbContext context,
IResolverContext resolverContext,
Expand Down Expand Up @@ -49,15 +50,15 @@ public static partial class BracketMutations
return null;
}

return context.Brackets.Where(b => b.Id == bracket.Id);
return context.Brackets.AsNoTracking().Where(b => b.Id == bracket.Id).With(query);
}

[UseFirstOrDefault]
[UseProjection]
[Authorize]
public static async Task<IQueryable<Bracket>?> UpdateRound(
int bracketId,
int roundNumber,
QueryContext<Bracket> query,
ClaimsPrincipal userClaims,
ApplicationDbContext context,
IResolverContext resolverContext,
Expand Down Expand Up @@ -97,6 +98,6 @@ public static partial class BracketMutations
return null;
}

return context.Brackets.Where(b => b.Id == bracket.Id);
return context.Brackets.AsNoTracking().Where(b => b.Id == bracket.Id).With(query);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ internal static IServiceCollection AddApplicationGraphQL(this IServiceCollection
.AddMutationConventions()
.AddQueryConventions()
.AddPagingArguments()
.AddProjections()
.AddFiltering(x => x.AddDefaults().MaxAllowedFilterOperations(32))
.AddSorting()
.AddMaxExecutionDepthRule(10)
Expand Down
5 changes: 3 additions & 2 deletions TournamentAPI/Participants/ParticipantMutations.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using GreenDonut.Data;
using HotChocolate.Authorization;
using HotChocolate.Resolvers;
using Microsoft.EntityFrameworkCore;
Expand All @@ -14,10 +15,10 @@ namespace TournamentAPI.Participants;
public static partial class ParticipantMutations
{
[UseFirstOrDefault]
[UseProjection]
[Authorize]
public static async Task<IQueryable<Tournament>?> AddParticipant(
AddParticipantInput input,
QueryContext<Tournament> query,
ClaimsPrincipal userClaims,
ApplicationDbContext context,
IResolverContext resolverContext,
Expand Down Expand Up @@ -64,7 +65,7 @@ public static partial class ParticipantMutations
try
{
await context.SaveChangesAsync(token);
return context.Tournaments.AsNoTracking().Where(t => t.Id == input.TournamentId);
return context.Tournaments.AsNoTracking().Where(t => t.Id == input.TournamentId).With(query);
}
catch (DbUpdateException ex) when (ex.IsUniqueConstraintViolation(TournamentParticipant.SlotNumberUniqueIndexName))
{
Expand Down
9 changes: 5 additions & 4 deletions TournamentAPI/Tournaments/TournamentMutations.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using GreenDonut.Data;
using HotChocolate.Authorization;
using HotChocolate.Resolvers;
using Microsoft.EntityFrameworkCore;
Expand Down Expand Up @@ -69,10 +70,10 @@
}

[UseFirstOrDefault]
[UseProjection]
[Authorize]
public static async Task<IQueryable<Tournament>?> CreateTournament(
CreateTournamentInput input,
QueryContext<Tournament> query,
ClaimsPrincipal userClaims,
ApplicationDbContext context,
IResolverContext resolverContext,
Expand Down Expand Up @@ -106,14 +107,14 @@
if (tournament.Status == TournamentStatus.Open)
tournamentMetrics.TournamentOpened();

return context.Tournaments.Where(t => t.Id == tournament.Id);
return context.Tournaments.AsNoTracking().Where(t => t.Id == tournament.Id).With(query);
}

[UseFirstOrDefault]
[UseProjection]
[Authorize]
public static async Task<IQueryable<Tournament>?> UpdateTournament(
UpdateTournamentInput input,
QueryContext<Tournament> query,
ClaimsPrincipal userClaims,
ApplicationDbContext context,
IResolverContext resolverContext,
Expand Down Expand Up @@ -185,7 +186,7 @@

await context.SaveChangesAsync(token);

return context.Tournaments.Where(t => t.Id == tournament.Id);
return context.Tournaments.AsNoTracking().Where(t => t.Id == tournament.Id).With(query);
}

[Authorize]
Expand All @@ -201,7 +202,7 @@

var tournament = await context.Tournaments
.Include(t => t.Bracket)
.ThenInclude(b => b.Matches)

Check warning on line 205 in TournamentAPI/Tournaments/TournamentMutations.cs

View workflow job for this annotation

GitHub Actions / build-test

Dereference of a possibly null reference.
.Include(t => t.Participants)
.FirstOrDefaultAsync(t => t.Id == tournamentId, token);

Expand Down
Loading