Merge pull request #173 from GDSC-PKNU-Official/fix/#172

GDSC-PKNU-Official · Jan 12, 2024 · 91e94aa · 91e94aa
2 parents 539f08e + 07997f8
commit 91e94aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/apis/notice/service.ts b/src/apis/notice/service.ts
@@ -43,7 +43,7 @@ const updateNotice = (notices: Notices[]) => {
 
 export const getNotices = async (department: string): Promise<SeparateNoti> => {
   const majorId = await getDepartmentIdByMajor(department);
-  const query = `SELECT * FROM major_notices WHERE department_id = ${majorId};`;
+  const query = `SELECT * FROM major_notices WHERE department_id = ${majorId} ORDER BY STR_TO_DATE(upload_date, '%Y-%m-%d') DESC;`;
   const major_notices = await selectQuery<Notices[]>(query);
 
   const notices: SeparateNoti = {

diff --git a/src/db/data/noticeHandler.ts b/src/db/data/noticeHandler.ts
@@ -62,11 +62,13 @@ const saveMajorNotice = async (
 
 const convertAllNoticeToNormalNotice = async (
   tableName: string,
+  connection?: PoolConnection,
 ): Promise<void> => {
   const query = `UPDATE ${tableName} SET rep_yn = false;`;
 
   try {
-    await db.execute(query);
+    if (connection) await connection.execute(query);
+    else await db.execute(query);
     console.log('모든 공지를 일반 공지로 변경');
   } catch (error) {
     notificationToSlack(error.message + '\n모든 공지를 일반 공지로 변경 실패');
@@ -89,7 +91,7 @@ const convertSpecificNoticeToPinnedNotice = async (
 export const saveMajorNoticeToDB = async (
   connection?: PoolConnection,
 ): Promise<PushNoti> => {
-  await convertAllNoticeToNormalNotice('major_notices');
+  await convertAllNoticeToNormalNotice('major_notices', connection);
   const query = 'SELECT * FROM departments;';
   const colleges = await selectQuery<College[]>(query, connection);