Merge pull request #180 from osamhack2021/feature/frontend/#33

Bump develop from feature/frontend/#33

Author: ntcho

backend/InitDB.js

@@ -49,14 +49,15 @@ async function init() {
         serviceNumber: 'admin',
         password: 'admin',
         name: 'admin',
-        rank: '관리자',
+        rank: '대위',
         title: '관리자',
         status: 'admin',
         email: 'admin@osam.com',
         tel: {
             military: '0000',
             mobile: '010-0000-0000'
-        }
+        },
+        profileImageUrl: 'https://t1.daumcdn.net/liveboard/holapet/0e5f90af436e4c218343073164a5f657.JPG'
     };
     users.admin = await post('/user', admin);
 
@@ -68,7 +69,7 @@ async function init() {
 
     // Create group
     groups.osam = await post('/group', {
-        name: 'OSAM',
+        name: '11사단',
         path: '',
         admins: [users.admin._id]
     });
@@ -83,8 +84,8 @@ async function init() {
     let ntcho = {
         serviceNumber: 'ntcho',
         password: 'ntcho',
-        name: 'ntcho',
-        rank: '팀장',
+        name: '조나단',
+        rank: '상병',
         title: '팀장',
         status: 'active',
         email: 'ntcho@github.com',
@@ -102,17 +103,22 @@ async function init() {
     })).token;
 
     groups.handover = await post('/group', {
-        name: 'Handover',
+        name: '111대대',
         path: groups.osam.path,
         admins: [users.ntcho._id]
     });
 
+    // Update ntcho's group
+    users.ntcho = await post(`/user/${users.ntcho._id}`, {
+        group: groups.handover._id
+    }, 'PUT');
+
     /****** Create phjppo ******/
     let phjppo = {
         serviceNumber: 'phjppo',
         password: 'phjppo',
-        name: 'phjppo',
-        rank: '백엔드',
+        name: '박현준',
+        rank: '중사',
         title: '백엔드',
         status: 'active',
         email: 'phjppo@github.com',
@@ -130,7 +136,7 @@ async function init() {
     })).token;
 
     groups.backend = await post('/group', {
-        name: 'backend',
+        name: '인사과',
         path: groups.handover.path,
         admins: [users.phjppo._id]
     });
@@ -139,8 +145,8 @@ async function init() {
     let ahnavocado = {
         serviceNumber: 'ahnavocado',
         password: 'ahnavocado',
-        name: 'ahnavocado',
-        rank: '프론트',
+        name: '안수겸',
+        rank: '병장',
         title: '프론트',
         status: 'active',
         email: 'ahnavocado@github.com',
@@ -158,7 +164,7 @@ async function init() {
     })).token;
 
     groups.frontend = await post('/group', {
-        name: 'frontend',
+        name: '군수과',
         path: groups.handover.path,
         admins: [users.ahnavocado._id]
     });

backend/controllers/groupController.js

@@ -13,7 +13,7 @@ module.exports = {
             // Only allowed fields are Searchable
             for(let key of keys) {
                 if(!valids.includes(key))
-                    throw new BusinessError(`Invalid: ${key}로는 검색할 수 없습니다!`);
+                    throw new BusinessError(`Query invalid: ${key}로는 검색할 수 없습니다!`);
             }
 
             const result = await groupService.search(req.query);
@@ -31,7 +31,7 @@ module.exports = {
 
             const result = await groupService.read({ _id: group_id });
 
-            if(result === null) throw new NotFoundError(`NotFound: 검색결과가 없습니다.`);
+            if(result === null) throw new NotFoundError(`Group not found: 존재하지 않는 그룹입니다.`);
 
             res.status(200).send(result);
         } catch(err) {
@@ -64,10 +64,10 @@ module.exports = {
             const group = await groupService.read({ _id: group_id });
 
             // Invalid group_id
-            if(group === null) throw new NotFoundError(`NotFound: 검색결과가 없습니다.`);
+            if(group === null) throw new NotFoundError(`Group not found: 존재하지 않는 그룹입니다.`);
 
             // Admin check
-            if(!group.admins.some(admin => admin.equals(res.locals._id))) throw new ForbiddenError(`Forbidden: 그룹의 관리자만 수정할 수 있습니다.`);
+            if(!group.admins.some(admin => admin.equals(res.locals._id))) throw new ForbiddenError(`Access denied: 그룹의 관리자만 수정할 수 있습니다.`);
 
             await groupService.update(group_id, req.body);
 
@@ -84,7 +84,7 @@ module.exports = {
 
             let result = await groupService.delete(group_id);
 
-            if(result === null) throw new NotFoundError(`Not Found: 검색결과가 없습니다.`);
+            if(result === null) throw new NotFoundError(`Group not found: 존재하지 않는 그룹입니다.`);
 
             res.status(204).send();
         } catch(err) {

backend/controllers/itemController.js

@@ -16,7 +16,7 @@ module.exports = {
             // Only allowed fields are Searchable
             for(let key of keys) {
                 if(!valids.includes(key))
-                    throw new BusinessError(`Invalid: ${key}로는 검색할 수 없습니다!`);
+                    throw new BusinessError(`Query invalid: ${key}로는 검색할 수 없습니다!`);
             }            
 
             const result = await itemService.search(req.query);
@@ -50,12 +50,12 @@ module.exports = {
 
             const item = await itemService.read({ _id: item_id });
 
-            if(item === null) throw new NotFoundError(`NotFound: 검색결과가 없습니다.`);
+            if(item === null) throw new NotFoundError(`Item not found: 존재하지 않는 항목입니다.`);
 
             // Check session's read authority
             const user = await userService.findOne({ serviceNumber: res.locals.serviceNumber });
             if(!item.accessGroups.read.some(i => i.equals(user.group)))
-                throw new ForbiddenError(`Forbidden: 읽기 권한이 없습니다.`);
+                throw new ForbiddenError(`Access denied: 열람 권한이 없습니다.`);
 
             res.status(200).send(item);
         } catch(err) {
@@ -106,11 +106,11 @@ module.exports = {
 
             let item = await itemService.read({ _id: item_id }, { populate: false });
 
-            if(item === null) throw new NotFoundError(`Not Found: 검색 결과가 없습니다.`);
+            if(item === null) throw new NotFoundError(`Item not Found: 존재하지 않는 항목입니다.`);
 
             // Check session's edit authority
             if(!item.accessGroups.edit.some(i => i.equals(res.locals.group)))
-                throw new ForbiddenError(`Forbidden: 수정 권한이 없습니다.`);
+                throw new ForbiddenError(`Access denied: 수정 권한이 없습니다.`);
 
             // Append Contributor
             item = Object.assign(item, { contributors: [...item.contributors, res.locals._id] });
@@ -136,7 +136,7 @@ module.exports = {
             let item = await itemService.read({ _id: item_id }, { populate: false });
 
             if(item === null)
-                throw new NotFoundError(`Not Found: 검색 결과가 없습니다.`);
+                throw new NotFoundError(`Item not Found: 존재하지 않는 항목입니다.`);
 
             // Algolia
             await algolia.deleteObject(item_id);

backend/controllers/userController.js

@@ -1,5 +1,8 @@
 const userService = require('../services/userService.js');
 const authService = require('../services/authService.js');
+
+const { BusinessError } = require('../services/errors/BusinessError.js');
+
 module.exports = {
 
     search: async function(req, res) {
@@ -10,13 +13,13 @@ module.exports = {
          // Only allowed fields are Searchable
         for(let key of keys) {
             if(!valids.includes(key))
-                throw new BusinessError(`${key} 는 검색할 수는 없는 속성입니다.`);
+                throw new BusinessError(`Query invalid: ${key} 는 검색할 수는 없는 속성입니다.`);
         }
 
 
         const projection = {
-            _id: true, name: true, rank: true, status: true, profileImageUrl: 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, title: true
         };
 
         try {
@@ -31,8 +34,8 @@ module.exports = {
 
         let projection = {
             _id: true,serviceNumber:true, name: true, rank: true, title:true,
-            status: true, group: true, email: true, tel: true, profileImageUrl: true,
-            lastLogin: true, firseLogin:true, bookmarks: true, subscriptions: true
+            status: true, group: true, email: true, tel: true, lastLogin: true,
+            lastLogin: true, firseLogin:true, bookmarks: true, subscriptions: true, profileImageUrl: true
         };
 
         try {
@@ -71,7 +74,7 @@ module.exports = {
              // Only allowed fields are Searchable
             for(let key of keys) {
                 if(!valids.includes(key))
-                    throw new BusinessError(`${key} 는 User에 존재하지 않거나, 변경할 수 없는 속성입니다`);
+                    throw new BusinessError(`Query invalid: ${key} 는 User에 존재하지 않거나, 변경할 수 없는 속성입니다`);
             }
 
             await authService.editUserAuth(res.locals._id.toString(),req.params.id);