@natlibfi/melinda-rest-api-commons 2.3.1-alpha.7 → 2.3.2-alpha.10

package/dist/mongo.js

@@ -4,25 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _mongodb = require("mongodb");
-
 var _melindaBackendCommons = require("@natlibfi/melinda-backend-commons");
-
 var _melindaCommons = require("@natlibfi/melinda-commons");
-
 var _constants = require("./constants");
-
 var _utils = require("./utils.js");
-
 var _moment = _interopRequireDefault(require("moment"));
-
 var _httpStatus = _interopRequireDefault(require("http-status"));
-
 var _mongoSanitize = _interopRequireDefault(require("mongo-sanitize"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+/* eslint-disable max-lines */
 /**
 *
 * @licstart  The following is the entire license notice for the JavaScript code in this file.
@@ -50,6 +41,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 * for the JavaScript code in this file.
 *
 */
+
 //import isDeepStrictEqual from 'util';
 
 /* QueueItem:
@@ -80,9 +72,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   "modificationTime":"2020-01-01T00:00:01.000Z",
 }
 */
+
 async function _default(MONGO_URI, collection) {
-  const logger = (0, _melindaBackendCommons.createLogger)(); // Connect to mongo (MONGO)
+  const logger = (0, _melindaBackendCommons.createLogger)();
 
+  // Connect to mongo (MONGO)
   const client = await _mongodb.MongoClient.connect(MONGO_URI, {
     useNewUrlParser: true,
     useUnifiedTopology: true
@@ -112,7 +106,6 @@ async function _default(MONGO_URI, collection) {
     addBlobSize,
     setBlobSize
   };
-
   async function createPrio({
     correlationId,
     cataloger,
@@ -143,22 +136,21 @@ async function _default(MONGO_URI, collection) {
       creationTime: time,
       modificationTime: time
     };
-
     try {
       const result = await db.collection(collection).insertOne(newQueueItem);
-
       if (result.acknowledged) {
         logger.info(`New PRIO queue item for ${operation} ${correlationId} has been made in ${collection}`);
         return;
       }
-
       throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR);
     } catch (error) {
+      const errorMessage = error.payload || error.message || '';
       (0, _utils.logError)(error);
-      throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR);
+      throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);
     }
   }
 
+  // eslint-disable-next-line max-statements
   async function createBulk({
     correlationId,
     cataloger,
@@ -193,8 +185,9 @@ async function _default(MONGO_URI, collection) {
       errorStatus: '',
       creationTime: time,
       modificationTime: time
-    }; // eslint-disable-next-line functional/no-conditional-statement
+    };
 
+    // eslint-disable-next-line functional/no-conditional-statement
     if (stream) {
       try {
         // No await here, promises later
@@ -207,17 +200,16 @@ async function _default(MONGO_URI, collection) {
           }));
         });
       } catch (error) {
+        const errorMessage = error.payload || error.message || '';
         (0, _utils.logError)(error);
-        throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR);
+        throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);
       }
     }
-
-    logger.debug(`No stream`); // eslint-disable-next-line functional/no-conditional-statement
-
+    logger.debug(`No stream`);
+    // eslint-disable-next-line functional/no-conditional-statement
     if (!stream) {
       try {
         const result = await db.collection(collection).insertOne(newQueueItem);
-
         if (result.acknowledged) {
           logger.info(`New noStream BULK queue item for ${operation} ${correlationId} has been made in ${collection}`);
           return {
@@ -225,16 +217,16 @@ async function _default(MONGO_URI, collection) {
             queueItemState: _constants.QUEUE_ITEM_STATE.VALIDATOR.WAITING_FOR_RECORDS
           };
         }
-
         throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR);
       } catch (error) {
+        const errorMessage = error.payload || error.message || '';
         (0, _utils.logError)(error);
-        throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR);
+        throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);
       }
     }
-  } // Check state that the queueItem has not waited too long and set state
-
+  }
 
+  // Check state that the queueItem has not waited too long and set state
   async function checkAndSetState({
     correlationId,
     state,
@@ -246,7 +238,6 @@ async function _default(MONGO_URI, collection) {
     const timeOut = await checkTimeOut({
       correlationId
     });
-
     if (timeOut) {
       return setState({
         correlationId,
@@ -255,11 +246,10 @@ async function _default(MONGO_URI, collection) {
         errorStatus
       });
     }
-
     return false;
-  } // Check state that the queueItem has not waited too long and set state
-
+  }
 
+  // Check state that the queueItem has not waited too long and set state
   async function checkAndSetImportJobState({
     correlationId,
     operation,
@@ -275,7 +265,6 @@ async function _default(MONGO_URI, collection) {
       operation,
       importJobState
     });
-
     if (timeOut) {
       return setImportJobState({
         correlationId,
@@ -285,10 +274,8 @@ async function _default(MONGO_URI, collection) {
         errorStatus
       });
     }
-
     return false;
   }
-
   async function query(params, showParams = {}) {
     const {
       showOperations = 0,
@@ -313,7 +300,6 @@ async function _default(MONGO_URI, collection) {
     logger.debug(`Query result: ${result.length > 0 ? 'Found!' : 'Not found!'}`);
     return result;
   }
-
   async function queryById({
     correlationId,
     checkModTime = false
@@ -321,28 +307,25 @@ async function _default(MONGO_URI, collection) {
     const result = await db.collection(collection).findOne({
       correlationId
     });
-
     if (checkModTime) {
       const timeOut = await checkTimeOut({
         correlationId
       });
-
       if (timeOut) {
         return queryById({
           correlationId
         });
       }
-
       return result;
     }
-
     return result;
-  } // Check that if the item has waited too long
+  }
+
+  // Check that if the item has waited too long
   // If the last modification time for the queueItem is older than 1 minute
   // set state to ABORT and return false, otherwise return true
   // If the state is already ABORT or ERROR return false
 
-
   async function checkTimeOut({
     correlationId
   }) {
@@ -352,19 +335,17 @@ async function _default(MONGO_URI, collection) {
       importJobState
     } = await db.collection(collection).findOne({
       correlationId
-    }); // should we check for DONE too?
+    });
 
+    // should we check for DONE too?
     if ([_constants.QUEUE_ITEM_STATE.ABORT, _constants.QUEUE_ITEM_STATE.ERROR, _constants.QUEUE_ITEM_STATE.DONE].includes(oldState)) {
       logger.silly(`${correlationId} has already state: ${oldState}`);
       return false;
     }
-
     const timeoutTime = (0, _moment.default)(modificationTime).add(1, 'm');
     logger.silly(`timeOut @ ${timeoutTime}`);
-
     if (timeoutTime.isBefore()) {
       const finalImportJobStates = [_constants.IMPORT_JOB_STATE.ABORT, _constants.IMPORT_JOB_STATE.DONE, _constants.IMPORT_JOB_STATE.EMPTY, _constants.IMPORT_JOB_STATE.ERROR];
-
       if (!finalImportJobStates.includes(importJobState.CREATE)) {
         // eslint-disable-line
         await setImportJobState({
@@ -373,7 +354,6 @@ async function _default(MONGO_URI, collection) {
           importJobState: _constants.IMPORT_JOB_STATE.ABORT
         });
       }
-
       if (!finalImportJobStates.includes(importJobState.UPDATE)) {
         // eslint-disable-line
         await setImportJobState({
@@ -382,7 +362,6 @@ async function _default(MONGO_URI, collection) {
           importJobState: _constants.IMPORT_JOB_STATE.ABORT
         });
       }
-
       await setState({
         correlationId,
         state: _constants.QUEUE_ITEM_STATE.ABORT,
@@ -391,21 +370,17 @@ async function _default(MONGO_URI, collection) {
       });
       return false;
     }
-
     return true;
   }
-
   async function remove(params) {
     logger.silly(`${JSON.stringify(params)}`);
     logger.info(`Removing from Mongo (${collection}) id: ${params.correlationId}`);
     const clean = (0, _mongoSanitize.default)(params.correlationId);
     logger.silly(`mongo/remove: clean: ${JSON.stringify(clean)}`);
-
     try {
       //const metadataResult = await getFileMetadata({filename: clean});
       //logger.debug(`mongo/remove: metadataResult: ${JSON.stringify(metadataResult)}`);
       const noContent = await removeContent(params);
-
       if (noContent) {
         await db.collection(collection).deleteOne({
           correlationId: clean
@@ -421,15 +396,12 @@ async function _default(MONGO_URI, collection) {
           });
           return true;
         }
-
         logger.error(err.message);
         throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR, err.message);
       }
-
       throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR, err.message);
     }
   }
-
   async function readContent(correlationId) {
     logger.info(`Reading content from mongo for id: ${correlationId} in ${collection}`);
     const clean = (0, _mongoSanitize.default)(correlationId);
@@ -441,43 +413,36 @@ async function _default(MONGO_URI, collection) {
       const {
         operationSettings
       } = result;
-
       if (operationSettings.prio === false && operationSettings.noStream === false) {
         return {
           contentType: result.contentType,
           readStream: gridFSBucket.openDownloadStreamByName(clean)
         };
       }
-
       logger.debug(`OperationSetting for ${correlationId}: ${JSON.stringify(operationSettings)}`);
       throw new _melindaCommons.Error(_httpStatus.default.BAD_REQUEST, {
         message: `Content is only available for streamBulk jobs. ${correlationId} is not a streamBulk job.`
       });
     }
-
     throw new _melindaCommons.Error(_httpStatus.default.NOT_FOUND, {
       message: `Job ${correlationId} not found.`
     });
   }
-
   async function removeContent(params) {
     logger.info(`Removing content from mongo for id: ${params.correlationId} in ${collection}`);
     const clean = (0, _mongoSanitize.default)(params.correlationId);
     const result = await db.collection(collection).findOne({
       correlationId: clean
     }); // njsscan-ignore: node_nosqli_injection
-
     logger.silly(`mongo/removeContent: result ${JSON.stringify(result)}`);
-
     if (result) {
       await gridFSBucket.delete(clean);
       return true;
     }
-
     return true;
-  } // eslint-disable-next-line max-statements
-
+  }
 
+  // eslint-disable-next-line max-statements
   function getOne({
     queueItemState,
     importJobState = undefined
@@ -486,49 +451,51 @@ async function _default(MONGO_URI, collection) {
     const cleanQueueItemState = queueItemState ? {
       queueItemState: (0, _mongoSanitize.default)(queueItemState)
     } : undefined;
-
     try {
       // Just queueItemState
       if (queueItemState && importJobState === undefined) {
         logger.silly(`Checking DB ${collection} for just ${JSON.stringify(cleanQueueItemState.queueItemState)}`);
-        return db.collection(collection).findOne({ ...cleanQueueItemState
+        return db.collection(collection).findOne({
+          ...cleanQueueItemState
         });
-      } // importJobState
-
+      }
 
+      // importJobState
       if (importJobState && queueItemState === undefined) {
         logger.silly(`Checking DB ${collection} for ${JSON.stringify(importJobState)}`);
-        return db.collection(collection).findOne({ ...importJobState
+        return db.collection(collection).findOne({
+          ...importJobState
         });
-      } // importJobState and queueItemState
-
+      }
 
+      // importJobState and queueItemState
       if (importJobState && queueItemState) {
         logger.silly(`Checking DB ${collection} for ${queueItemState} and ${JSON.stringify(importJobState)}`);
-        return db.collection(collection).findOne({ ...cleanQueueItemState,
+        return db.collection(collection).findOne({
+          ...cleanQueueItemState,
           ...importJobState
         });
       }
-
       logger.debug(`getOne not working!`);
       throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR, 'Missing parameters, cannot get queueItem');
     } catch (error) {
+      const errorMessage = error.payload || error.message || '';
       (0, _utils.logError)(error);
+      throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);
     }
   }
-
   function getStream(correlationId) {
     logger.info(`Forming stream from mongo for ${correlationId} in ${collection}`);
     const clean = (0, _mongoSanitize.default)(correlationId);
-
     try {
       // Return content stream
       return gridFSBucket.openDownloadStreamByName(clean);
     } catch (error) {
+      const errorMessage = error.payload || error.message || '';
       (0, _utils.logError)(error);
+      throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);
     }
   }
-
   async function pushIds({
     correlationId,
     handledIds,
@@ -553,7 +520,6 @@ async function _default(MONGO_URI, collection) {
       }
     });
   }
-
   async function pushMessages({
     correlationId,
     messages,
@@ -576,7 +542,6 @@ async function _default(MONGO_URI, collection) {
       }
     });
   }
-
   function setState({
     correlationId,
     state,
@@ -588,20 +553,19 @@ async function _default(MONGO_URI, collection) {
     const stateInQueueItemStates = Object.values(_constants.QUEUE_ITEM_STATE).indexOf(state) > -1;
     const stateInQueueItemStatesValidator = Object.values(_constants.QUEUE_ITEM_STATE.VALIDATOR).indexOf(state) > -1;
     const stateInQueueItemStatesImporter = Object.values(_constants.QUEUE_ITEM_STATE.IMPORTER).indexOf(state) > -1;
-
     if (!stateInQueueItemStates && !stateInQueueItemStatesValidator && !stateInQueueItemStatesImporter) {
       throw new _melindaCommons.Error(_httpStatus.default.BAD_REQUEST, 'Trying to set invalid state');
     }
-
     const clean = (0, _mongoSanitize.default)(correlationId);
     const updateValues = {
       queueItemState: state,
       modificationTime: (0, _moment.default)().toDate(),
       errorMessage,
       errorStatus
-    }; // Do not update value that are undefined
-    // eslint-disable-next-line functional/immutable-data
+    };
 
+    // Do not update value that are undefined
+    // eslint-disable-next-line functional/immutable-data
     Object.keys(updateValues).forEach(key => updateValues[key] === undefined && delete updateValues[key]);
     return db.collection(collection).findOneAndUpdate({
       correlationId: clean
@@ -614,7 +578,6 @@ async function _default(MONGO_URI, collection) {
       returnNewDocument: true
     });
   }
-
   function setImportJobState({
     correlationId,
     operation,
@@ -624,15 +587,12 @@ async function _default(MONGO_URI, collection) {
     logger.info(`Setting queue-item importJobState: {${operation}: ${importJobState}} for ${correlationId}`);
     const cleanCorrelationId = (0, _mongoSanitize.default)(correlationId);
     const cleanImportJobState = (0, _mongoSanitize.default)(importJobState);
-
     if (!(operation in _constants.OPERATIONS)) {
       throw new _melindaCommons.Error('400', 'Invalid operation for import job state');
     }
-
     if (!(cleanImportJobState in _constants.IMPORT_JOB_STATE)) {
       throw new _melindaCommons.Error('400', 'Invalid import job state');
     }
-
     const newJobState = operation === _constants.OPERATIONS.CREATE ? {
       'importJobState.CREATE': cleanImportJobState
     } : {
@@ -641,7 +601,8 @@ async function _default(MONGO_URI, collection) {
     return db.collection(collection).findOneAndUpdate({
       correlationId: cleanCorrelationId
     }, {
-      $set: { ...newJobState,
+      $set: {
+        ...newJobState,
         modificationTime: (0, _moment.default)().toDate()
       }
     }, {
@@ -651,7 +612,6 @@ async function _default(MONGO_URI, collection) {
       returnNewDocument: true
     });
   }
-
   async function setOperation({
     correlationId,
     operation
@@ -678,7 +638,8 @@ async function _default(MONGO_URI, collection) {
       },
       returnNewDocument: true
     });
-    return result.ok; // logger.debug(JSON.stringify(result));
+    return result.ok;
+    // logger.debug(JSON.stringify(result));
   }
 
   async function setOperations({
@@ -710,7 +671,8 @@ async function _default(MONGO_URI, collection) {
       },
       returnNewDocument: true
     });
-    return result.ok; // logger.debug(JSON.stringify(result));
+    return result.ok;
+    // logger.debug(JSON.stringify(result));
   }
 
   async function addBlobSize({
@@ -736,7 +698,6 @@ async function _default(MONGO_URI, collection) {
     logger.verbose(`AddBlobSizeResult in mongo: ${JSON.stringify(result)}`);
     return result;
   }
-
   async function setBlobSize({
     correlationId,
     blobSize