17th-Ranger-Battalion-ORG/milsim-site-v4
8
1
Fork 0
Code Issues 36 Pull Requests 2 Actions Packages Projects 1 Releases 16 Wiki Activity

Merge branch 'main' of https://gitea.iceberg-gaming.com/17th-Ranger-Battalion-ORG/milsim-site-v4
Some checks failed
Testing Site CD / Update Development (push) Failing after 3m15s
Details

Browse Source
This commit is contained in:
hizumi
2026-02-12 14:12:17 -06:00
parent bd8f6ba84b ab9bb99987
commit 545b317caa
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/src/services/db/memberService.ts
View File

@@ -184,25 +184,21 @@ export async function getAllMembersLite(): Promise<MemberLight[]> {
export async function getMembersFull(ids: number[]): Promise<MemberCardDetails[]> { export async function getMembersFull(ids: number[]): Promise<MemberCardDetails[]> {
const sql = ` const sql = `
SELECT m.*, SELECT
COALESCE( m.*,
JSON_ARRAYAGG( (
CASE SELECT COALESCE(JSON_ARRAYAGG(JSON_OBJECT(
WHEN r.id IS NOT NULL THEN JSON_OBJECT(
'id', r.id, 'id', r.id,
'name', r.name, 'name', r.name,
'color', r.color, 'color', r.color,
'description', r.description 'description', r.description
) )), JSON_ARRAY())
END FROM members_roles mr
), JOIN roles r ON mr.role_id = r.id
JSON_ARRAY() WHERE mr.member_id = m.member_id
) AS roles ) AS roles
FROM view_member_rank_unit_status_latest m FROM view_member_rank_unit_status_latest m
LEFT JOIN members_roles mr ON m.member_id = mr.member_id WHERE m.member_id IN (?);
LEFT JOIN roles r ON mr.role_id = r.id
WHERE m.member_id IN (?)
GROUP BY m.member_id;
`; `;
const rows: any[] = await pool.query(sql, [ids]); const rows: any[] = await pool.query(sql, [ids]);