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

package/dist/utils.js

@@ -4,20 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addRecordResponseItem = addRecordResponseItem;
+exports.addRecordResponseItems = addRecordResponseItems;
 exports.createImportJobState = createImportJobState;
 exports.createRecordResponseItem = createRecordResponseItem;
 exports.logError = logError;
-
 var _melindaBackendCommons = require("@natlibfi/melinda-backend-commons");
-
 var _melindaCommons = require("@natlibfi/melinda-commons");
-
 var _constants = require("./constants");
-
 var _httpStatus = _interopRequireDefault(require("http-status"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
 *
 * @licstart  The following is the entire license notice for the JavaScript code in this file.
@@ -45,31 +40,26 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 * for the JavaScript code in this file.
 *
 */
-const logger = (0, _melindaBackendCommons.createLogger)();
 
+const logger = (0, _melindaBackendCommons.createLogger)();
 function logError(err) {
   if (err instanceof _melindaCommons.Error) {
     logger.error(JSON.stringify(err));
     return;
   }
-
   if (err === 'SIGINT') {
     logger.error(err);
     return;
   }
-
   logger.error(err.stack === undefined ? err : err.stack);
 }
-
 function createImportJobState(operation, state, queryImportJobState = false) {
   if (!(state in _constants.IMPORT_JOB_STATE)) {
     throw new Error('Invalid IMPORT_JOB_STATE');
   }
-
   if (!(operation in _constants.OPERATIONS)) {
     throw new Error('Invalid operation');
   }
-
   if (queryImportJobState) {
     const importJobStateWithOperation = `importJobState.${operation}`;
     const importJobStateForQuery = {
@@ -77,12 +67,10 @@ function createImportJobState(operation, state, queryImportJobState = false) {
     };
     return importJobStateForQuery;
   }
-
   return {
     [operation]: state
   };
 }
-
 function createRecordResponseItem({
   responsePayload,
   responseStatus,
@@ -96,19 +84,22 @@ function createRecordResponseItem({
     ...recordResponseStatusAndMessage
   };
   return recordResponseItem;
-} // eslint-disable-next-line max-statements
-
+}
 
+// eslint-disable-next-line max-statements
 function getRecordResponseStatusAndMessage(responseStatus, responsePayload, id) {
-  logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`); //const responseStatusName = httpStatus[`${responseStatus}_NAME`];
+  logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);
+  //const responseStatusName = httpStatus[`${responseStatus}_NAME`];
   //logger.debug(`Response status name: ${responseStatusName}`);
 
   const message = getMessageFromResponsePayload(responsePayload);
   const ids = responsePayload.ids || [];
-  logger.debug(`Response message: ${message}`); // We map responseStatus here for a wider recordStatus and more detailed detailedRecordStatus
+  logger.debug(`Response message: ${message}`);
+
+  // We map responseStatus here for a wider recordStatus and more detailed detailedRecordStatus
   // recordStatus corresponds to RECORD_IMPORT_STATEs used in https://github.com/NatLibFi/melinda-record-import-commons-js
-  // Non-http statuses
 
+  // Non-http statuses
   if (['UPDATED', 'CREATED', 'INVALID', 'ERROR', 'SKIPPED'].includes(responseStatus)) {
     return {
       recordStatus: responseStatus,
@@ -116,7 +107,6 @@ function getRecordResponseStatusAndMessage(responseStatus, responsePayload, id)
       message
     };
   }
-
   if (['UNKNOWN'].includes(responseStatus)) {
     return {
       recordStatus: 'ERROR',
@@ -124,9 +114,9 @@ function getRecordResponseStatusAndMessage(responseStatus, responsePayload, id)
       message,
       ids
     };
-  } // Duplicates and other CONFLICT statuses
-
+  }
 
+  // Duplicates and other CONFLICT statuses
   if ([_httpStatus.default.CONFLICT, 'CONFLICT'].includes(responseStatus)) {
     if (/^Duplicates in database/u.test(message)) {
       return {
@@ -136,7 +126,6 @@ function getRecordResponseStatusAndMessage(responseStatus, responsePayload, id)
         ids
       };
     }
-
     if (/^MatchValidation for all/u.test(message)) {
       return {
         recordStatus: 'ERROR',
@@ -144,9 +133,9 @@ function getRecordResponseStatusAndMessage(responseStatus, responsePayload, id)
         message,
         ids
       };
-    } // Use ids only if there are more than one id or the id in payload does not match databaseId
-
+    }
 
+    // Use ids only if there are more than one id or the id in payload does not match databaseId
     if (ids.length > 1 || ids[0] !== id) {
       return {
         recordStatus: 'ERROR',
@@ -155,14 +144,12 @@ function getRecordResponseStatusAndMessage(responseStatus, responsePayload, id)
         ids
       };
     }
-
     return {
       recordStatus: 'ERROR',
       detailedRecordStatus: 'CONFLICT',
       message
     };
   }
-
   if ([_httpStatus.default.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {
     if (ids.length > 1 || ids[0] !== id) {
       return {
@@ -172,42 +159,36 @@ function getRecordResponseStatusAndMessage(responseStatus, responsePayload, id)
         ids
       };
     }
-
     return {
       recordStatus: 'INVALID',
       detailedRecordStatus: 'UNPROCESSABLE_ENTITY',
       message
     };
   }
-
   if ([_httpStatus.default.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {
     return {
       recordStatus: 'ERROR',
       detailedRecordStatus: 'NOT_FOUND',
       message
     };
-  } // Otherwise
-
+  }
 
+  // Otherwise
   return {
     recordStatus: 'ERROR',
     detailedRecordStatus: responseStatus,
     message
   };
 }
-
 function getMessageFromResponsePayload(responsePayload) {
   if (responsePayload.message) {
     return responsePayload.message;
   }
-
   if (typeof responsePayload === 'string' || responsePayload instanceof String) {
     return responsePayload;
   }
-
   return '';
 }
-
 async function addRecordResponseItem({
   recordResponseItem,
   correlationId,
@@ -220,4 +201,21 @@ async function addRecordResponseItem({
   });
   return true;
 }
+
+// Use addRecordResponseItems to add several recordResponseItems in one mongo operation to avoid writeconflicts
+async function addRecordResponseItems({
+  recordResponseItems,
+  correlationId,
+  mongoOperator
+}) {
+  if (!Array.isArray(recordResponseItems)) {
+    throw new Error('RecordResponseItems is not an array!');
+  }
+  await mongoOperator.pushMessages({
+    correlationId,
+    messages: recordResponseItems,
+    messageField: 'records'
+  });
+  return true;
+}
 //# sourceMappingURL=utils.js.map

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","message","getMessageFromResponsePayload","ids","includes","recordStatus","detailedRecordStatus","httpStatus","CONFLICT","test","length","UNPROCESSABLE_ENTITY","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, id);\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, id) {\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  const ids = responsePayload.ids || [];\n\n  logger.debug(`Response message: ${message}`);\n\n  // We map responseStatus here for a wider recordStatus and more detailed detailedRecordStatus\n  // recordStatus corresponds to RECORD_IMPORT_STATEs used in https://github.com/NatLibFi/melinda-record-import-commons-js\n\n  // Non-http statuses\n  if (['UPDATED', 'CREATED', 'INVALID', 'ERROR', 'SKIPPED'].includes(responseStatus)) {\n    return {recordStatus: responseStatus, detailedRecordStatus: responseStatus, message};\n  }\n\n  if (['UNKNOWN'].includes(responseStatus)) {\n    return {recordStatus: 'ERROR', detailedRecordStatus: responseStatus, message, ids};\n  }\n\n  // Duplicates and other CONFLICT statuses\n  if ([httpStatus.CONFLICT, 'CONFLICT'].includes(responseStatus)) {\n    if ((/^Duplicates in database/u).test(message)) {\n      return {recordStatus: 'DUPLICATE', detailedRecordStatus: 'DUPLICATE', message, ids};\n    }\n    if ((/^MatchValidation for all/u).test(message)) {\n      return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message, ids};\n    }\n\n    // Use ids only if there are more than one id or the id in payload does not match databaseId\n    if (ids.length > 1 || ids[0] !== id) {\n      return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message, ids};\n    }\n    return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message};\n  }\n\n  if ([httpStatus.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {\n    if (ids.length > 1 || ids[0] !== id) {\n      return {recordStatus: 'INVALID', detailedRecordStatus: 'UNPROCESSABLE_ENTITY', message, ids};\n    }\n    return {recordStatus: 'INVALID', detailedRecordStatus: 'UNPROCESSABLE_ENTITY', message};\n  }\n\n  if ([httpStatus.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {\n    return {recordStatus: 'ERROR', detailedRecordStatus: 'NOT_FOUND', message};\n  }\n\n  // Otherwise\n  return {recordStatus: 'ERROR', detailedRecordStatus: responseStatus, 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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"}
+{"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","message","getMessageFromResponsePayload","ids","includes","recordStatus","detailedRecordStatus","httpStatus","CONFLICT","test","length","UNPROCESSABLE_ENTITY","NOT_FOUND","String","addRecordResponseItem","correlationId","mongoOperator","pushMessages","messages","messageField","addRecordResponseItems","recordResponseItems","Array","isArray"],"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, id);\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, id) {\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  const ids = responsePayload.ids || [];\n\n  logger.debug(`Response message: ${message}`);\n\n  // We map responseStatus here for a wider recordStatus and more detailed detailedRecordStatus\n  // recordStatus corresponds to RECORD_IMPORT_STATEs used in https://github.com/NatLibFi/melinda-record-import-commons-js\n\n  // Non-http statuses\n  if (['UPDATED', 'CREATED', 'INVALID', 'ERROR', 'SKIPPED'].includes(responseStatus)) {\n    return {recordStatus: responseStatus, detailedRecordStatus: responseStatus, message};\n  }\n\n  if (['UNKNOWN'].includes(responseStatus)) {\n    return {recordStatus: 'ERROR', detailedRecordStatus: responseStatus, message, ids};\n  }\n\n  // Duplicates and other CONFLICT statuses\n  if ([httpStatus.CONFLICT, 'CONFLICT'].includes(responseStatus)) {\n    if ((/^Duplicates in database/u).test(message)) {\n      return {recordStatus: 'DUPLICATE', detailedRecordStatus: 'DUPLICATE', message, ids};\n    }\n    if ((/^MatchValidation for all/u).test(message)) {\n      return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message, ids};\n    }\n\n    // Use ids only if there are more than one id or the id in payload does not match databaseId\n    if (ids.length > 1 || ids[0] !== id) {\n      return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message, ids};\n    }\n    return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message};\n  }\n\n  if ([httpStatus.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {\n    if (ids.length > 1 || ids[0] !== id) {\n      return {recordStatus: 'INVALID', detailedRecordStatus: 'UNPROCESSABLE_ENTITY', message, ids};\n    }\n    return {recordStatus: 'INVALID', detailedRecordStatus: 'UNPROCESSABLE_ENTITY', message};\n  }\n\n  if ([httpStatus.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {\n    return {recordStatus: 'ERROR', detailedRecordStatus: 'NOT_FOUND', message};\n  }\n\n  // Otherwise\n  return {recordStatus: 'ERROR', detailedRecordStatus: responseStatus, 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// Use addRecordResponseItems to add several recordResponseItems in one mongo operation to avoid writeconflicts\nexport async function addRecordResponseItems({recordResponseItems, correlationId, mongoOperator}) {\n  if (!Array.isArray(recordResponseItems)) {\n    throw new Error('RecordResponseItems is not an array!');\n  }\n  await mongoOperator.pushMessages({correlationId, messages: recordResponseItems, messageField: 'records'});\n  return true;\n}\n\n"],"mappings":"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"}

package/package.json

@@ -1,118 +1,124 @@
 {
-	"name": "@natlibfi/melinda-rest-api-commons",
-	"description": "Shared modules for microservices of Melinda rest api import system",
-	"author": {
-		"name": "The National Library of Finland"
-	},
-	"keywords": [],
-	"homepage": "https://github.com/natlibfi/melinda-rest-api-commons",
-	"bugs": {
-		"url": "https://github.com/natlibfi/melinda-rest-api-commons/issues"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git@github.com:natlibfi/melinda-rest-api-commons.git"
-	},
-	"license": "AGPL-3.0+",
-	"version": "2.3.2-alpha.1",
-	"main": "./dist/index.js",
-	"engines": {
-		"node": ">=14"
-	},
-	"publishConfig": {
-		"access": "public"
-	},
-	"scripts": {
-		"prepare": "npm run build",
-		"lint": "eslint ./src",
-		"lint:dev": "eslint ./src --fix",
-		"test": "npm run lint && npm run test:base -- src/**/*.spec.js",
-		"test:dev": "npm run lint:dev && npm run test:base -- src/**/*.spec.js",
-		"test:base": "cross-env NODE_ENV=test nyc mocha --require @babel/register",
-		"dev": "NODE_ENV=development cross-env DEBUG=1 nodemon",
-		"build": "babel src --source-maps --copy-files --delete-dir-on-start --out-dir=dist"
-	},
-	"dependencies": {
-		"@natlibfi/marc-record": "^7.2.0-alpha.1",
-		"@natlibfi/marc-record-serializers": "^8.1.0",
-		"@natlibfi/marc-record-validate": "^7.0.1",
-		"@natlibfi/marc-record-validators-melinda": "^9.0.9",
-		"@natlibfi/melinda-backend-commons": "^2.0.5",
-		"@natlibfi/melinda-commons": "^12.0.3",
-		"amqplib": ">=0.8.0 <1.0.0",
-		"debug": "^4.3.4",
-		"http-status": "^1.5.2",
-		"moment": "^2.29.3",
-		"mongo-sanitize": "^1.1.0",
-		"mongodb": "^4.6.0"
-	},
-	"devDependencies": {
-		"@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.18.10",
-		"@natlibfi/eslint-config-melinda-backend": "^2.0.0",
-		"@natlibfi/fixura": "^2.2.1",
-		"babel-plugin-dynamic-import-node": "^2.3.3",
-		"babel-plugin-istanbul": "^6.1.1",
-		"babel-plugin-rewire": "^1.2.0",
-		"chai": "^4.3.6",
-		"cross-env": "^7.0.3",
-		"eslint": "^8.23.0",
-		"mocha": "^10.0.0",
-		"nodemon": "^2.0.19",
-		"nyc": "^15.1.0"
-	},
-	"eslintConfig": {
-		"extends": "@natlibfi/melinda-backend"
-	},
-	"babel": {
-		"presets": [
-			[
-				"@babel/preset-env",
-				{
-					"targets": "maintained node versions"
-				}
-			]
-		],
-		"plugins": [
-			"@babel/plugin-syntax-dynamic-import",
-			"dynamic-import-node"
-		],
-		"env": {
-			"test": {
-				"plugins": [
-					"istanbul",
-					"rewire"
-				]
-			}
-		}
-	},
-	"nyc": {
-		"exclude": [
-			"**/*.spec.js"
-		],
-		"reporter": [
-			"lcov",
-			"html"
-		],
-		"require": [
-			"@babel/register"
-		],
-		"sourceMap": false,
-		"instrument": false,
-		"lines": 80,
-		"statements": 80,
-		"functions": 80,
-		"branches": 80
-	},
-	"nodemonConfig": {
-		"exec": "npm run test:dev",
-		"watch": [
-			"src/*"
-		],
-		"ext": "js",
-		"delay": 2.5
-	}
+    "name": "@natlibfi/melinda-rest-api-commons",
+    "description": "Shared modules for microservices of Melinda rest api import system",
+    "author": {
+        "name": "The National Library of Finland"
+    },
+    "keywords": [],
+    "homepage": "https://github.com/natlibfi/melinda-rest-api-commons",
+    "bugs": {
+        "url": "https://github.com/natlibfi/melinda-rest-api-commons/issues"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git@github.com:natlibfi/melinda-rest-api-commons.git"
+    },
+    "license": "AGPL-3.0+",
+    "version": "2.3.2-alpha.10",
+    "main": "./dist/index.js",
+    "engines": {
+        "node": ">=14"
+    },
+    "publishConfig": {
+        "access": "public"
+    },
+    "scripts": {
+        "prepare": "npm run build",
+        "lint": "eslint ./src",
+        "lint:dev": "eslint ./src --fix",
+        "test": "npm run lint && npm run test:base -- src/**/*.spec.js",
+        "test:dev": "npm run lint:dev && npm run test:base -- src/**/*.spec.js",
+        "test:base": "cross-env NODE_ENV=test nyc mocha --require @babel/register --exclude src/amqp.health.spec.js --exclude src/amqp.tests.spec.js",
+        "test:local": "cross-env NODE_ENV=test nyc mocha --require @babel/register -- src/amqp.*.spec.js",
+        "test:healthcheck": "cross-env NODE_ENV=test nyc mocha --require @babel/register -- src/amqp.health.spec.js",
+        "coverage": "npm run cover:unit && npm run cover:report",
+        "cover:unit": "nyc --silent npm run test",
+        "cover:report": "nyc report --reporter=lcov --reporter=text",
+        "dev": "NODE_ENV=development cross-env DEBUG='@natlibfi/*' nodemon",
+        "build": "babel src --source-maps --copy-files --delete-dir-on-start --out-dir=dist"
+    },
+    "dependencies": {
+        "@natlibfi/fixugen": "^1.1.0",
+        "@natlibfi/marc-record": "^7.2.2",
+        "@natlibfi/marc-record-serializers": "^9.0.1",
+        "@natlibfi/marc-record-validate": "^7.0.2",
+        "@natlibfi/marc-record-validators-melinda": "^9.0.13",
+        "@natlibfi/melinda-backend-commons": "^2.1.0",
+        "@natlibfi/melinda-commons": "^12.0.5",
+        "amqplib": ">=0.8.0 <1.0.0",
+        "debug": "^4.3.4",
+        "http-status": "^1.5.3",
+        "moment": "^2.29.4",
+        "mongo-sanitize": "^1.1.0",
+        "mongodb": "^4.11.0"
+    },
+    "devDependencies": {
+        "@babel/cli": "^7.19.3",
+        "@babel/core": "^7.19.6",
+        "@babel/eslint-parser": "^7.19.1",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/preset-env": "^7.19.4",
+        "@natlibfi/eslint-config-melinda-backend": "^2.0.1",
+        "@natlibfi/fixura": "^2.2.5",
+        "babel-plugin-dynamic-import-node": "^2.3.3",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-plugin-rewire": "^1.2.0",
+        "chai": "^4.3.6",
+        "cross-env": "^7.0.3",
+        "eslint": "^8.25.0",
+        "mocha": "^10.1.0",
+        "nodemon": "^2.0.20",
+        "nyc": "^15.1.0"
+    },
+    "eslintConfig": {
+        "extends": "@natlibfi/melinda-backend"
+    },
+    "babel": {
+        "presets": [
+            [
+                "@babel/preset-env",
+                {
+                    "targets": "maintained node versions"
+                }
+            ]
+        ],
+        "plugins": [
+            "@babel/plugin-syntax-dynamic-import",
+            "dynamic-import-node"
+        ],
+        "env": {
+            "test": {
+                "plugins": [
+                    "istanbul",
+                    "rewire"
+                ]
+            }
+        }
+    },
+    "nyc": {
+        "exclude": [
+            "**/*.spec.js"
+        ],
+        "reporter": [
+            "lcov",
+            "html"
+        ],
+        "require": [
+            "@babel/register"
+        ],
+        "sourceMap": false,
+        "instrument": false,
+        "lines": 80,
+        "statements": 80,
+        "functions": 80,
+        "branches": 80
+    },
+    "nodemonConfig": {
+        "exec": "npm run test:dev",
+        "watch": [
+            "src/*"
+        ],
+        "ext": "js",
+        "delay": 2.5
+    }
 }