mirror of
https://github.com/Sendouc/sendou.ink.git
synced 2026-08-16 15:48:45 -05:00
Fix a few missing isPlaceholder filters in tournament team queries
This commit is contained in:
@@ -104,6 +104,7 @@ export const loader = async ({ params }: LoaderFunctionArgs) => {
|
||||
).as("mapPool"),
|
||||
])
|
||||
.where("TournamentTeam.tournamentId", "=", id)
|
||||
.where("TournamentTeam.isPlaceholder", "=", 0)
|
||||
.orderBy("TournamentTeam.createdAt", "asc")
|
||||
.execute();
|
||||
|
||||
|
||||
@@ -51,7 +51,8 @@ export const loader = async ({ params }: LoaderFunctionArgs) => {
|
||||
.on("TournamentTeamCheckIn.bracketIdx", "is", null),
|
||||
)
|
||||
.select(["TournamentTeamCheckIn.checkedInAt"])
|
||||
.where("TournamentTeam.tournamentId", "=", id),
|
||||
.where("TournamentTeam.tournamentId", "=", id)
|
||||
.where("TournamentTeam.isPlaceholder", "=", 0),
|
||||
).as("teams"),
|
||||
])
|
||||
.where("Tournament.id", "=", id)
|
||||
|
||||
@@ -147,6 +147,7 @@ const withTeamsCount = (
|
||||
),
|
||||
)
|
||||
.whereRef("TournamentTeam.tournamentId", "=", "Tournament.id")
|
||||
.where("TournamentTeam.isPlaceholder", "=", 0)
|
||||
.where((eb) =>
|
||||
eb.or([
|
||||
eb("TournamentTeamCheckIn.checkedInAt", "is not", null),
|
||||
|
||||
@@ -338,6 +338,7 @@ export async function findChildTournaments(parentTournamentId: number) {
|
||||
.selectFrom("TournamentTeam")
|
||||
.select(({ fn }) => [fn.countAll<number>().as("teamsCount")])
|
||||
.whereRef("TournamentTeam.tournamentId", "=", "Tournament.id")
|
||||
.where("TournamentTeam.isPlaceholder", "=", 0)
|
||||
.as("teamsCount"),
|
||||
jsonArrayFrom(
|
||||
eb
|
||||
@@ -348,7 +349,8 @@ export async function findChildTournaments(parentTournamentId: number) {
|
||||
"TournamentTeam.id",
|
||||
)
|
||||
.select(["TournamentTeamMember.userId"])
|
||||
.whereRef("TournamentTeam.tournamentId", "=", "Tournament.id"),
|
||||
.whereRef("TournamentTeam.tournamentId", "=", "Tournament.id")
|
||||
.where("TournamentTeam.isPlaceholder", "=", 0),
|
||||
).as("teamMembers"),
|
||||
])
|
||||
.where("Tournament.parentTournamentId", "=", parentTournamentId)
|
||||
|
||||
Reference in New Issue
Block a user