Merge pull request #359 from center-for-threat-informed-defense/280-a…

…dd-documentdb-interoperability 280 add documentdb interoperability
center-for-threat-informed-defense · Jan 13, 2025 · 7ee03dd · 7ee03dd
2 parents 1ddb53a + 7a98c93
commit 7ee03dd
Show file tree

Hide file tree

Showing 42 changed files with 4,200 additions and 3,907 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
diff --git a/app/lib/database-configuration.js b/app/lib/database-configuration.js
@@ -145,7 +145,6 @@ async function checkForInvalidEnterpriseCollectionId() {
     if (attackObject.stix.type === 'x-mitre-collection') {
       if (invalidIds.includes(attackObject.stix.id)) {
         attackObject.stix.id = validId;
-        // eslint-disable-next-line no-await-in-loop
         await attackObject.save();
         collectionUpdates += 1;
       }
@@ -160,7 +159,6 @@ async function checkForInvalidEnterpriseCollectionId() {
         }
       }
       if (attackObjectUpdated) {
-        // eslint-disable-next-line no-await-in-loop
         await attackObject.save();
         objectUpdates += 1;
       }
@@ -190,7 +188,6 @@ async function checkForInvalidEnterpriseCollectionId() {
     }
 
     if (collectionIndexUpdated) {
-      // eslint-disable-next-line no-await-in-loop
       await collectionIndex.save();
       collectionIndexUpdates += 1;
     }

diff --git a/app/lib/database-connection.js b/app/lib/database-connection.js
@@ -14,6 +14,9 @@ exports.initializeConnection = async function (options) {
 
   const mongoose = require('mongoose');
 
+  // Set `strictQuery` to `true` to omit unknown fields in queries.
+  mongoose.set('strictQuery', true);
+
   // Configure mongoose to use ES6 promises
   mongoose.Promise = global.Promise;
 

diff --git a/app/lib/database-in-memory.js b/app/lib/database-in-memory.js
@@ -11,6 +11,9 @@ exports.initializeConnection = async function () {
 
   const uri = mongod.getUri();
 
+  // Set `strictQuery` to `true` to omit unknown fields in queries.
+  mongoose.set('strictQuery', true);
+
   // Configure mongoose to use ES6 promises
   mongoose.Promise = global.Promise;
 
@@ -39,7 +42,6 @@ exports.clearDatabase = async function () {
 
   for (const key in collections) {
     const collection = collections[key];
-    // eslint-disable-next-line no-await-in-loop
     await collection.deleteMany();
   }
 };

diff --git a/app/lib/regex.js b/app/lib/regex.js
@@ -1,15 +1,17 @@
 'use strict';
 
+const logger = require('../lib/logger');
+
 exports.sanitizeRegex = function (expression) {
   // Compile the expression. If it's valid, return the expression. Otherwise, return an empty string.
   try {
     // Escapes all regex characters so they are treated like literal characters rather than special regex characters
-    // eslint-disable-next-line no-useless-escape
     expression = expression.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
     // eslint-disable-next-line no-new
     new RegExp(expression);
     return expression;
   } catch (err) {
+    logger.warn(err);
     return '';
   }
 };
diff --git a/app/repository/_abstract.repository.js b/app/repository/_abstract.repository.js
@@ -75,8 +75,8 @@ class AbstractRepository {
    * @param {*} modified The modification date for the document.
    * @returns {Object} The removed document.
    */
-  async findOneAndRemove(stixId, modified) {
-    throw new NotImplementedError(this.constructor.name, 'findOneAndRemove');
+  async findOneAndDelete(stixId, modified) {
+    throw new NotImplementedError(this.constructor.name, 'findOneAndDelete');
   }
 
   /**