id 검색 완료

Author: jujube0

controller/userController.js

@@ -158,5 +158,28 @@ module.exports = {
             return res.status(code.INTERNAL_SERVER_ERROR).send(util.fail(code.INTERNAL_SERVER_ERROR, message.INTERNAL_SERVER_ERROR));
         }
     }, 
+    // 아이디 검색하기
+    getIdSearch: async (req, res) => {
+        try {
+            let {query, range} = req.query;
+
+            const user_id = req.decoded.id;
+
+            if (! query) {
+                return res.status(code.BAD_REQUEST).send(util.fail(code.BAD_REQUEST, message.NULL_VALUE));
+            }
+            if (! range) {
+                range = 'all';
+            }
+            if (range != 'all' && range != 'follower' && range != 'followee') {
+                return res.status(code.BAD_REQUEST).send(util.fail(code.BAD_REQUEST, message.OUT_OF_VALUE));
+            }
+            const user = await userService.idSearch(query, range, user_id);
+            return res.status(code.OK).send(util.success(code.OK, message.SEARCH_ID_SUCCESS, user));
+        } catch (err) {
+            console.error(err);
+            return res.status(code.INTERNAL_SERVER_ERROR).send(util.fail(code.INTERNAL_SERVER_ERROR, message.INTERNAL_SERVER_ERROR));
+        }
+    }
 
 }

middleware/authUtil.js

@@ -24,7 +24,10 @@ const authUtil = {
             return res.status(statusCode.UNAUTHORIZED).send(util.fail(statusCode.UNAUTHORIZED, responseMessage.INVALID_TOKEN));
         }
         req.decoded = user;
-        userService.updateVisit(user.id);
+        const isValid = userService.updateVisit(user.id);
+        if (! isValid) {
+            return res.status(statusCode.UNAUTHORIZED).send(util.fail(statusCode.UNAUTHORIZED, responseMessage.INVALID_TOKEN));
+        }
         next();
     }
 }

modules/responseMessage.js

@@ -106,7 +106,7 @@ module.exports = {
     UPDATE_MY_PROFILE_IMG_SUCCESS: "내 프로필 사진 변경 성공",
 
     /* 검색 */
-    SEARCH_ID_SUCCESS: "전체 아이디 검색 성공",
+    SEARCH_ID_SUCCESS: "아이디 검색 성공",
     NO_USER_NICKNAME: "검색 결과가 없습니다",
 
     /* 페이징 */

routes/users/index.js

@@ -7,5 +7,6 @@ const authUtil = require('../../middleware/authUtil');
 router.post('/signup', upload.single('image'), userController.signup);
 router.post('/signin', userController.signin);
 router.get('/activities', authUtil.checkToken, userController.getActivity);
+router.get('/search', authUtil.checkToken, userController.getIdSearch)
 
 module.exports = router;

service/userService.js

@@ -1,4 +1,4 @@
-const { User, Answer, Question } = require('../models');
+const { User, Answer, Question, Follow } = require('../models');
 const message = require('../modules/responseMessage');
 const crypto = require('crypto');
 const moment = require('moment');
@@ -135,6 +135,10 @@ module.exports = {
         try {
             const today = await getTodayDatesOnly();
             const user = await User.findByPk(user_id);
+            // user 가 없는 경우 경고 
+            if (! user) {
+                return false;
+            }
             let { last_visit, continued_visit } = user;
             last_visit = new Date(last_visit);
 
@@ -157,7 +161,7 @@ module.exports = {
                     }
                 }
             );
-            return changedNum;
+            return true;
         } catch (err) {
             throw err;
         }
@@ -197,17 +201,72 @@ module.exports = {
         }
     },
     makeActivityPagination : async (activities, page) => {
-        // 페이지 총 수
-        const page_len = parseInt(activities.length / 20) + 1;
-
-        const idx_start = 0 + (page - 1) * 20;
-        const idx_end = idx_start + 19;
-
-        // 페이지네이션
-        activities = activities.filter((item, idx) => {
-            return (idx >= idx_start && idx <= idx_end);
-        })
-        return {page_len, activities}
+        try {
+            // 페이지 총 수
+            const page_len = parseInt(activities.length / 20) + 1;
+    
+            const idx_start = 0 + (page - 1) * 20;
+            const idx_end = idx_start + 19;
+    
+            // 페이지네이션
+            activities = activities.filter((item, idx) => {
+                return (idx >= idx_start && idx <= idx_end);
+            })
+            return {page_len, activities}
+        } catch (err) {
+            throw err;
+        }
    },
+   idSearch: async (query, range, user_id) => {
+       try {
+           const user = await User.findOne({
+               where : {
+                   nickname: query,
+               },
+               attributes: ['id', 'nickname', 'profile_img'],
+               raw: true,
+           });
+           // 검색결과 없으면 null 반환
+           if (! user) {
+               return null;
+           }
+           // 팔로워 검색이면 내 팔로워가 맞는지 확인하기
+           if (range == 'follower') {
+               const isFollower = await Follow.findOne({
+                   where : {
+                       follower_id: user.id,
+                       followed_id: user_id,
+                   }
+               });
+               // 팔로워 아니면 Null 반환
+               if (! isFollower) {
+                return null;
+               }
+           } else if (range == 'followee') {
+               const isFollowee = await Follow.findOne({
+                    where : {
+                        followed_id: user.id,
+                        follower_id: user_id,
+                    }
+                });
+                // 팔로이 아니면 null 반환
+                if (! isFollowee) {
+                    return null;
+                }
+           }
+           // user 객체 있으면 팔로우 했는 지 확인
+           const is_followed = await Follow.findOne({
+                where : {
+                    followed_id : user.id,
+                    follower_id : user_id,
+                }
+            });
+            user.is_followed = Boolean(is_followed);
+        
+           return user;
+       } catch (err) {
+           throw err;
+       }
+   }
 
 }