lint fix

Author: Embotic-Wayne

api/main_endpoints/models/PermissionRequest.js

@@ -23,8 +23,7 @@ const PermissionRequestSchema = new Schema(
 );
 
 // Compound unique index prevents duplicate active requests per user+type
-PermissionRequestSchema.index({ userId: 1, type: 1 }, { unique: true, 
-  partialFilterExpression: { deletedAt: null }  });
+PermissionRequestSchema.index({ userId: 1, type: 1 }, { unique: true, partialFilterExpression: { deletedAt: null }});
 
 module.exports = mongoose.model('PermissionRequest', PermissionRequestSchema);
 

api/main_endpoints/routes/PermissionRequest.js

@@ -39,20 +39,20 @@ router.get('/get', async (req, res) => {
   try {
     const query = { deletedAt: null };
 
-    // If no userId provided, return all (officer+ only)
+    // If theres no userId, return all for officers and admins
     if (!queryUserId) {
       if (!isOfficer) {
         return res.sendStatus(UNAUTHORIZED);
       }
     } else {
-      // If userId provided, check permissions
+      // If there is a userId, check their perms
       if (!isOfficer && queryUserId !== decoded.token._id.toString()) {
         return res.sendStatus(FORBIDDEN);
       }
       query.userId = queryUserId;
     }
 
-    // Optional type filter
+    // If there is a type, filter by it
     if (type && Object.keys(PermissionRequestTypes).includes(type)) {
       query.type = type;
     }
@@ -79,7 +79,6 @@ router.post('/delete', async (req, res) => {
 
   try {
     let request;
-    
     // Officers or admins can delete any request by id
     if (decoded.token.accessLevel >= membershipState.OFFICER && _id) {
       request = await PermissionRequest.findOne({

test/api/PermissionRequest.js

@@ -63,20 +63,22 @@ describe('PermissionRequest', () => {
   });
 
   describe('/GET get', () => {
-    it('Should return 404 when request does not exist', async () => {
+    it('Should return empty array when request does not exist', async () => {
       const userId = new mongoose.Types.ObjectId();
       setTokenStatus(true, { _id: userId, email: 'test@test.com', accessLevel: 'MEMBER' });
-      const res = await test.sendGetRequest('/api/PermissionRequest/get?type=' + PermissionRequestTypes.LED_SIGN);
-      expect(res).to.have.status(NOT_FOUND);
+      const res = await test.sendGetRequest('/api/PermissionRequest/get?userId=' + userId + '&type=' + PermissionRequestTypes.LED_SIGN);
+      expect(res).to.have.status(OK);
+      expect(res.body).to.be.an('array').that.is.empty;
     });
 
     it('Should return permission request when it exists', async () => {
       const userId = new mongoose.Types.ObjectId();
       setTokenStatus(true, { _id: userId, email: 'test@test.com', accessLevel: 'MEMBER' });
       await new PermissionRequest({ userId, type: PermissionRequestTypes.LED_SIGN }).save();
-      const res = await test.sendGetRequest('/api/PermissionRequest/get?type=' + PermissionRequestTypes.LED_SIGN);
+      const res = await test.sendGetRequest('/api/PermissionRequest/get?userId=' + userId + '&type=' + PermissionRequestTypes.LED_SIGN);
       expect(res).to.have.status(OK);
-      expect(res.body.type).to.equal(PermissionRequestTypes.LED_SIGN);
+      expect(res.body).to.be.an('array').with.length(1);
+      expect(res.body[0].type).to.equal(PermissionRequestTypes.LED_SIGN);
     });
   });