Merge pull request #140 from osamhack2021/feature/backend/#139

Feature/backend/#139
osamhack2021 · Oct 5, 2021 · cfb7c43 · cfb7c43
2 parents ed3358d + f7be416
commit cfb7c43
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/backend/algolia/index.js b/backend/algolia/index.js
@@ -7,4 +7,14 @@ const ALGOLIA_INDEX_NAME = process.env.ALGOLIA_INDEX_NAME;
 const client = algoliasearch(ALGOLIA_APP_ID, ALGOLIA_ADMIN_API_KEY);
 const index = client.initIndex(ALGOLIA_INDEX_NAME);
 
+index.setSettings({
+    searchableAttributes: [
+        'title',
+        'type',
+        'tags',
+        'status',
+        'comments'
+    ]
+});
+
 module.exports = index;
diff --git a/backend/controllers/itemController.js b/backend/controllers/itemController.js
@@ -37,7 +37,9 @@ module.exports = {
         try {
             const query = req.params.query;
 
-            const result = await algolia.search(query);
+            const result = await algolia.search(query, {
+                filters: `status:"modified" AND NOT accessGroups.read:"${res.locals.group}"`
+            });
 
             if(result.hits.length < 1) throw new NotFoundError('Not Found');
 
@@ -75,6 +77,7 @@ module.exports = {
 
             const result = await itemService.create(body);
 
+            // Add object to Algolia
             let object = result.toObject();
             object.objectID = object._id;
             delete object._id;
@@ -97,14 +100,18 @@ module.exports = {
             if(item === null) throw new NotFoundError(`Not Found: No result is found for item_id: ${item_id}`);
 
             // Check session's edit authority
-            const user = await userService.searchByServiceNumber(res.locals.serviceNumber);
-            //if(!item.accessGroups.edit.some(i => i.equals(user.group)))
-               // throw new ForbiddenError(`Forbidden: You are not in editable group`);
+            if(!item.accessGroups.edit.some(i => i.equals(res.locals.group)))
+                throw new ForbiddenError(`Forbidden: You are not in editable group`);
 
             // Append Contributor
             item = Object.assign(item, { contributors: [...item.contributors, res.locals._id] });
 
-            await itemService.update(item, req.body);
+            const result = await itemService.update(item, req.body);
+
+            // Update object to Algolia
+            let object = result.toObject();
+            object.objectID = object._id;
+            delete object._id;
 
             res.status(204).send();
         } catch(err) {

diff --git a/backend/models/Item.js b/backend/models/Item.js
@@ -90,7 +90,7 @@ itemSchema.pre('save', function(next) {
     next();
 });
 
-itemSchema.pre('updateOne', function(next) {
+itemSchema.pre('findOneAndUpdate', function(next) {
     const data = this.getUpdate();
 
     let keys = ['contributors', 'history'];

diff --git a/backend/services/authService.js b/backend/services/authService.js
@@ -64,6 +64,7 @@ module.exports = {
 		const token = jwt.sign({
 			_id: loginUser._id,
 			serviceNumber: loginUser.serviceNumber,
+			group: loginUser.group,
 			status: loginUser.status,
 		}, SECRET_KEY, {
 			expiresIn: '1h'

diff --git a/backend/services/itemService.js b/backend/services/itemService.js
@@ -101,10 +101,12 @@ module.exports = {
             // Clear inspection
             payload.inspection = {};
 
-            // Update item
-            await Item.findOneAndUpdate(item, payload)
+            delete payload._id;
 
+            // Update item
+            const result = await Item.findOneAndUpdate({ _id: item._id }, payload);
             return result;
+
         } catch(err) {
             throw new BusinessError(err.message);
         }