@natlibfi/melinda-rest-api-commons 2.3.0-alpha.4 → 2.3.0-alpha.7

package/dist/mongoLog.js

@@ -61,13 +61,16 @@ async function _default(MONGO_URI) {
     addLogItem,
     query,
     queryById,
+    getListOfLogs,
+    protect,
     remove
   };
 
   async function addLogItem(logItem) {
     const time = (0, _moment.default)().toDate();
     const newLogItem = { ...logItem,
-      creationTime: time
+      creationTime: time,
+      protected: false
     };
 
     try {
@@ -113,17 +116,65 @@ async function _default(MONGO_URI) {
     return result;
   }
 
-  async function remove(params) {
-    logger.silly(`${JSON.stringify(params)}`);
-    logger.info(`Removing from Mongo (${collection}) correlationId: ${params.correlationId}`);
-    const clean = (0, _mongoSanitize.default)(params.correlationId);
-    logger.silly(`mongo/remove: clean: ${JSON.stringify(clean)}`);
+  async function getListOfLogs(logItemType = 'MERGE_LOG') {
+    const result = await db.collection(collection) // eslint-disable-line functional/immutable-data
+    .distinct('correlationId', {
+      logItemType
+    });
+    logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items!` : 'Not found!'}`);
+    return {
+      status: result.length > 0 ? _httpStatus.default.OK : _httpStatus.default.NOT_FOUND,
+      payload: result.length > 0 ? result : 'No logs found'
+    };
+  }
+
+  async function protect(correlationId, blobSequence) {
+    logger.info(`Removing from Mongo (${collection}) correlationId: ${correlationId}, blobSequence: ${blobSequence}`);
+    const cleanCorrelationId = (0, _mongoSanitize.default)(correlationId);
+    const cleanBlobSequence = (0, _mongoSanitize.default)(blobSequence);
+    const filter = blobSequence ? {
+      correlationId: cleanCorrelationId,
+      blobSequence: cleanBlobSequence
+    } : {
+      correlationId: cleanCorrelationId
+    };
 
     try {
-      await db.collection(collection).deleteMany({
-        correlationId: clean
+      const result = await db.collection(collection).updateMany(filter, {
+        $set: {
+          modificationTime: (0, _moment.default)().toDate(),
+          protect: {
+            $not: '$protect'
+          }
+        }
       });
-      return true;
+      return {
+        status: result.modifiedCount > 0 ? _httpStatus.default.OK : _httpStatus.default.NOT_FOUND,
+        payload: result.modifiedCount > 0 ? result : 'No logs found'
+      };
+    } catch (err) {
+      throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR, err.message);
+    }
+  }
+
+  async function remove(correlationId, force = false) {
+    logger.info(`Removing from Mongo (${collection}) correlationId: ${correlationId}`);
+    const clean = (0, _mongoSanitize.default)(correlationId);
+    const filter = force ? {
+      correlationId: clean
+    } : {
+      correlationId: clean,
+      protected: {
+        $ne: true
+      }
+    };
+
+    try {
+      const result = await db.collection(collection).deleteMany(filter);
+      return {
+        status: result.deletedCount > 0 ? _httpStatus.default.OK : _httpStatus.default.NOT_FOUND,
+        payload: result.deletedCount > 0 ? result : 'No logs found'
+      };
     } catch (err) {
       throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR, err.message);
     }

package/dist/mongoLog.js.map

@@ -1 +1 @@
-{"version":3,"file":"mongoLog.js","names":["MONGO_URI","logger","createLogger","client","MongoClient","connect","useNewUrlParser","useUnifiedTopology","db","collection","addLogItem","query","queryById","remove","logItem","time","moment","toDate","newLogItem","creationTime","result","insertOne","acknowledged","info","logItemType","correlationId","blobSequenceStart","blobSequenceEnd","ApiError","httpStatus","INTERNAL_SERVER_ERROR","error","logError","params","debug","JSON","stringify","limit","skip","rest","find","sort","blobSequence","parseInt","toArray","length","correlationIdString","silly","clean","sanitize","deleteMany","err","message"],"sources":["../src/mongoLog.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Shared modules for microservices of Melinda rest api batch import system\n*\n* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-rest-api-commons\n*\n* melinda-rest-api-commons program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Affero General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-rest-api-commons is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Affero General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport {MongoClient} from 'mongodb';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {logError} from './utils.js';\nimport moment from 'moment';\nimport httpStatus from 'http-status';\nimport sanitize from 'mongo-sanitize';\n\nexport default async function (MONGO_URI) {\n  const logger = createLogger();\n\n  // Connect to mongo (MONGO)\n  const client = await MongoClient.connect(MONGO_URI, {useNewUrlParser: true, useUnifiedTopology: true});\n  const db = client.db('rest-api');\n  const collection = 'logs';\n  return {addLogItem, query, queryById, remove};\n\n  async function addLogItem(logItem) {\n    const time = moment().toDate();\n    const newLogItem = {\n      ...logItem,\n      creationTime: time\n    };\n    try {\n      const result = await db.collection(collection).insertOne(newLogItem);\n      if (result.acknowledged) {\n        logger.info(`*** New ${logItem.logItemType} added for ${logItem.correlationId} items ${logItem.blobSequenceStart}-${logItem.blobSequenceEnd}. ***`);\n        return;\n      }\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n    } catch (error) {\n      logError(error);\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n    }\n  }\n\n  async function query(params) {\n    logger.debug(`Query params: ${JSON.stringify(params)}`);\n    const {limit = 5, skip = 0, ...rest} = params;\n    const result = await db.collection(collection) // eslint-disable-line functional/immutable-data\n      .find(rest)\n      .sort({blobSequence: 1})\n      .skip(parseInt(skip, 10))\n      .limit(parseInt(limit, 10))\n      .toArray();\n    logger.debug(result);\n    logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items! (skip: ${skip} limit: ${limit})` : 'Not found!'}`);\n    return result;\n  }\n\n  async function queryById(correlationIdString, skip = 0, limit = 1) {\n    logger.debug(`QueryById: ${correlationIdString}`);\n    const result = await db.collection(collection) // eslint-disable-line functional/immutable-data\n      .find({correlationId: correlationIdString})\n      .sort({blobSequence: 1})\n      .skip(parseInt(skip, 10))\n      .limit(parseInt(limit, 10))\n      .toArray();\n    logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items!` : 'Not found!'}`);\n    return result;\n  }\n\n  async function remove(params) {\n    logger.silly(`${JSON.stringify(params)}`);\n    logger.info(`Removing from Mongo (${collection}) correlationId: ${params.correlationId}`);\n    const clean = sanitize(params.correlationId);\n    logger.silly(`mongo/remove: clean: ${JSON.stringify(clean)}`);\n\n    try {\n      await db.collection(collection).deleteMany({correlationId: clean});\n      return true;\n    } catch (err) {\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, err.message);\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"mongoLog.js","names":["MONGO_URI","logger","createLogger","client","MongoClient","connect","useNewUrlParser","useUnifiedTopology","db","collection","addLogItem","query","queryById","getListOfLogs","protect","remove","logItem","time","moment","toDate","newLogItem","creationTime","protected","result","insertOne","acknowledged","info","logItemType","correlationId","blobSequenceStart","blobSequenceEnd","ApiError","httpStatus","INTERNAL_SERVER_ERROR","error","logError","params","debug","JSON","stringify","limit","skip","rest","find","sort","blobSequence","parseInt","toArray","length","correlationIdString","distinct","status","OK","NOT_FOUND","payload","cleanCorrelationId","sanitize","cleanBlobSequence","filter","updateMany","$set","modificationTime","$not","modifiedCount","err","message","force","clean","$ne","deleteMany","deletedCount"],"sources":["../src/mongoLog.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Shared modules for microservices of Melinda rest api batch import system\n*\n* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-rest-api-commons\n*\n* melinda-rest-api-commons program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Affero General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-rest-api-commons is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Affero General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport {MongoClient} from 'mongodb';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {logError} from './utils.js';\nimport moment from 'moment';\nimport httpStatus from 'http-status';\nimport sanitize from 'mongo-sanitize';\n\nexport default async function (MONGO_URI) {\n  const logger = createLogger();\n\n  // Connect to mongo (MONGO)\n  const client = await MongoClient.connect(MONGO_URI, {useNewUrlParser: true, useUnifiedTopology: true});\n  const db = client.db('rest-api');\n  const collection = 'logs';\n  return {addLogItem, query, queryById, getListOfLogs, protect, remove};\n\n  async function addLogItem(logItem) {\n    const time = moment().toDate();\n    const newLogItem = {\n      ...logItem,\n      creationTime: time,\n      protected: false\n    };\n    try {\n      const result = await db.collection(collection).insertOne(newLogItem);\n      if (result.acknowledged) {\n        logger.info(`*** New ${logItem.logItemType} added for ${logItem.correlationId} items ${logItem.blobSequenceStart}-${logItem.blobSequenceEnd}. ***`);\n        return;\n      }\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n    } catch (error) {\n      logError(error);\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n    }\n  }\n\n  async function query(params) {\n    logger.debug(`Query params: ${JSON.stringify(params)}`);\n    const {limit = 5, skip = 0, ...rest} = params;\n    const result = await db.collection(collection) // eslint-disable-line functional/immutable-data\n      .find(rest)\n      .sort({blobSequence: 1})\n      .skip(parseInt(skip, 10))\n      .limit(parseInt(limit, 10))\n      .toArray();\n    logger.debug(result);\n    logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items! (skip: ${skip} limit: ${limit})` : 'Not found!'}`);\n    return result;\n  }\n\n  async function queryById(correlationIdString, skip = 0, limit = 1) {\n    logger.debug(`QueryById: ${correlationIdString}`);\n    const result = await db.collection(collection) // eslint-disable-line functional/immutable-data\n      .find({correlationId: correlationIdString})\n      .sort({blobSequence: 1})\n      .skip(parseInt(skip, 10))\n      .limit(parseInt(limit, 10))\n      .toArray();\n    logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items!` : 'Not found!'}`);\n    return result;\n  }\n\n  async function getListOfLogs(logItemType = 'MERGE_LOG') {\n    const result = await db.collection(collection) // eslint-disable-line functional/immutable-data\n      .distinct('correlationId', {logItemType});\n    logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items!` : 'Not found!'}`);\n    return {status: result.length > 0 ? httpStatus.OK : httpStatus.NOT_FOUND, payload: result.length > 0 ? result : 'No logs found'};\n  }\n\n  async function protect(correlationId, blobSequence) {\n    logger.info(`Removing from Mongo (${collection}) correlationId: ${correlationId}, blobSequence: ${blobSequence}`);\n    const cleanCorrelationId = sanitize(correlationId);\n    const cleanBlobSequence = sanitize(blobSequence);\n    const filter = blobSequence ? {correlationId: cleanCorrelationId, blobSequence: cleanBlobSequence} : {correlationId: cleanCorrelationId};\n\n    try {\n      const result = await db.collection(collection).updateMany(\n        filter,\n        {\n          $set: {\n            modificationTime: moment().toDate(),\n            protect: {$not: '$protect'}\n          }\n        }\n      );\n      return {status: result.modifiedCount > 0 ? httpStatus.OK : httpStatus.NOT_FOUND, payload: result.modifiedCount > 0 ? result : 'No logs found'};\n    } catch (err) {\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, err.message);\n    }\n  }\n\n  async function remove(correlationId, force = false) {\n    logger.info(`Removing from Mongo (${collection}) correlationId: ${correlationId}`);\n    const clean = sanitize(correlationId);\n    const filter = force ? {correlationId: clean} : {correlationId: clean, protected: {$ne: true}};\n\n    try {\n      const result = await db.collection(collection).deleteMany(filter);\n      return {status: result.deletedCount > 0 ? httpStatus.OK : httpStatus.NOT_FOUND, payload: result.deletedCount > 0 ? result : 'No logs found'};\n    } catch (err) {\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, err.message);\n    }\n  }\n}\n"],"mappings":"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"}

package/dist/utils.js

@@ -106,7 +106,7 @@ function getRecordResponseStatusAndMessage(responseStatus, responsePayload) {
   const message = getMessageFromResponsePayload(responsePayload);
   logger.debug(`Response message: ${message}`); // Non-http statuses
 
-  if (['UPDATED', 'CREATED', 'INVALID', 'ERROR'].includes(responseStatus)) {
+  if (['UPDATED', 'CREATED', 'INVALID', 'ERROR', 'SKIPPED'].includes(responseStatus)) {
     return {
       status: responseStatus,
       message

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":["logger","createLogger","logError","err","ApiError","error","JSON","stringify","stack","undefined","createImportJobState","operation","state","queryImportJobState","IMPORT_JOB_STATE","Error","OPERATIONS","importJobStateWithOperation","importJobStateForQuery","createRecordResponseItem","responsePayload","responseStatus","recordMetadata","id","recordResponseStatusAndMessage","getRecordResponseStatusAndMessage","recordResponseItem","databaseId","debug","responseStatusName","httpStatus","message","getMessageFromResponsePayload","includes","status","possibleIds","ids","CONFLICT","test","duplicateIds","conflictIds","length","UNPROCESSABLE_ENTITY","unprocessableIds","response","NOT_FOUND","String","addRecordResponseItem","correlationId","mongoOperator","pushMessages","messages","messageField"],"sources":["../src/utils.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Shared modules for microservices of Melinda rest api batch import system\n*\n* Copyright (C) 2020-2021 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-rest-api-commons\n*\n* melinda-rest-api-commons program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Affero General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-rest-api-commons is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Affero General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {IMPORT_JOB_STATE, OPERATIONS} from './constants';\nimport httpStatus from 'http-status';\n\nconst logger = createLogger();\n\nexport function logError(err) {\n  if (err instanceof ApiError) {\n    logger.error(JSON.stringify(err));\n    return;\n  }\n\n  if (err === 'SIGINT') {\n    logger.error(err);\n    return;\n  }\n\n  logger.error(err.stack === undefined ? err : err.stack);\n}\n\nexport function createImportJobState(operation, state, queryImportJobState = false) {\n  if (!(state in IMPORT_JOB_STATE)) {\n    throw new Error('Invalid IMPORT_JOB_STATE');\n  }\n\n  if (!(operation in OPERATIONS)) {\n    throw new Error('Invalid operation');\n  }\n\n  if (queryImportJobState) {\n    const importJobStateWithOperation = `importJobState.${operation}`;\n    const importJobStateForQuery = {[importJobStateWithOperation]: state};\n\n    return importJobStateForQuery;\n  }\n\n  return {[operation]: state};\n}\n\nexport function createRecordResponseItem({responsePayload, responseStatus, recordMetadata, id}) {\n  const recordResponseStatusAndMessage = getRecordResponseStatusAndMessage(responseStatus, responsePayload);\n  const recordResponseItem = {\n    databaseId: id || '000000000',\n    recordMetadata: responsePayload.recordMetadata || recordMetadata || undefined,\n    ...recordResponseStatusAndMessage\n  };\n  return recordResponseItem;\n}\n\n// eslint-disable-next-line max-statements\nfunction getRecordResponseStatusAndMessage(responseStatus, responsePayload) {\n\n  logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);\n  const responseStatusName = httpStatus[`${responseStatus}_NAME`];\n  logger.debug(`Response status name: ${responseStatusName}`);\n\n  const message = getMessageFromResponsePayload(responsePayload);\n\n  logger.debug(`Response message: ${message}`);\n\n  // Non-http statuses\n  if (['UPDATED', 'CREATED', 'INVALID', 'ERROR'].includes(responseStatus)) {\n    return {status: responseStatus, message};\n  }\n\n  if (['UNKNOWN'].includes(responseStatus)) {\n    const possibleIds = responsePayload.ids || [];\n    return {status: responseStatus, message, possibleIds};\n  }\n\n  // Duplicates and other CONFLICT statuses\n  if ([httpStatus.CONFLICT, 'CONFLICT'].includes(responseStatus)) {\n    if ((/^Duplicates in database/u).test(message)) {\n      const duplicateIds = responsePayload.ids || [];\n      return {status: 'DUPLICATE', message, duplicateIds};\n    }\n    if ((/^MatchValidation for all/u).test(message)) {\n      const duplicateIds = responsePayload.ids || [];\n      return {status: 'CONFLICT', message, duplicateIds};\n    }\n    const conflictIds = responsePayload.ids || [];\n    if (conflictIds.length > 0) {\n      return {status: 'CONFLICT', message, conflictIds};\n    }\n    return {status: 'CONFLICT', message};\n  }\n\n  if ([httpStatus.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {\n    const unprocessableIds = responsePayload.ids || [];\n    const response = unprocessableIds.length > 0 ? {status: 'UNPROCESSABLE_ENTITY', message, unprocessableIds} : {status: 'UNPROCESSABLE_ENTITY', message};\n    return response;\n  }\n\n  if ([httpStatus.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {\n    return {status: 'NOT_FOUND', message};\n  }\n\n  // Otherwise\n  return {status: 'ERROR', message};\n}\n\nfunction getMessageFromResponsePayload(responsePayload) {\n  if (responsePayload.message) {\n    return responsePayload.message;\n  }\n  if (typeof responsePayload === 'string' || responsePayload instanceof String) {\n    return responsePayload;\n  }\n  return '';\n}\n\nexport async function addRecordResponseItem({recordResponseItem, correlationId, mongoOperator}) {\n  await mongoOperator.pushMessages({correlationId, messages: [recordResponseItem], messageField: 'records'});\n  return true;\n}\n\n"],"mappings":";;;;;;;;;;AA4BA;;AACA;;AACA;;AACA;;;;AA/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA,MAAMA,MAAM,GAAG,IAAAC,mCAAA,GAAf;;AAEO,SAASC,QAAT,CAAkBC,GAAlB,EAAuB;EAC5B,IAAIA,GAAG,YAAYC,qBAAnB,EAA6B;IAC3BJ,MAAM,CAACK,KAAP,CAAaC,IAAI,CAACC,SAAL,CAAeJ,GAAf,CAAb;IACA;EACD;;EAED,IAAIA,GAAG,KAAK,QAAZ,EAAsB;IACpBH,MAAM,CAACK,KAAP,CAAaF,GAAb;IACA;EACD;;EAEDH,MAAM,CAACK,KAAP,CAAaF,GAAG,CAACK,KAAJ,KAAcC,SAAd,GAA0BN,GAA1B,GAAgCA,GAAG,CAACK,KAAjD;AACD;;AAEM,SAASE,oBAAT,CAA8BC,SAA9B,EAAyCC,KAAzC,EAAgDC,mBAAmB,GAAG,KAAtE,EAA6E;EAClF,IAAI,EAAED,KAAK,IAAIE,2BAAX,CAAJ,EAAkC;IAChC,MAAM,IAAIC,KAAJ,CAAU,0BAAV,CAAN;EACD;;EAED,IAAI,EAAEJ,SAAS,IAAIK,qBAAf,CAAJ,EAAgC;IAC9B,MAAM,IAAID,KAAJ,CAAU,mBAAV,CAAN;EACD;;EAED,IAAIF,mBAAJ,EAAyB;IACvB,MAAMI,2BAA2B,GAAI,kBAAiBN,SAAU,EAAhE;IACA,MAAMO,sBAAsB,GAAG;MAAC,CAACD,2BAAD,GAA+BL;IAAhC,CAA/B;IAEA,OAAOM,sBAAP;EACD;;EAED,OAAO;IAAC,CAACP,SAAD,GAAaC;EAAd,CAAP;AACD;;AAEM,SAASO,wBAAT,CAAkC;EAACC,eAAD;EAAkBC,cAAlB;EAAkCC,cAAlC;EAAkDC;AAAlD,CAAlC,EAAyF;EAC9F,MAAMC,8BAA8B,GAAGC,iCAAiC,CAACJ,cAAD,EAAiBD,eAAjB,CAAxE;EACA,MAAMM,kBAAkB,GAAG;IACzBC,UAAU,EAAEJ,EAAE,IAAI,WADO;IAEzBD,cAAc,EAAEF,eAAe,CAACE,cAAhB,IAAkCA,cAAlC,IAAoDb,SAF3C;IAGzB,GAAGe;EAHsB,CAA3B;EAKA,OAAOE,kBAAP;AACD,C,CAED;;;AACA,SAASD,iCAAT,CAA2CJ,cAA3C,EAA2DD,eAA3D,EAA4E;EAE1EpB,MAAM,CAAC4B,KAAP,CAAc,oBAAmBP,cAAe,qBAAoBf,IAAI,CAACC,SAAL,CAAea,eAAf,CAAgC,EAApG;EACA,MAAMS,kBAAkB,GAAGC,mBAAA,CAAY,GAAET,cAAe,OAA7B,CAA3B;EACArB,MAAM,CAAC4B,KAAP,CAAc,yBAAwBC,kBAAmB,EAAzD;EAEA,MAAME,OAAO,GAAGC,6BAA6B,CAACZ,eAAD,CAA7C;EAEApB,MAAM,CAAC4B,KAAP,CAAc,qBAAoBG,OAAQ,EAA1C,EAR0E,CAU1E;;EACA,IAAI,CAAC,SAAD,EAAY,SAAZ,EAAuB,SAAvB,EAAkC,OAAlC,EAA2CE,QAA3C,CAAoDZ,cAApD,CAAJ,EAAyE;IACvE,OAAO;MAACa,MAAM,EAAEb,cAAT;MAAyBU;IAAzB,CAAP;EACD;;EAED,IAAI,CAAC,SAAD,EAAYE,QAAZ,CAAqBZ,cAArB,CAAJ,EAA0C;IACxC,MAAMc,WAAW,GAAGf,eAAe,CAACgB,GAAhB,IAAuB,EAA3C;IACA,OAAO;MAACF,MAAM,EAAEb,cAAT;MAAyBU,OAAzB;MAAkCI;IAAlC,CAAP;EACD,CAlByE,CAoB1E;;;EACA,IAAI,CAACL,mBAAA,CAAWO,QAAZ,EAAsB,UAAtB,EAAkCJ,QAAlC,CAA2CZ,cAA3C,CAAJ,EAAgE;IAC9D,IAAK,0BAAD,CAA6BiB,IAA7B,CAAkCP,OAAlC,CAAJ,EAAgD;MAC9C,MAAMQ,YAAY,GAAGnB,eAAe,CAACgB,GAAhB,IAAuB,EAA5C;MACA,OAAO;QAACF,MAAM,EAAE,WAAT;QAAsBH,OAAtB;QAA+BQ;MAA/B,CAAP;IACD;;IACD,IAAK,2BAAD,CAA8BD,IAA9B,CAAmCP,OAAnC,CAAJ,EAAiD;MAC/C,MAAMQ,YAAY,GAAGnB,eAAe,CAACgB,GAAhB,IAAuB,EAA5C;MACA,OAAO;QAACF,MAAM,EAAE,UAAT;QAAqBH,OAArB;QAA8BQ;MAA9B,CAAP;IACD;;IACD,MAAMC,WAAW,GAAGpB,eAAe,CAACgB,GAAhB,IAAuB,EAA3C;;IACA,IAAII,WAAW,CAACC,MAAZ,GAAqB,CAAzB,EAA4B;MAC1B,OAAO;QAACP,MAAM,EAAE,UAAT;QAAqBH,OAArB;QAA8BS;MAA9B,CAAP;IACD;;IACD,OAAO;MAACN,MAAM,EAAE,UAAT;MAAqBH;IAArB,CAAP;EACD;;EAED,IAAI,CAACD,mBAAA,CAAWY,oBAAZ,EAAkC,sBAAlC,EAA0DT,QAA1D,CAAmEZ,cAAnE,CAAJ,EAAwF;IACtF,MAAMsB,gBAAgB,GAAGvB,eAAe,CAACgB,GAAhB,IAAuB,EAAhD;IACA,MAAMQ,QAAQ,GAAGD,gBAAgB,CAACF,MAAjB,GAA0B,CAA1B,GAA8B;MAACP,MAAM,EAAE,sBAAT;MAAiCH,OAAjC;MAA0CY;IAA1C,CAA9B,GAA4F;MAACT,MAAM,EAAE,sBAAT;MAAiCH;IAAjC,CAA7G;IACA,OAAOa,QAAP;EACD;;EAED,IAAI,CAACd,mBAAA,CAAWe,SAAZ,EAAuB,WAAvB,EAAoCZ,QAApC,CAA6CZ,cAA7C,CAAJ,EAAkE;IAChE,OAAO;MAACa,MAAM,EAAE,WAAT;MAAsBH;IAAtB,CAAP;EACD,CA7CyE,CA+C1E;;;EACA,OAAO;IAACG,MAAM,EAAE,OAAT;IAAkBH;EAAlB,CAAP;AACD;;AAED,SAASC,6BAAT,CAAuCZ,eAAvC,EAAwD;EACtD,IAAIA,eAAe,CAACW,OAApB,EAA6B;IAC3B,OAAOX,eAAe,CAACW,OAAvB;EACD;;EACD,IAAI,OAAOX,eAAP,KAA2B,QAA3B,IAAuCA,eAAe,YAAY0B,MAAtE,EAA8E;IAC5E,OAAO1B,eAAP;EACD;;EACD,OAAO,EAAP;AACD;;AAEM,eAAe2B,qBAAf,CAAqC;EAACrB,kBAAD;EAAqBsB,aAArB;EAAoCC;AAApC,CAArC,EAAyF;EAC9F,MAAMA,aAAa,CAACC,YAAd,CAA2B;IAACF,aAAD;IAAgBG,QAAQ,EAAE,CAACzB,kBAAD,CAA1B;IAAgD0B,YAAY,EAAE;EAA9D,CAA3B,CAAN;EACA,OAAO,IAAP;AACD"}
+{"version":3,"file":"utils.js","names":["logger","createLogger","logError","err","ApiError","error","JSON","stringify","stack","undefined","createImportJobState","operation","state","queryImportJobState","IMPORT_JOB_STATE","Error","OPERATIONS","importJobStateWithOperation","importJobStateForQuery","createRecordResponseItem","responsePayload","responseStatus","recordMetadata","id","recordResponseStatusAndMessage","getRecordResponseStatusAndMessage","recordResponseItem","databaseId","debug","responseStatusName","httpStatus","message","getMessageFromResponsePayload","includes","status","possibleIds","ids","CONFLICT","test","duplicateIds","conflictIds","length","UNPROCESSABLE_ENTITY","unprocessableIds","response","NOT_FOUND","String","addRecordResponseItem","correlationId","mongoOperator","pushMessages","messages","messageField"],"sources":["../src/utils.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Shared modules for microservices of Melinda rest api batch import system\n*\n* Copyright (C) 2020-2021 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-rest-api-commons\n*\n* melinda-rest-api-commons program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Affero General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-rest-api-commons is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Affero General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {IMPORT_JOB_STATE, OPERATIONS} from './constants';\nimport httpStatus from 'http-status';\n\nconst logger = createLogger();\n\nexport function logError(err) {\n  if (err instanceof ApiError) {\n    logger.error(JSON.stringify(err));\n    return;\n  }\n\n  if (err === 'SIGINT') {\n    logger.error(err);\n    return;\n  }\n\n  logger.error(err.stack === undefined ? err : err.stack);\n}\n\nexport function createImportJobState(operation, state, queryImportJobState = false) {\n  if (!(state in IMPORT_JOB_STATE)) {\n    throw new Error('Invalid IMPORT_JOB_STATE');\n  }\n\n  if (!(operation in OPERATIONS)) {\n    throw new Error('Invalid operation');\n  }\n\n  if (queryImportJobState) {\n    const importJobStateWithOperation = `importJobState.${operation}`;\n    const importJobStateForQuery = {[importJobStateWithOperation]: state};\n\n    return importJobStateForQuery;\n  }\n\n  return {[operation]: state};\n}\n\nexport function createRecordResponseItem({responsePayload, responseStatus, recordMetadata, id}) {\n  const recordResponseStatusAndMessage = getRecordResponseStatusAndMessage(responseStatus, responsePayload);\n  const recordResponseItem = {\n    databaseId: id || '000000000',\n    recordMetadata: responsePayload.recordMetadata || recordMetadata || undefined,\n    ...recordResponseStatusAndMessage\n  };\n  return recordResponseItem;\n}\n\n// eslint-disable-next-line max-statements\nfunction getRecordResponseStatusAndMessage(responseStatus, responsePayload) {\n\n  logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);\n  const responseStatusName = httpStatus[`${responseStatus}_NAME`];\n  logger.debug(`Response status name: ${responseStatusName}`);\n\n  const message = getMessageFromResponsePayload(responsePayload);\n\n  logger.debug(`Response message: ${message}`);\n\n  // Non-http statuses\n  if (['UPDATED', 'CREATED', 'INVALID', 'ERROR', 'SKIPPED'].includes(responseStatus)) {\n    return {status: responseStatus, message};\n  }\n\n  if (['UNKNOWN'].includes(responseStatus)) {\n    const possibleIds = responsePayload.ids || [];\n    return {status: responseStatus, message, possibleIds};\n  }\n\n  // Duplicates and other CONFLICT statuses\n  if ([httpStatus.CONFLICT, 'CONFLICT'].includes(responseStatus)) {\n    if ((/^Duplicates in database/u).test(message)) {\n      const duplicateIds = responsePayload.ids || [];\n      return {status: 'DUPLICATE', message, duplicateIds};\n    }\n    if ((/^MatchValidation for all/u).test(message)) {\n      const duplicateIds = responsePayload.ids || [];\n      return {status: 'CONFLICT', message, duplicateIds};\n    }\n    const conflictIds = responsePayload.ids || [];\n    if (conflictIds.length > 0) {\n      return {status: 'CONFLICT', message, conflictIds};\n    }\n    return {status: 'CONFLICT', message};\n  }\n\n  if ([httpStatus.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {\n    const unprocessableIds = responsePayload.ids || [];\n    const response = unprocessableIds.length > 0 ? {status: 'UNPROCESSABLE_ENTITY', message, unprocessableIds} : {status: 'UNPROCESSABLE_ENTITY', message};\n    return response;\n  }\n\n  if ([httpStatus.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {\n    return {status: 'NOT_FOUND', message};\n  }\n\n  // Otherwise\n  return {status: 'ERROR', message};\n}\n\nfunction getMessageFromResponsePayload(responsePayload) {\n  if (responsePayload.message) {\n    return responsePayload.message;\n  }\n  if (typeof responsePayload === 'string' || responsePayload instanceof String) {\n    return responsePayload;\n  }\n  return '';\n}\n\nexport async function addRecordResponseItem({recordResponseItem, correlationId, mongoOperator}) {\n  await mongoOperator.pushMessages({correlationId, messages: [recordResponseItem], messageField: 'records'});\n  return true;\n}\n\n"],"mappings":"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"}

package/package.json

@@ -14,7 +14,7 @@
 		"url": "git@github.com:natlibfi/melinda-rest-api-commons.git"
 	},
 	"license": "AGPL-3.0+",
-	"version": "2.3.0-alpha.4",
+	"version": "2.3.0-alpha.7",
 	"main": "./dist/index.js",
 	"engines": {
 		"node": ">=14"
@@ -46,11 +46,11 @@
 		"mongodb": "^4.6.0"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.17.10",
-		"@babel/core": "^7.17.12",
-		"@babel/eslint-parser": "^7.17.0",
+		"@babel/cli": "^7.18.10",
+		"@babel/core": "^7.18.13",
+		"@babel/eslint-parser": "^7.18.9",
 		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-		"@babel/preset-env": "^7.17.12",
+		"@babel/preset-env": "^7.18.10",
 		"@natlibfi/eslint-config-melinda-backend": "^2.0.0",
 		"@natlibfi/fixura": "^2.2.1",
 		"babel-plugin-dynamic-import-node": "^2.3.3",
@@ -58,9 +58,9 @@
 		"babel-plugin-rewire": "^1.2.0",
 		"chai": "^4.3.6",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.15.0",
+		"eslint": "^8.23.0",
 		"mocha": "^10.0.0",
-		"nodemon": "^2.0.16",
+		"nodemon": "^2.0.19",
 		"nyc": "^15.1.0"
 	},
 	"eslintConfig": {