Merge branch 'devkor-project:main' into main

src/services/categoryService.ts

@@ -31,6 +31,7 @@ export const getCategoryList = async (userId: number): Promise<ServiceResult<cat
     .innerJoinAndSelect('cp.category', 'c')
     .select(['c.categoryId AS categoryId', 'c.categoryName AS categoryName', 'c.provider AS provider'])
     .where('cp.userId = :userId', { userId })
+    .orderBy('c.provider')
     .getRawMany();
 
   logger.info('get category list success', userId, result);

src/services/noticeService.ts

@@ -96,6 +96,7 @@ export const getHotNotices = async function (userId: number):
     .addSelect('c.categoryName AS categoryName')
     .addSelect('case when n.noticeId = sc.noticeId then \'Y\' else \'N\' end as isScraped')
     .orderBy('n.viewCount', 'DESC')
+    .where('date BETWEEN DATE_ADD(NOW(),INTERVAL -30 DAY ) AND NOW()')
     .limit(20)
     .getRawMany();
 

src/services/scrapService.ts

@@ -19,7 +19,7 @@ export const getScraps = async function (userId: number):
       .where('u.userId = :userId', { userId }), 'sc', 'n.noticeId = sc.noticeId')
     .innerJoin('n.scraps', 's')
     .innerJoin('s.user', 'u')
-    .select(['n.noticeId AS noticeId', 'n.title AS title', 'n.date AS date', 'n.provider AS provider', 'n.viewCount AS viewCount'])
+    .select(['n.noticeId AS noticeId', 'n.title AS title', 'date_format(n.date, \'%Y-%m-%d\') as date', 'n.provider AS provider', 'n.viewCount AS viewCount'])
     .addSelect('c.categoryName AS categoryName')
     .addSelect('case when n.noticeId = sc.noticeId then \'Y\' else \'N\' end as isScraped')
     .where('u.userId = :userId', { userId })

src/services/userService.ts

@@ -1,7 +1,7 @@
 import logger from '@/config/winston';
 import User from '@/entities/User';
 import ServiceResult from '@/interfaces/common';
-import { EMAIL_NOT_EXISTS } from '@/interfaces/error';
+import { EMAIL_NOT_EXISTS, NOT_KOREA } from '@/interfaces/error';
 import { userInfoDto } from '@/interfaces/userDto';
 
 export const getUserInfo = async (userId: number):
@@ -34,6 +34,10 @@ export const modifyUserInfo = async (userId: number, modifiedInfo: userInfoDto):
   if (!user) {
     throw EMAIL_NOT_EXISTS;
   }
+  const regex = /[a-z0-9][email protected]/;
+  if (!regex.test(email)) {
+    throw NOT_KOREA;
+  }
   user.email = email;
   user.receiveEmail = receiveEmail;
   user.studentID = studentID;