Merge pull request #211 from Neogasogaeseo/joo_feat/#210

[fix] QA
Neogasogaeseo · Sep 14, 2022 · f8c7fb0 · f8c7fb0
2 parents 3815274 + 10752ae
commit f8c7fb0
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 16 deletions.
diff --git a/functions/api/routes/auth/authLoginPOST.js b/functions/api/routes/auth/authLoginPOST.js
@@ -14,7 +14,7 @@ module.exports = async (req, res) => {
   let kakao_profile;
   let authUser;
   let client;
-  if (!authenticationCode) {
+  if (!provider || !authenticationCode) {
     return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.NULL_VALUE));
   }
   try {
@@ -34,7 +34,7 @@ module.exports = async (req, res) => {
     });
   } catch (error) {
     console.log(error);
-    return res.status(statusCode.NOT_FOUND).json(util.fail(statusCode.NOT_FOUND, responseMessage.WRONG_AUTH));
+    return res.status(statusCode.BAD_REQUEST).json(util.fail(statusCode.BAD_REQUEST, responseMessage.WRONG_AUTH));
   }
 
   try {
@@ -45,7 +45,7 @@ module.exports = async (req, res) => {
       },
     });
   } catch (error) {
-    return res.status(statusCode.NOT_FOUND).json(util.fail(statusCode.NOT_FOUND, responseMessage.WRONG_TOKEN));
+    return res.status(statusCode.BAD_REQUEST).json(util.fail(statusCode.BAD_REQUEST, responseMessage.WRONG_TOKEN));
   }
 
   try {

diff --git a/functions/api/routes/form/formMyAllGET.js b/functions/api/routes/form/formMyAllGET.js
@@ -23,18 +23,20 @@ module.exports = async (req, res) => {
     client = await db.connect(req);
 
     //^_^// formId 답변 유무, 최신순 정렬
-    const myFormIdRecentList = await answerDB.getRecentFormIdListByUserId(client, userId);
+    const myFormIdRecentList = await answerDB.getFormIdListByUserId(client, userId);
     myFormIdRecentList.sort(function (a, b) {
       if (b.cnt === '0') return -1;
+      else if (b.createdAt < a.createdAt) return -1;
     });
 
     if (myFormIdRecentList.length === 0) {
       return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.NO_MY_FORM_CONTENT));
     }
     const idUnique = myFormIdRecentList.filter((form, index, arr) => {
-      return arr.findIndex((item) => item.formId === form.formId) === index;
+      return arr.findIndex((item) => item.id === form.id) === index;
     });
-    let idList = extractValues(idUnique, 'formId');
+
+    let idList = extractValues(idUnique, 'id');
     const count = idList.length;
 
     //^_^// form id로 form, answer 정보 가져오기

diff --git a/functions/api/routes/form/formMyGET.js b/functions/api/routes/form/formMyGET.js
@@ -23,18 +23,20 @@ module.exports = async (req, res) => {
     client = await db.connect(req);
 
     //^_^// formId 답변 유무, 최신순 정렬
-    const myFormIdRecentList = await answerDB.getRecentFormIdListByUserId(client, userId);
+    const myFormIdRecentList = await answerDB.getFormIdListByUserId(client, userId);
     myFormIdRecentList.sort(function (a, b) {
       if (b.cnt === '0') return -1;
+      else if (b.createdAt < a.createdAt) return -1;
     });
 
     if (myFormIdRecentList.length === 0) {
       return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.NO_MY_FORM_CONTENT));
     }
     const idUnique = myFormIdRecentList.filter((form, index, arr) => {
-      return arr.findIndex((item) => item.formId === form.formId) === index;
+      return arr.findIndex((item) => item.id === form.id) === index;
     });
-    let idList = extractValues(idUnique, 'formId');
+
+    let idList = extractValues(idUnique, 'id');
     const count = idList.length;
     if (idList.length > 2) idList = idList.slice(0, 2);
 

diff --git a/functions/api/routes/team/teamIssueGET.js b/functions/api/routes/team/teamIssueGET.js
@@ -7,6 +7,7 @@ const db = require('../../../db/db');
 const { issueDB } = require('../../../db');
 const resizeImage = require('../../../lib/resizeImage');
 const slackAPI = require('../../../lib/slackAPI');
+const { result } = require('lodash');
 
 const extractValues = (arr, key) => {
   if (!Array.isArray(arr)) return [arr[key] || null];
@@ -37,6 +38,7 @@ module.exports = async (req, res) => {
     for (const issue of myIssue) {
       issue.createdAt = dayjs(issue.createdAt).format('YYYY-MM-DD');
     }
+    console.log(myIssue);
 
     const myTeam = await issueDB.getTeamByIssueIdList(client, idList);
     myTeam.forEach((item) => (item.image = resizeImage(item.image)));
@@ -63,9 +65,12 @@ module.exports = async (req, res) => {
     myTeam.forEach((team) => map.set(team.issueId, { ...map.get(team.issueId), team }));
     const resultList = Array.from(map.values());
 
+    let i = 0;
     resultList.forEach((item) => {
-      item.feedback.forEach((o) => delete o.issueId);
-      delete item.team.issueId;
+      if (item.feedback) {
+        item.feedback.forEach((o) => delete o.issueId);
+        delete item.team.issueId;
+      }
     });
 
     res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.READ_MY_ISSUE_SUCCESS, resultList));

diff --git a/functions/db/answerDB.js b/functions/db/answerDB.js
@@ -78,16 +78,16 @@ const getAnswerByFormIdAndUserIdForFormDetailTopKeyword = async (client, formId,
   return convertSnakeToCamel.keysToCamel(rows);
 };
 
-const getRecentFormIdListByUserId = async (client, userId) => {
+const getFormIdListByUserId = async (client, userId) => {
   const { rows } = await client.query(
     `
-    SELECT l.form_id, l.created_at, COUNT(a.id) as cnt
+    SELECT l.form_id as id, l.created_at, COUNT(a.id) as cnt
     FROM "link_user_form" l
     LEFT JOIN "answer" a
     ON l.id = a.link_user_form_id
     WHERE l.user_id = $1
+    AND l.is_deleted = false
     GROUP BY l.form_id, l.created_at
-    ORDER BY created_at DESC
     `,
     [userId],
   );
@@ -249,7 +249,7 @@ module.exports = {
   addAnswer,
   getAnswerByFormIdListAndUserID,
   getAnswerUserIdByAnswerId,
-  getRecentFormIdListByUserId,
+  getFormIdListByUserId,
   getAnswerByFormIdList,
   getAnswerByFormIdAndUserId,
   getAnswerCountByFormIdAndUserId,

diff --git a/functions/db/formDB.js b/functions/db/formDB.js
@@ -175,13 +175,15 @@ const getFormDetail = async (client, formId, userId) => {
 const getFormByFormIdList = async (client, formIdList, userId) => {
   const { rows } = await client.query(
     `
-    SELECT f.id, f.title, f.subtitle, f.dark_icon_image, f.created_at
+    SELECT f.id, f.title, f.subtitle, f.dark_icon_image, l.created_at
     FROM "form" f
     JOIN "link_user_form" l
     ON l.form_id = f.id
     WHERE f.is_deleted = false
+    AND l.is_deleted = false
     AND l.user_id = $1
     AND f.id in (${formIdList.join(',')})
+    ORDER BY l.created_at DESC
     `,
     [userId],
   );