Skip to content
This repository has been archived by the owner on Dec 27, 2024. It is now read-only.

Commit

Permalink
Merge pull request #155 from taga3s/chore/update-libs
Browse files Browse the repository at this point in the history 
update express to the latest
  • Loading branch information
@taga3s
taga3s authored Oct 27, 2024
2 parents e5394b7 + 15efbff commit 9b71f54
Show file tree
Hide file tree
Showing 8 changed files with 118 additions and 76 deletions.
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"migrate": "npx prisma migrate dev",
"migrate:reset": "npx prisma migrate reset",
"studio": "npx prisma studio",
"lint": "biome lint --apply-unsafe src",
"format": "biome format --write src",
"lint": "biome lint --apply ./src",
"format": "biome format --write ./src",
"prepare": "husky",
"test": "TZ=utc jest",
"generate:types": "npx openapi-typescript docs/api/openapi.yaml --output src/pkg/schema/schema.gen.ts"
Expand All @@ -29,7 +29,7 @@
"cors": "^2.8.5",
"dayjs": "^1.11.10",
"dotenv": "^16.4.5",
"express": "^4.19.2",
"express": "^4.21.1",
"express-jwt": "^8.4.1",
"express-validator": "^7.2.0",
"firebase-admin": "^12.0.0",
Expand All @@ -47,7 +47,7 @@
"@biomejs/biome": "1.5.3",
"@types/cookie-parser": "^1.4.6",
"@types/cors": "^2.8.17",
"@types/express": "^4.17.21",
"@types/express": "^5.0.0",
"@types/jest": "^29.5.12",
"@types/jsonwebtoken": "^9.0.7",
"@types/node": "^20.11.19",
Expand Down
26 changes: 23 additions & 3 deletions pnpm-lock.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 16 additions & 12 deletions src/controller/badge/badge_controller.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@ export const achieveBadgeController = async (req: Request<{ id: string }>, res:
is_pinned: outputDTO.isPinned,
unlockable: true,
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};

Expand All @@ -56,12 +57,13 @@ export const listBadgesController = async (req: Request, res: Response) => {
};
}),
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};

Expand All @@ -85,12 +87,13 @@ export const pinBadgeController = async (req: Request<{ id: string }>, res: Resp
unlockable: outputDTO.unlockable,
is_pinned: outputDTO.isPinned,
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};

Expand All @@ -114,11 +117,12 @@ export const unpinBadgeController = async (req: Request<{ id: string }>, res: Re
unlockable: outputDTO.unlockable,
is_pinned: outputDTO.isPinned,
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};
49 changes: 28 additions & 21 deletions src/controller/quest/quest_controller.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,13 @@ export const createQuestController = async (req: Request<{}, {}, CreateQuestRequ
status: "ok",
...questBaseResponse,
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};

Expand All @@ -67,12 +68,13 @@ export const listQuestsController = async (req: Request, res: Response) => {
status: "ok",
quests: questBaseResponses,
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};

Expand All @@ -84,12 +86,13 @@ export const deleteQuestController = async (req: Request<{ id: string }>, res: R
await deleteQuestService(inputDTO);

const response: DeleteQuestResponse = { status: "ok" };
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};

Expand Down Expand Up @@ -117,12 +120,13 @@ export const updateQuestController = async (req: Request<{ id: string }, {}, Upd
status: "ok",
...questBaseResponse,
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};

Expand All @@ -138,12 +142,13 @@ export const startQuestController = async (req: Request<{ id: string }>, res: Re
status: "ok",
...questBaseResponse,
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};

Expand All @@ -160,12 +165,13 @@ export const finishQuestController = async (req: Request<{ id: string }>, res: R
status: "ok",
...questBaseResponse,
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};

Expand All @@ -182,11 +188,12 @@ export const forceFinishQuestController = async (req: Request<{ id: string }>, r
status: "ok",
...questBaseResponse,
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};
28 changes: 16 additions & 12 deletions src/controller/tag/tag_controller.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ export const listTagsController = async (req: Request, res: Response) => {
};
}),
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};

Expand All @@ -49,12 +50,13 @@ export const createTagController = async (req: Request<{}, {}, CreateTagRequest>
name: outputDTO.name,
color: outputDTO.color,
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};

Expand All @@ -64,12 +66,13 @@ export const deleteTagController = async (req: Request<{ id: string }>, res: Res
try {
const outputDTO = await deleteTagService(inputDTO);
const response: DeleteTagResponse = { status: "ok" };
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};

Expand All @@ -89,11 +92,12 @@ export const updateTagController = async (req: Request<{ id: string }, {}, Updat
name: outputDTO.name,
color: outputDTO.color,
};
return res.status(200).json(response);
res.status(200).json(response);
} catch (err) {
if (err instanceof HttpError) {
return res.status(err.statusCode).json({ status: "error", message: err.message });
res.status(err.statusCode).json({ status: "error", message: err.message });
return;
}
return res.status(500).json({ status: "error", message: "Internal server error." });
res.status(500).json({ status: "error", message: "Internal server error." });
}
};
Loading

0 comments on commit 9b71f54

Please sign in to comment.