diff --git a/api/src/routes/applications.ts b/api/src/routes/applications.ts index c1f441a..8b2f61d 100644 --- a/api/src/routes/applications.ts +++ b/api/src/routes/applications.ts @@ -49,21 +49,14 @@ router.get('/me', async (req, res) => { // GET /application/:id router.get('/:id', async (req, res) => { let appID = req.params.id; - + console.log("HELLO") try { - const conn = await pool.getConnection() - const application = await getApplicationByID(appID); - - if (!Array.isArray(application) || application.length === 0) { - conn.release(); - return res.status(204).json("Application Not Found"); - } - + if (application === undefined) + return res.sendStatus(204); + const comments: CommentRow[] = await getApplicationComments(appID); - conn.release() - const output: ApplicationFull = { application, comments, diff --git a/shared/types/application.ts b/shared/types/application.ts index 0c5b1a4..f8b648d 100644 --- a/shared/types/application.ts +++ b/shared/types/application.ts @@ -26,7 +26,7 @@ export interface ApplicationRow { approved_at: string | null; denied_at: string | null; - app_status: Status; // generated column + app_status: ApplicationStatus; // generated column decision_at: string | null; // generated column // present when you join members (e.g., SELECT a.*, m.name AS member_name) @@ -54,4 +54,10 @@ export interface ApplicationListRow { member_name: string | null; // because LEFT JOIN means it might be null submitted_at: Date; app_status: string; // or enum if you have one +} + +export enum ApplicationStatus { + Pending = "Pending", + Accepted = "Accepted", + Denied = "Denied", } \ No newline at end of file