diff --git a/src/lib/api/types.ts b/src/lib/api/types.ts index c98b1bf..c6450d0 100644 --- a/src/lib/api/types.ts +++ b/src/lib/api/types.ts @@ -4,6 +4,7 @@ export interface HuntResponse { startDateTime: string endDateTime: string isTerminated: boolean + terminated?: boolean // Spring may serialize boolean getter isTerminated() as "terminated" } export interface TeamResponse { diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 7ed99ff..ab59bdb 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -7,7 +7,7 @@ export function parseUTC(iso: string): Date { } export function huntStatus(hunt: HuntResponse): 'ONGOING' | 'UNSTARTED' | 'CLOSED' { - if (hunt.isTerminated) return 'CLOSED' + if (hunt.isTerminated || hunt.terminated) return 'CLOSED' const now = Date.now() if (now < parseUTC(hunt.startDateTime).getTime()) return 'UNSTARTED' if (now > parseUTC(hunt.endDateTime).getTime()) return 'CLOSED' diff --git a/src/routes/admin/HuntManage.svelte b/src/routes/admin/HuntManage.svelte index 0be607f..2d4967c 100644 --- a/src/routes/admin/HuntManage.svelte +++ b/src/routes/admin/HuntManage.svelte @@ -49,7 +49,7 @@ editTitle = hunt.title editStart = hunt.startDateTime editEnd = hunt.endDateTime - editTerminated = hunt.isTerminated + editTerminated = hunt.isTerminated || hunt.terminated || false editingHunt = true }