@natlibfi/melinda-rest-api-commons 2.2.0-alpha.8 → 2.3.0-alpha.2

package/dist/utils.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.addRecordResponseItem = addRecordResponseItem;
 exports.createImportJobState = createImportJobState;
 exports.createRecordResponseItem = createRecordResponseItem;
-exports.getRecordResponseStatus = getRecordResponseStatus;
 exports.logError = logError;
 
 var _melindaBackendCommons = require("@natlibfi/melinda-backend-commons");
@@ -90,63 +89,114 @@ function createRecordResponseItem({
   recordMetadata,
   id
 }) {
-  const recordResponseStatus = getRecordResponseStatus(responseStatus, responsePayload);
+  const recordResponseStatusAndMessage = getRecordResponseStatusAndMessage(responseStatus, responsePayload);
   const recordResponseItem = {
-    melindaId: id || '000000000',
-    recordMetadata: recordMetadata || undefined,
-    ...recordResponseStatus
+    databaseId: id || '000000000',
+    recordMetadata: responsePayload.recordMetadata || recordMetadata || undefined,
+    ...recordResponseStatusAndMessage
   };
   return recordResponseItem;
-}
+} // eslint-disable-next-line max-statements
+
 
-function getRecordResponseStatus(responseStatus, responsePayload) {
-  logger.verbose(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);
+function getRecordResponseStatusAndMessage(responseStatus, responsePayload) {
+  logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);
   const responseStatusName = _httpStatus.default[`${responseStatus}_NAME`];
-  logger.verbose(`Response status name: ${responseStatusName}`); // Non-http statuses
+  logger.debug(`Response status name: ${responseStatusName}`);
+  const message = getMessageFromResponsePayload(responsePayload);
+  logger.debug(`Response message: ${message}`); // Non-http statuses
+
+  if (['UPDATED', 'CREATED', 'INVALID', 'ERROR'].includes(responseStatus)) {
+    return {
+      status: responseStatus,
+      message
+    };
+  }
 
-  if (['UPDATED', 'CREATED', 'INVALID', 'ERROR', 'UNKNOWN'].includes(responseStatus)) {
+  if (['UNKNOWN'].includes(responseStatus)) {
+    const possibleIds = responsePayload.ids || [];
     return {
       status: responseStatus,
-      message: responsePayload
+      message,
+      possibleIds
     };
-  } // Duplicates and other conflicts
+  } // Duplicates and other CONFLICT statuses
 
 
   if ([_httpStatus.default.CONFLICT, 'CONFLICT'].includes(responseStatus)) {
-    if (/^Duplicates in database/u.test(responsePayload.message)) {
+    if (/^Duplicates in database/u.test(message)) {
+      const duplicateIds = responsePayload.ids || [];
       return {
         status: 'DUPLICATE',
-        message: responsePayload.message,
-        duplicateIds: responsePayload.ids
+        message,
+        duplicateIds
+      };
+    }
+
+    if (/^MatchValidation for all/u.test(message)) {
+      const duplicateIds = responsePayload.ids || [];
+      return {
+        status: 'CONFLICT',
+        message,
+        duplicateIds
+      };
+    }
+
+    const conflictIds = responsePayload.ids || [];
+
+    if (conflictIds.length > 0) {
+      return {
+        status: 'CONFLICT',
+        message,
+        conflictIds
       };
     }
 
     return {
       status: 'CONFLICT',
-      message: responsePayload.message
+      message
     };
   }
 
   if ([_httpStatus.default.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {
-    return {
+    const unprocessableIds = responsePayload.ids || [];
+    const response = unprocessableIds.length > 0 ? {
       status: 'UNPROCESSABLE_ENTITY',
-      message: responsePayload
+      message,
+      unprocessableIds
+    } : {
+      status: 'UNPROCESSABLE_ENTITY',
+      message
     };
+    return response;
   }
 
   if ([_httpStatus.default.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {
     return {
       status: 'NOT_FOUND',
-      message: responsePayload
+      message
     };
-  }
+  } // Otherwise
+
 
   return {
     status: 'ERROR',
-    message: responsePayload
+    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,

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/utils.js"],"names":["logger","logError","err","ApiError","error","JSON","stringify","stack","undefined","createImportJobState","operation","state","queryImportJobState","IMPORT_JOB_STATE","Error","OPERATIONS","importJobStateWithOperation","importJobStateForQuery","createRecordResponseItem","responsePayload","responseStatus","recordMetadata","id","recordResponseStatus","getRecordResponseStatus","recordResponseItem","melindaId","verbose","responseStatusName","httpStatus","includes","status","message","CONFLICT","test","duplicateIds","ids","UNPROCESSABLE_ENTITY","NOT_FOUND","addRecordResponseItem","correlationId","mongoOperator","pushMessages","messages","messageField"],"mappings":"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","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 recordResponseStatus = getRecordResponseStatus(responseStatus, responsePayload);\n  const recordResponseItem = {\n    melindaId: id || '000000000',\n    recordMetadata: recordMetadata || undefined,\n    ...recordResponseStatus\n  };\n  return recordResponseItem;\n}\n\nexport function getRecordResponseStatus(responseStatus, responsePayload) {\n\n  logger.verbose(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);\n  const responseStatusName = httpStatus[`${responseStatus}_NAME`];\n  logger.verbose(`Response status name: ${responseStatusName}`);\n\n  // Non-http statuses\n  if (['UPDATED', 'CREATED', 'INVALID', 'ERROR', 'UNKNOWN'].includes(responseStatus)) {\n    return {status: responseStatus, message: responsePayload};\n  }\n\n  // Duplicates and other conflicts\n  if ([httpStatus.CONFLICT, 'CONFLICT'].includes(responseStatus)) {\n    if ((/^Duplicates in database/u).test(responsePayload.message)) {\n      return {status: 'DUPLICATE', message: responsePayload.message, duplicateIds: responsePayload.ids};\n    }\n    return {status: 'CONFLICT', message: responsePayload.message};\n  }\n\n  if ([httpStatus.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {\n    return {status: 'UNPROCESSABLE_ENTITY', message: responsePayload};\n  }\n\n  if ([httpStatus.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {\n    return {status: 'NOT_FOUND', message: responsePayload};\n  }\n\n  return {status: 'ERROR', message: responsePayload};\n}\n\nexport async function addRecordResponseItem({recordResponseItem, correlationId, mongoOperator}) {\n  await mongoOperator.pushMessages({correlationId, messages: [recordResponseItem], messageField: 'records'});\n  return true;\n}\n\n"],"file":"utils.js"}
+{"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":"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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.2.0-alpha.8",
+	"version": "2.3.0-alpha.2",
 	"main": "./dist/index.js",
 	"engines": {
 		"node": ">=14"
@@ -36,21 +36,21 @@
 		"@natlibfi/marc-record": "^7.0.0",
 		"@natlibfi/marc-record-serializers": "^8.1.0",
 		"@natlibfi/marc-record-validate": "^7.0.1",
-		"@natlibfi/marc-record-validators-melinda": "^9.0.4",
+		"@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",
-		"http-status": "^1.5.0",
-		"moment": "^2.29.1",
+		"http-status": "^1.5.2",
+		"moment": "^2.29.3",
 		"mongo-sanitize": "^1.1.0",
-		"mongodb": "^4.1.3"
+		"mongodb": "^4.6.0"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.17.6",
-		"@babel/core": "^7.17.5",
+		"@babel/cli": "^7.17.10",
+		"@babel/core": "^7.17.12",
 		"@babel/eslint-parser": "^7.17.0",
 		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-		"@babel/preset-env": "^7.16.11",
+		"@babel/preset-env": "^7.17.12",
 		"@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.10.0",
-		"mocha": "^9.2.1",
-		"nodemon": "^2.0.15",
+		"eslint": "^8.15.0",
+		"mocha": "^10.0.0",
+		"nodemon": "^2.0.16",
 		"nyc": "^15.1.0"
 	},
 	"eslintConfig": {