diff --git a/app/features/api-public/routes/tournament-match.$id.ts b/app/features/api-public/routes/tournament-match.$id.ts index a37ad7186..512f4b154 100644 --- a/app/features/api-public/routes/tournament-match.$id.ts +++ b/app/features/api-public/routes/tournament-match.$id.ts @@ -73,7 +73,7 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => { ).as("participants"), ]) .where("TournamentMatchGameResult.matchId", "=", id) - .orderBy("TournamentMatchGameResult.number asc"), + .orderBy("TournamentMatchGameResult.number", "asc"), ).as("playedMapList"), ]) .where("TournamentMatch.id", "=", id) diff --git a/app/features/api-public/routes/tournament.$id.teams.ts b/app/features/api-public/routes/tournament.$id.teams.ts index db6d18577..16d781c8b 100644 --- a/app/features/api-public/routes/tournament.$id.teams.ts +++ b/app/features/api-public/routes/tournament.$id.teams.ts @@ -96,7 +96,7 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => { "=", "TournamentTeam.id", ) - .orderBy("TournamentTeamMember.createdAt asc"), + .orderBy("TournamentTeamMember.createdAt", "asc"), ).as("members"), jsonArrayFrom( eb @@ -106,7 +106,7 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => { ).as("mapPool"), ]) .where("TournamentTeam.tournamentId", "=", id) - .orderBy("TournamentTeam.createdAt asc") + .orderBy("TournamentTeam.createdAt", "asc") .execute(); const friendCodes = await TournamentRepository.friendCodesByTournamentId(id); diff --git a/app/features/api-public/routes/user.$identifier.ts b/app/features/api-public/routes/user.$identifier.ts index a720566ac..27656e583 100644 --- a/app/features/api-public/routes/user.$identifier.ts +++ b/app/features/api-public/routes/user.$identifier.ts @@ -43,7 +43,7 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => { .selectFrom("UserWeapon") .select(["UserWeapon.isFavorite", "UserWeapon.weaponSplId"]) .whereRef("UserWeapon.userId", "=", "User.id") - .orderBy("UserWeapon.order asc"), + .orderBy("UserWeapon.order", "asc"), ).as("weapons"), jsonArrayFrom( eb diff --git a/app/features/badges/BadgeRepository.server.ts b/app/features/badges/BadgeRepository.server.ts index cf85df4c6..0a352e23f 100644 --- a/app/features/badges/BadgeRepository.server.ts +++ b/app/features/badges/BadgeRepository.server.ts @@ -83,7 +83,7 @@ export function findByManagersList(userIds: number[]) { .select(["Badge.id", "Badge.code", "Badge.displayName", "Badge.hue"]) .innerJoin("BadgeManager", "Badge.id", "BadgeManager.badgeId") .where("BadgeManager.userId", "in", userIds) - .orderBy("Badge.id asc") + .orderBy("Badge.id", "asc") .groupBy("Badge.id") .execute(); } diff --git a/app/features/calendar/CalendarRepository.server.ts b/app/features/calendar/CalendarRepository.server.ts index 7da01b76e..3a9d30f38 100644 --- a/app/features/calendar/CalendarRepository.server.ts +++ b/app/features/calendar/CalendarRepository.server.ts @@ -266,7 +266,7 @@ export async function findRecentTournamentsByAuthorId(authorId: number) { "CalendarEventDate.startTime", ]) .where("CalendarEvent.authorId", "=", authorId) - .orderBy("CalendarEvent.id desc") + .orderBy("CalendarEvent.id", "desc") .limit(10) .execute(); } diff --git a/app/features/lfg/LFGRepository.server.ts b/app/features/lfg/LFGRepository.server.ts index 246bdbf99..1550de8a8 100644 --- a/app/features/lfg/LFGRepository.server.ts +++ b/app/features/lfg/LFGRepository.server.ts @@ -34,7 +34,7 @@ export async function posts(user?: { id: number; plusTier: number | null }) { innerEb .selectFrom("UserWeapon") .whereRef("UserWeapon.userId", "=", "User.id") - .orderBy("UserWeapon.order asc") + .orderBy("UserWeapon.order", "asc") .select(["UserWeapon.weaponSplId", "UserWeapon.isFavorite"]), ).as("weaponPool"), ]) @@ -66,7 +66,7 @@ export async function posts(user?: { id: number; plusTier: number | null }) { innestEb .selectFrom("UserWeapon") .whereRef("UserWeapon.userId", "=", "User.id") - .orderBy("UserWeapon.order asc") + .orderBy("UserWeapon.order", "asc") .select([ "UserWeapon.weaponSplId", "UserWeapon.isFavorite", @@ -80,7 +80,7 @@ export async function posts(user?: { id: number; plusTier: number | null }) { ).as("team"), ]) .orderBy(sql`LFGPost.authorId = ${sql`${userId}`} desc`) - .orderBy("LFGPost.updatedAt desc") + .orderBy("LFGPost.updatedAt", "desc") .where((eb) => eb.or([ eb( diff --git a/app/features/sendouq-match/QMatchRepository.server.ts b/app/features/sendouq-match/QMatchRepository.server.ts index fafdaffa3..6854fa135 100644 --- a/app/features/sendouq-match/QMatchRepository.server.ts +++ b/app/features/sendouq-match/QMatchRepository.server.ts @@ -32,7 +32,7 @@ export function findById(id: number) { "GroupMatchMap.winnerGroupId", ]) .where("GroupMatchMap.matchId", "=", id) - .orderBy("GroupMatchMap.index asc"), + .orderBy("GroupMatchMap.index", "asc"), ).as("mapList"), ]) .where("GroupMatch.id", "=", id) @@ -121,7 +121,7 @@ export async function findGroupById({ .selectFrom("UserFriendCode") .select("UserFriendCode.friendCode") .whereRef("UserFriendCode.userId", "=", "User.id") - .orderBy("UserFriendCode.createdAt desc") + .orderBy("UserFriendCode.createdAt", "desc") .limit(1) .as("friendCode"), jsonObjectFrom( @@ -138,7 +138,7 @@ export async function findGroupById({ userChatNameColor, ]) .where("GroupMember.groupId", "=", groupId) - .orderBy("GroupMember.userId asc"), + .orderBy("GroupMember.userId", "asc"), ).as("members"), ]) .where("Group.id", "=", groupId) diff --git a/app/features/tournament-organization/TournamentOrganizationRepository.server.ts b/app/features/tournament-organization/TournamentOrganizationRepository.server.ts index 77ab883cb..f09c23f17 100644 --- a/app/features/tournament-organization/TournamentOrganizationRepository.server.ts +++ b/app/features/tournament-organization/TournamentOrganizationRepository.server.ts @@ -114,7 +114,7 @@ export function findByOrganizerUserId(userId: number) { "ORGANIZER", ), ) - .orderBy("TournamentOrganization.id asc") + .orderBy("TournamentOrganization.id", "asc") .execute(); } @@ -170,7 +170,7 @@ const findEventsBaseQuery = (organizationId: number) => "=", "TournamentTeam.id", ) - .orderBy("User.id asc"), + .orderBy("User.id", "asc"), ).as("members"), ]) .whereRef( @@ -200,7 +200,7 @@ const findEventsBaseQuery = (organizationId: number) => "=", "CalendarEventResultTeam.id", ) - .orderBy("User.id asc"), + .orderBy("User.id", "asc"), ).as("members"), ]) .whereRef("CalendarEventResultTeam.eventId", "=", "CalendarEvent.id") @@ -252,7 +252,7 @@ export async function findEventsByMonth({ "<=", dateToDatabaseTimestamp(lastDayOfTheMonth), ) - .orderBy("CalendarEventDate.startTime asc") + .orderBy("CalendarEventDate.startTime", "asc") .execute(); return events.map(mapEvent); @@ -273,7 +273,7 @@ const findSeriesEventsBaseQuery = ({ ), ), ) - .orderBy("CalendarEventDate.startTime desc"); + .orderBy("CalendarEventDate.startTime", "desc"); export async function findPaginatedEventsBySeries({ organizationId, diff --git a/app/features/tournament/TournamentRepository.server.ts b/app/features/tournament/TournamentRepository.server.ts index ada4ee63a..60aa1ea86 100644 --- a/app/features/tournament/TournamentRepository.server.ts +++ b/app/features/tournament/TournamentRepository.server.ts @@ -208,7 +208,7 @@ export async function findById(id: number) { "=", "TournamentTeam.id", ) - .orderBy("TournamentTeamMember.createdAt asc"), + .orderBy("TournamentTeamMember.createdAt", "asc"), ).as("members"), jsonArrayFrom( innerEb @@ -252,7 +252,8 @@ export async function findById(id: number) { ).as("team"), ]) .where("TournamentTeam.tournamentId", "=", id) - .orderBy(["TournamentTeam.seed asc", "TournamentTeam.createdAt asc"]), + .orderBy("TournamentTeam.seed", "asc") + .orderBy("TournamentTeam.createdAt", "asc"), ).as("teams"), jsonArrayFrom( eb @@ -523,7 +524,7 @@ export function forShowcase() { ).as("firstPlacers"), ]) .where("CalendarEventDate.startTime", ">", databaseTimestampWeekAgo()) - .orderBy("CalendarEventDate.startTime asc") + .orderBy("CalendarEventDate.startTime", "asc") .$narrowType<{ teamsCount: NotNull }>() .execute(); } @@ -603,7 +604,7 @@ export async function friendCodesByTournamentId(tournamentId: number) { "UserFriendCode.userId", ) .select(["TournamentTeamMember.userId", "UserFriendCode.friendCode"]) - .orderBy("UserFriendCode.createdAt asc") + .orderBy("UserFriendCode.createdAt", "asc") .where("TournamentTeam.tournamentId", "=", tournamentId) .execute(); @@ -1030,7 +1031,7 @@ export function pickBanEventsByMatchId(matchId: number) { "TournamentMatchPickBanEvent.number", ]) .where("matchId", "=", matchId) - .orderBy("TournamentMatchPickBanEvent.number asc") + .orderBy("TournamentMatchPickBanEvent.number", "asc") .execute(); } diff --git a/app/features/user-page/UserRepository.server.ts b/app/features/user-page/UserRepository.server.ts index a0ac92047..719d922b5 100644 --- a/app/features/user-page/UserRepository.server.ts +++ b/app/features/user-page/UserRepository.server.ts @@ -580,7 +580,7 @@ export async function currentFriendCodeByUserId(userId: number) { "UserFriendCode.submitterUserId", ]) .where("userId", "=", userId) - .orderBy("UserFriendCode.createdAt desc") + .orderBy("UserFriendCode.createdAt", "desc") .limit(1) .executeTakeFirst(); } @@ -595,7 +595,7 @@ export async function allCurrentFriendCodes() { const allFriendCodes = await db .selectFrom("UserFriendCode") .select(["UserFriendCode.friendCode", "UserFriendCode.userId"]) - .orderBy("UserFriendCode.createdAt desc") + .orderBy("UserFriendCode.createdAt", "desc") .execute(); const seenUserIds = new Set(); diff --git a/scripts/transfer-weapon-pools.ts b/scripts/transfer-weapon-pools.ts index 1f170d70d..9bc68f5ca 100644 --- a/scripts/transfer-weapon-pools.ts +++ b/scripts/transfer-weapon-pools.ts @@ -11,7 +11,7 @@ async function main() { "UserWeapon.userId", ]) .where("UserWeapon.order", "!=", 5) - .orderBy("UserWeapon.order asc") + .orderBy("UserWeapon.order", "asc") .execute(); // group by userId