ready to merge

center-for-threat-informed-defense · Jan 4, 2024 · dafc60b · dafc60b
1 parent 4bdd999
commit dafc60b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 28 deletions.
diff --git a/app/controllers/marking-definitions-controller.js b/app/controllers/marking-definitions-controller.js
@@ -96,7 +96,6 @@ exports.updateFull = async function(req, res) {
             return res.status(200).send(markingDefinition);
         }
     } catch (err) {
-        console.log(err);
         if (err.message === markingDefinitionsService.errors.cannotUpdateStaticObject) {
             console.log("error triggered");
             logger.warn('Unable to update marking definition, cannot update static object');

diff --git a/app/services/marking-definitions-service.js b/app/services/marking-definitions-service.js
@@ -9,22 +9,21 @@ const BaseService = require('./_base.service');
 const MarkingDefinitionRepository = require('../repository/marking-definition-repository');
 const { MissingParameterError, BadlyFormattedParameterError, DuplicateIdError } = require('../exceptions');
 
-const errors = {
-    missingParameter: 'Missing required parameter',
-    badlyFormattedParameter: 'Badly formatted parameter',
-    duplicateId: 'Duplicate id',
-    notFound: 'Document not found',
-    invalidQueryStringParameter: 'Invalid query string parameter',
-    cannotUpdateStaticObject: 'Cannot update static object'
-};
-exports.errors = errors;
-
 // NOTE: A marking definition does not support the modified or revoked properties!!
 
 class MarkingDefinitionsService extends BaseService {
 
+    errors = {
+        missingParameter: 'Missing required parameter',
+        badlyFormattedParameter: 'Badly formatted parameter',
+        duplicateId: 'Duplicate id',
+        notFound: 'Document not found',
+        invalidQueryStringParameter: 'Invalid query string parameter',
+        cannotUpdateStaticObject: 'Cannot update static object'
+    };
 
     createIsAsync = true;
+
     async create(data, options) {
     // This function handles two use cases:
     //   1. This is a completely new object. Create a new object and generate the stix.id if not already
@@ -82,23 +81,23 @@ class MarkingDefinitionsService extends BaseService {
             throw err;
         }
     }
-};
+}
 
 
     async updateFull(stixId, data, callback) {
 
         if (data?.workspace?.workflow?.state === 'static') {
             if (callback) {
-                return callback(new Error(errors.cannotUpdateStaticObject));
+                return callback(new Error(this.errors.cannotUpdateStaticObject));
             }
 
-            throw new Error(errors.cannotUpdateStaticObject);
+            throw new Error(this.errors.cannotUpdateStaticObject);
         }
 
         const newDoc = await super.updateFull(stixId, data, callback);
 
         return newDoc;
-};
+}
 
     async retrieveById(stixId, options, callback) {
         try {
@@ -139,14 +138,10 @@ class MarkingDefinitionsService extends BaseService {
         if (!stixId) {
             throw new MissingParameterError;
         }
-
-        try {
-            const markingDefinition = await MarkingDefinition.findOneAndRemove({ 'stix.id': stixId });
-            //Note: markingDefinition is null if not found
-            return markingDefinition;
-        } catch (err) {
-            throw err;
-        }
+
+        const markingDefinition = await this.repository.model.findOneAndRemove({ 'stix.id': stixId });
+        //Note: markingDefinition is null if not found
+        return markingDefinition;
 
     }
 

diff --git a/app/tests/api/marking-definitions/marking-definitions.spec.js b/app/tests/api/marking-definitions/marking-definitions.spec.js
@@ -1,5 +1,4 @@
 const request = require('supertest');
-const res = require('supertest');
 const { expect } = require('expect');
 
 const database = require('../../../lib/database-in-memory');
@@ -64,7 +63,7 @@ describe('Marking Definitions API', function () {
 
     it('POST /api/marking-definitions does not create an empty marking definition', async function () {
         const body = { };
-        const res = await request(app)
+        await request(app)
             .post('/api/marking-definitions')
             .send(body)
             .set('Accept', 'application/json')
@@ -115,7 +114,7 @@ describe('Marking Definitions API', function () {
     });
 
     it('GET /api/marking-definitions/:id should not return a marking definition when the id cannot be found', async function () {
-        const res = await request(app)
+        await request(app)
             .get('/api/marking-definitions/not-an-id')
             .set('Accept', 'application/json')
             .set('Cookie', `${ login.passportCookieName }=${ passportCookie.value }`)
@@ -169,7 +168,7 @@ describe('Marking Definitions API', function () {
 
     it('POST /api/marking-definitions does not create a marking definition with the same id', async function () {
         const body = markingDefinition1;
-        const res = await request(app)
+        await request(app)
             .post('/api/marking-definitions')
             .send(body)
             .set('Accept', 'application/json')
@@ -178,7 +177,7 @@ describe('Marking Definitions API', function () {
     });
 
     it('DELETE /api/marking-definitions deletes a marking definition', async function () {
-        const res = await request(app)
+        await request(app)
             .delete('/api/marking-definitions/' + markingDefinition1.stix.id)
             .set('Cookie', `${ login.passportCookieName }=${ passportCookie.value }`)
             .expect(204);