CraftAttack/varo-website
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix teams api
All checks were successful
deploy / build-and-deploy (push) Successful in 15s
Details

Browse Source
This commit is contained in:
bytedream
2025-05-18 22:49:04 +02:00
parent af1424edc2
commit 9785a8c087
3 changed files with 27 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/db/schema/team.ts
View File

@ -1,4 +1,4 @@
import { alias, char, int, mysqlTable, timestamp, varchar } from 'drizzle-orm/mysql-core';
import { char, int, mysqlTable, timestamp, varchar } from 'drizzle-orm/mysql-core';
import type { MySql2Database } from 'drizzle-orm/mysql2';
import { aliasedTable, and, asc, desc, eq, like, sql } from 'drizzle-orm';
import { teamMember } from './teamMember.ts';
@ -135,13 +135,6 @@ export async function getTeams(db: Database, values: GetTeamsReq) {
}
export async function getTeamsFull(db: Database, _values: GetTeamsFullReq) {
const memberOneTeamMember = alias(teamMember, 'member_one_team_member');
const memberTwoTeamMember = alias(teamMember, 'member_two_team_member');
const memberOneUser = alias(user, 'member_one_user');
const memberTwoUser = alias(user, 'member_two_user');
const memberOneDeath = alias(death, 'member_one_death');
const memberTwoDeath = alias(death, 'member_two_death');
const strikeWeightSubquery = db
.select({
teamId: team.id,
@ -157,19 +150,14 @@ export async function getTeamsFull(db: Database, _values: GetTeamsFullReq) {
return db
.select({
team: team,
memberOne: memberOneUser,
memberTwo: memberTwoUser,
memberOneDeath: memberOneDeath,
memberTwoDeath: memberTwoDeath,
user: user,
death: death,
strikeWeight: strikeWeightSubquery.strikeWeight
})
.from(team)
.leftJoin(memberOneTeamMember, eq(team.id, memberOneTeamMember.teamId))
.leftJoin(memberTwoTeamMember, eq(team.id, memberTwoTeamMember.teamId))
.leftJoin(memberOneUser, eq(memberOneTeamMember.userId, memberOneUser.id))
.leftJoin(memberTwoUser, eq(memberTwoTeamMember.userId, memberTwoUser.id))
.leftJoin(memberOneDeath, eq(memberOneUser.id, memberOneDeath.deadUserId))
.leftJoin(memberTwoDeath, eq(memberTwoUser.id, memberTwoDeath.deadUserId))
.leftJoin(teamMember, eq(team.id, teamMember.teamId))
.leftJoin(user, eq(teamMember.userId, user.id))
.leftJoin(death, eq(user.id, death.deadUserId))
.leftJoin(strikeWeightSubquery, eq(team.id, strikeWeightSubquery.teamId));
}