Merge pull request #10 from SV-Winter-BootCamp-Team-C/feat/#9

formAllUser 제목 검색 기능 추가 + id를 surveyId로 변경
SV-Winter-BootCamp-Team-C · Jan 18, 2024 · 785dcd3 · 785dcd3
2 parents 6467ce5 + 1bd1f06
commit 785dcd3
Show file tree

Hide file tree

Showing 2 changed files with 122 additions and 38 deletions.
diff --git a/backend/controller/formAllUser.js b/backend/controller/formAllUser.js
@@ -1,58 +1,137 @@
 const { Survey, Answer, Question } = require('../models');
+const { surveyTitleSearch } = require('./surveyTitleSearch');
 
 const getUserSurveys = async (req, res) => {
   try {
     const userId = req.params.id;
     const pageLimit = req.query.limit;
     const pageOffset = (req.query.page - 1) * pageLimit;
+    const title = req.query.title;
 
-    const surveys = await Survey.findAll({
-      where: { userId: userId },
-      attributes: [
-        'id',
-        'title',
-        'mainImageUrl', // Make sure to include 'mainImageUrl' here
-        'createdAt',
-        'deadline',
-        'open',
-      ],
-      offset: pageOffset,
-      limit: pageLimit,
-    });
-
-    // 각 설문조사에 대한 attended_count 계산
-    const modifiedSurveys = await Promise.all(
-      surveys.map(async (survey) => {
-        const attendedCount = await Answer.count({
+    if (!title) {
+      const surveys = await Survey.findAll({
+        where: { userId: userId },
+        attributes: [
+          'id',
+          'title',
+          'mainImageUrl', // Make sure to include 'mainImageUrl' here
+          'createdAt',
+          'deadline',
+          'open',
+        ],
+        offset: pageOffset,
+        limit: pageLimit,
+      });
+
+      // 각 설문조사에 대한 attended_count 계산
+      const modifiedSurveys = await Promise.all(
+        surveys.map(async (survey) => {
+          const attendedCount = await Answer.count({
+            distinct: true,
+            col: 'userId',
+            include: [
+              {
+                model: Question,
+                attributes: [],
+                where: { surveyId: survey.id },
+              },
+            ],
+          });
+
+          return {
+            surveyId: survey.id,
+            title: survey.title,
+            open: survey.open,
+            mainImageUrl: survey.mainImageUrl || null,
+            createdAt: survey.createdAt,
+            deadline: survey.deadline,
+            attendedCount: attendedCount,
+          };
+        }),
+      );
+
+      const totalCount = await Survey.count({ where: { userId: userId } });
+
+      res.json({
+        surveys: modifiedSurveys,
+        totalPages: Math.ceil(totalCount / pageLimit),
+      });
+    } else {
+      const selectSurveys = await Survey.findAll({
+        where: { userId: userId },
+        attributes: ['id', 'title'],
+      });
+
+      if (!selectSurveys.length) {
+        return res.status(204).json({ message: '작성된 설문지가 없습니다.' });
+      }
+
+      const titleList = [];
+      for (const survey of selectSurveys) {
+        titleList.push({
+          surveyId: survey.id,
+          surveyTitle: survey.title,
+        });
+      }
+      const searchList = { surveys: titleList, title: title };
+      const resultList = surveyTitleSearch(searchList);
+      const len = resultList.surveys.length;
+      const tp = Math.ceil(len / pageLimit);
+
+      if (len == 0) {
+        return res.status(208).json({ message: '검색된 설문지가 없습니다.' });
+      }
+
+      const sortedList = [];
+      for (let i = 0; i < len && i < pageLimit; i++) {
+        const survey = await Survey.findOne({
+          where: { id: resultList.surveys[pageOffset + i] },
+          attributes: [
+            'id',
+            'title',
+            'open',
+            'mainImageUrl',
+            'createdAt',
+            'updatedAt',
+            'deadline',
+          ],
+        });
+
+        const answer = await Answer.findOne({
+          where: { userId: userId },
+          include: [
+            {
+              model: Question,
+              where: { surveyId: survey.id },
+            },
+          ],
+        });
+
+        const userCount = await Answer.count({
           distinct: true,
           col: 'userId',
           include: [
             {
               model: Question,
-              attributes: [],
               where: { surveyId: survey.id },
             },
           ],
         });
 
-        return {
-          surveyId: survey.id,
-          title: survey.title,
-          open: survey.open,
-          mainImageUrl: survey.mainImageUrl || null,
-          createdAt: survey.createdAt,
-          deadline: survey.deadline,
-          attendedCount: attendedCount,
-        };
-      }),
-    );
-
-    const totalCount = await Survey.count({ where: { userId: userId } });
-
-    res.json({
-      surveys: modifiedSurveys,
-      totalPages: Math.ceil(totalCount / pageLimit),
-    });
+        sortedList.push({
+          surveyId: survey.dataValues.id,
+          title: survey.dataValues.title,
+          open: survey.dataValues.open,
+          mainImageUrl: survey.dataValues.mainImageUrl,
+          createdAt: survey.dataValues.createdAt,
+          updatedAt: survey.dataValues.updatedAt,
+          deadline: survey.dataValues.deadline,
+          isAttended: !!answer,
+          attendCount: userCount,
+        });
+      }
+      res.status(200).json({ sortedList, totalPages: tp });
+    }
   } catch (error) {
     console.error(error);
     res.status(500).json({ message: '에러 발생', error: error.message });

diff --git a/backend/controller/surveyAnswered.js b/backend/controller/surveyAnswered.js
@@ -75,7 +75,12 @@ const surveyAnswered = async (req, res) => {
 
       // surveys를 응답으로 보내기
       res.json({
-        surveys: surveys.map((survey) => survey.dataValues),
+        surveys: surveys.map((survey) => { survey.dataValues.surveyId = survey.dataValues.id;
+          delete survey.dataValues.id;
+          return {
+            surveyId: survey.dataValues.surveyId,
+            ...survey.dataValues,
+          };}),
         totalPages,
       });
     } else {