Merge pull request #39 from GDSC-PKNU-21-22/fix/#38

Fix/#38: 공지사항 요청 하는 함수 에러 핸들링 추가
GDSC-PKNU-Official · Jul 18, 2023 · d962561 · d962561
2 parents ac8c672 + 406bedf
commit d962561
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/apis/notice/controller.ts b/src/apis/notice/controller.ts
@@ -5,6 +5,9 @@ const router = express.Router();
 router.get('/', async (req: Request, res: Response) => {
   try {
     const major = req.query.major as string;
+    if (major === undefined) {
+      res.status(404).json('학과를 입력해주세요');
+    }
     const notices = await getNotices(major);
     res.json(notices);
   } catch (err) {

diff --git a/src/apis/notice/service.ts b/src/apis/notice/service.ts
@@ -9,7 +9,7 @@ export const getNotices = async (department: string): Promise<Notice[]> => {
       const getNoticesQuery = `SELECT * FROM ${tableName}`;
       db.query(getNoticesQuery, (err: Error, res: Notice[]) => {
         if (err) reject(err);
-        notices.push(...res);
+        if (res !== undefined && res.length > 0) notices.push(...res);
         resolve();
       });
     });
@@ -19,5 +19,6 @@ export const getNotices = async (department: string): Promise<Notice[]> => {
     getNoticesFromTable(`${department}고정`),
     getNoticesFromTable(`${department}일반`),
   ]);
+
   return notices;
 };