Leahnaya/sendou.ink
1
0
Fork 0
mirror of https://github.com/Sendouc/sendou.ink.git synced 2026-09-28 14:20:46 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix missing logos on calendar

Browse Source
This commit is contained in:
Kalle
2025-11-08 16:31:21 +02:00
parent bca14d5713
commit 5bf012d25e
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/features/calendar/CalendarRepository.server.ts
View File

@@ -23,7 +23,11 @@ import {
dateToDatabaseTimestamp,
} from "~/utils/dates";
import invariant from "~/utils/invariant";
import { COMMON_USER_FIELDS } from "~/utils/kysely.server";
import {
COMMON_USER_FIELDS,
concatUserSubmittedImagePrefix,
tournamentLogoWithDefault,
} from "~/utils/kysely.server";
import type { Unwrapped } from "~/utils/types";
import { calendarEventPage, tournamentPage } from "~/utils/urls";
import {
@@ -85,12 +89,14 @@ function tournamentOrganization(organizationId: Expression<number | null>) {
"TournamentOrganization.avatarImgId",
"UserSubmittedImage.id",
)
.select([
.select((eb) => [
"TournamentOrganization.id",
"TournamentOrganization.name",
"TournamentOrganization.slug",
"TournamentOrganization.isEstablished",
"UserSubmittedImage.url as avatarUrl",
concatUserSubmittedImagePrefix(eb.ref("UserSubmittedImage.url")).as(
"avatarUrl",
),
])
.whereRef("TournamentOrganization.id", "=", organizationId),
);
@@ -143,12 +149,6 @@ const withTeamsCount = (
)
.select(({ fn }) => [fn.countAll<number>().as("teamsCount")]);
const withLogoUrl = (eb: ExpressionBuilder<DB, "CalendarEvent">) =>
eb
.selectFrom("UserSubmittedImage")
.select(["UserSubmittedImage.url"])
.whereRef("CalendarEvent.avatarImgId", "=", "UserSubmittedImage.id");
function findAllBetweenTwoTimestampsQuery({
startTime,
endTime,
@@ -176,7 +176,7 @@ function findAllBetweenTwoTimestampsQuery({
),
withOrganization(eb).as("organization"),
withTeamsCount(eb).as("teamsCount"),
withLogoUrl(eb).as("logoUrl"),
tournamentLogoWithDefault(eb).as("logoUrl"),
jsonArrayFrom(
eb
.selectFrom("MapPoolMap")
@@ -290,7 +290,7 @@ export function forShowcase() {
"CalendarEvent.name",
"CalendarEventDate.startTime",
withTeamsCount(eb).as("teamsCount"),
withLogoUrl(eb).as("logoUrl"),
tournamentLogoWithDefault(eb).as("logoUrl"),
withOrganization(eb).as("organization"),
jsonArrayFrom(
eb
@@ -314,12 +314,16 @@ export function forShowcase() {
)
.whereRef("TournamentResult.tournamentId", "=", "Tournament.id")
.where("TournamentResult.placement", "=", 1)
.select([
.select((eb) => [
...COMMON_USER_FIELDS,
"User.country",
"TournamentTeam.name as teamName",
"TeamAvatar.url as teamLogoUrl",
"TournamentTeamAvatar.url as pickupAvatarUrl",
concatUserSubmittedImagePrefix(eb.ref("TeamAvatar.url")).as(
"teamLogoUrl",
),
concatUserSubmittedImagePrefix(
eb.ref("TournamentTeamAvatar.url"),
).as("pickupAvatarUrl"),
]),
).as("firstPlacers"),
])