Merge branch 'develop' into feature/frontend/#33

Author: ntcho

backend/controllers/authController.js

@@ -16,6 +16,7 @@ module.exports = {
                 group: true,
                 email:true,
                 tel: true,
+                profileImageUrl:true,
                 lastLogin:true,
                 firstLogin:true,
                 bookmarks:true,

backend/controllers/groupController.js

@@ -18,8 +18,6 @@ module.exports = {
 
             const result = await groupService.search(req.query);
 
-            // if(result.length < 1) throw new NotFoundError(`NotFound: 검색결과가 없습니다.`);
-
             res.status(200).send(result);
         } catch(err) {
             res.status(err.status || 500).send(err.message);

backend/controllers/itemController.js

@@ -21,8 +21,6 @@ module.exports = {
 
             const result = await itemService.search(req.query);
 
-            // if(result.length < 1) throw new NotFoundError(`Not Found: 검색결과가 없습니다.`);
-
             res.status(200).send(result);
 
         } catch(err) {
@@ -39,8 +37,6 @@ module.exports = {
                 filters: `status:"modified" AND NOT accessGroups.read:"${res.locals.group}"`
             });
 
-            // if(result.hits.length < 1) throw new NotFoundError(`NotFound: 검색결과가 없습니다.`);
-
             res.status(200).send(result.hits);
         } catch(err) {
             res.status(err.status || 500).send(err.message);

backend/controllers/userController.js

@@ -43,8 +43,8 @@ module.exports = {
 
             if(auth === 'general') {
                 projection = {
-                    _id: true, name: true, rank: true, status: true,
-                    group: true, email: true, tel: true, lastLogin: true
+                    _id: true, name: true, rank: true, status: true, 
+                    group: true, email: true, tel: true, lastLogin: true, profileImageUrl: true,
                 };
             }
 
@@ -69,7 +69,7 @@ module.exports = {
             const keys = Object.keys(req.body);
             const valids = ['password', 'name','name','rank',
                     'title','status','group','email','tel', 
-                    'lastLogin', 'firstLogin', 'bookmarks', 'subscriptions' ];
+                    'lastLogin', 'firstLogin', 'bookmarks', 'subscriptions' , 'profileImageUrl'];
 
              // Only allowed fields are Searchable
             for(let key of keys) {

backend/services/userService.js

@@ -21,7 +21,7 @@ module.exports = {
 			});
 
 		if(result === null) throw new NotFoundError('User not found: 존재하지 않는 사용자입니다.');
-
+    
 		return result;
 	},