@natlibfi/melinda-rest-api-commons 3.0.4 → 3.0.6-alpha.1

package/.github/dependabot.yml

@@ -10,6 +10,7 @@ updates:
       interval: "daily"
       time: "06:30"
       timezone: "Europe/Helsinki"
+    target-branch: "dependencies"
 
   # Minor updates to npm production dependencies daily
   - package-ecosystem: "npm"
@@ -19,10 +20,9 @@ updates:
       time: "06:45"
       timezone: "Europe/Helsinki"
     versioning-strategy: lockfile-only
-    labels:
-      - "npm minor dependencies"
     allow:
       - dependency-type: "production"
+    target-branch: "dependencies"
 
   # Major updates to npm dependencies weekly @tuesday
   # Not possible yet https://github.com/dependabot/dependabot-core/issues/1778

package/dist/mongoLog.js

@@ -204,8 +204,8 @@ async function _default(MONGO_URI) {
       const result = await db.collection(collection).updateMany(filter, [{
         $set: {
           modificationTime: (0, _moment.default)().toDate(),
-          protect: {
-            $not: '$protect'
+          protected: {
+            $not: '$protected'
           }
         }
       }]);

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","getListOfLogs","getExpandedListOfLogs","protect","remove","removeBySequences","logItem","time","moment","toDate","newLogItem","creationTime","protected","checkLogItemType","logItemType","result","insertOne","acknowledged","blobSequence","blobSequenceStart","blobSequenceEnd","itemString","info","correlationId","ApiError","httpStatus","INTERNAL_SERVER_ERROR","error","errorMessage","payload","message","logError","params","debug","JSON","stringify","limit","skip","rest","find","sort","parseInt","toArray","length","correlationIdString","distinct","status","OK","NOT_FOUND","pipeline","aggregate","fixedResult","map","logListing","_id","cataloger","logCount","silly","cleanCorrelationId","sanitize","cleanBlobSequence","filter","updateMany","$set","modificationTime","$not","modifiedCount","force","clean","$ne","deleteMany","deletedCount","sequences","cleanSequences","sequence","Number","isInteger","$in","errorUnknown","errorNotExisting","typeInLogItemTypes","Object","values","LOG_ITEM_TYPE","indexOf"],"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';\nimport {LOG_ITEM_TYPE} from './constants';\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, getExpandedListOfLogs, protect, remove, removeBySequences};\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      checkLogItemType(logItem.logItemType, false);\n      const result = await db.collection(collection).insertOne(newLogItem);\n      if (result.acknowledged) {\n        const {blobSequence, blobSequenceStart, blobSequenceEnd} = logItem;\n        const itemString = blobSequenceStart && blobSequenceEnd ? `${blobSequenceStart} - ${blobSequenceEnd}` : `${blobSequence}`;\n        logger.info(`*** New ${logItem.logItemType} added for ${logItem.correlationId}, blobSequence(s): ${itemString}. ***`);\n        return;\n      }\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n    } catch (error) {\n      const errorMessage = error.payload || error.message || '';\n      logError(error);\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);\n    }\n  }\n\n  async function query(params) {\n    logger.debug(`Query params: ${JSON.stringify(params)}`);\n    checkLogItemType(params.logItemType, false, false);\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(`Query result: ${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    checkLogItemType(logItemType, false, false);\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 getExpandedListOfLogs(logItemType = 'MERGE_LOG') {\n    checkLogItemType(logItemType, false, false);\n    logger.debug(`Getting expanded list of logs`);\n    const pipeline = [\n      // currently return only MERGE_LOG and MATCH_LOG\n      {'$match': {'logItemType': {'$in': ['MERGE_LOG', 'MATCH_LOG']}}},\n      {'$sort':\n        {'correlationId': 1, 'logItemType': 1, 'creationTime': 1}},\n      {'$group':\n        {'_id': {'correlationId': '$correlationId', 'logItemType': '$logItemType'},\n          'creationTime': {'$first': '$creationTime'},\n          // We don't currently have cataloger in logs, this will always be null\n          'cataloger': {'$first': '$cataloger'},\n          'logCount': {'$sum': 1}}}\n    ];\n\n    const result = await db.collection(collection) // eslint-disable-line functional/immutable-data\n      .aggregate(pipeline)\n      .toArray();\n\n    const fixedResult = result.map((logListing) => {\n      const {correlationId, logItemType} = logListing._id;\n      const {cataloger, creationTime, logCount} = logListing;\n      return {correlationId, logItemType, cataloger, creationTime, logCount};\n    });\n\n    logger.silly(`Query result: ${JSON.stringify(result)}`);\n    logger.silly(`Query result: ${JSON.stringify(fixedResult)}`);\n\n    logger.debug(`Query result: ${fixedResult.length > 0 ? `Found ${fixedResult.length} log items!` : 'Not found!'}`);\n    return {status: fixedResult.length > 0 ? httpStatus.OK : httpStatus.NOT_FOUND, payload: fixedResult.length > 0 ? fixedResult : 'No logs found'};\n  }\n\n  async function protect(correlationId, blobSequence) {\n    logger.info(`Protecting in Mongo (${collection}) correlationId: ${correlationId}, blobSequence: ${blobSequence}`);\n    const cleanCorrelationId = sanitize(correlationId);\n    const cleanBlobSequence = sanitize(blobSequence);\n    const filter = blobSequence ? {correlationId: cleanCorrelationId, blobSequence: parseInt(cleanBlobSequence, 10)} : {correlationId: cleanCorrelationId};\n\n    try {\n      const result = await db.collection(collection).updateMany(\n        filter,\n        [\n          {\n            $set: {\n              modificationTime: moment().toDate(),\n              protect: {$not: '$protect'}\n            }\n          }\n        ]\n      );\n      return {status: result.modifiedCount > 0 ? httpStatus.OK : httpStatus.NOT_FOUND, payload: result.modifiedCount > 0 ? result : 'No logs found'};\n    } catch (error) {\n      const errorMessage = error.payload || error.message || '';\n      logError(error);\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);\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 (error) {\n      const errorMessage = error.payload || error.message || '';\n      logError(error);\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);\n    }\n  }\n\n  async function removeBySequences(correlationId, sequences = [], force = false) {\n    logger.info(`Removing from Mongo (${collection}) correlationId: ${correlationId}, sequences: ${sequences.length}`);\n    const clean = sanitize(correlationId);\n    // blobSequences are integers that start from 1\n    // we accept also strings that are convertilble to integers greated than 0\n    const cleanSequences = sequences.filter(sequence => Number.isInteger(Number(sequence)) && sequence > 0);\n\n    if (sequences.length !== cleanSequences.length) {\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Invalid sequences in removeBySequences. Sequences should be positive integers`);\n    }\n\n    const filter = force ? {correlationId: clean, blobSequence: {$in: cleanSequences}} : {correlationId: clean, blobSequence: {$in: sequences}, 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 (error) {\n      const errorMessage = error.payload || error.message || '';\n      logError(error);\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);\n    }\n  }\n\n  function checkLogItemType(logItemType, errorUnknown = false, errorNotExisting = false) {\n\n    if (logItemType) {\n      const typeInLogItemTypes = Object.values(LOG_ITEM_TYPE).indexOf(logItemType) > -1;\n      if (typeInLogItemTypes) {\n        return logger.debug(`Valid logItemType: ${logItemType}`);\n      }\n      if (errorUnknown) {\n        throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Unknown logItemType: ${logItemType}`);\n      }\n      return logger.debug(`WARN: We have unknown logType: ${logItemType}`);\n    }\n\n    if (errorNotExisting) {\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `No logItemType: ${logItemType}`);\n    }\n    return logger.debug(`No logItemType: ${logItemType}`);\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","getExpandedListOfLogs","protect","remove","removeBySequences","logItem","time","moment","toDate","newLogItem","creationTime","protected","checkLogItemType","logItemType","result","insertOne","acknowledged","blobSequence","blobSequenceStart","blobSequenceEnd","itemString","info","correlationId","ApiError","httpStatus","INTERNAL_SERVER_ERROR","error","errorMessage","payload","message","logError","params","debug","JSON","stringify","limit","skip","rest","find","sort","parseInt","toArray","length","correlationIdString","distinct","status","OK","NOT_FOUND","pipeline","aggregate","fixedResult","map","logListing","_id","cataloger","logCount","silly","cleanCorrelationId","sanitize","cleanBlobSequence","filter","updateMany","$set","modificationTime","$not","modifiedCount","force","clean","$ne","deleteMany","deletedCount","sequences","cleanSequences","sequence","Number","isInteger","$in","errorUnknown","errorNotExisting","typeInLogItemTypes","Object","values","LOG_ITEM_TYPE","indexOf"],"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';\nimport {LOG_ITEM_TYPE} from './constants';\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, getExpandedListOfLogs, protect, remove, removeBySequences};\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      checkLogItemType(logItem.logItemType, false);\n      const result = await db.collection(collection).insertOne(newLogItem);\n      if (result.acknowledged) {\n        const {blobSequence, blobSequenceStart, blobSequenceEnd} = logItem;\n        const itemString = blobSequenceStart && blobSequenceEnd ? `${blobSequenceStart} - ${blobSequenceEnd}` : `${blobSequence}`;\n        logger.info(`*** New ${logItem.logItemType} added for ${logItem.correlationId}, blobSequence(s): ${itemString}. ***`);\n        return;\n      }\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n    } catch (error) {\n      const errorMessage = error.payload || error.message || '';\n      logError(error);\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);\n    }\n  }\n\n  async function query(params) {\n    logger.debug(`Query params: ${JSON.stringify(params)}`);\n    checkLogItemType(params.logItemType, false, false);\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(`Query result: ${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    checkLogItemType(logItemType, false, false);\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 getExpandedListOfLogs(logItemType = 'MERGE_LOG') {\n    checkLogItemType(logItemType, false, false);\n    logger.debug(`Getting expanded list of logs`);\n    const pipeline = [\n      // currently return only MERGE_LOG and MATCH_LOG\n      {'$match': {'logItemType': {'$in': ['MERGE_LOG', 'MATCH_LOG']}}},\n      {'$sort':\n        {'correlationId': 1, 'logItemType': 1, 'creationTime': 1}},\n      {'$group':\n        {'_id': {'correlationId': '$correlationId', 'logItemType': '$logItemType'},\n          'creationTime': {'$first': '$creationTime'},\n          // We don't currently have cataloger in logs, this will always be null\n          'cataloger': {'$first': '$cataloger'},\n          'logCount': {'$sum': 1}}}\n    ];\n\n    const result = await db.collection(collection) // eslint-disable-line functional/immutable-data\n      .aggregate(pipeline)\n      .toArray();\n\n    const fixedResult = result.map((logListing) => {\n      const {correlationId, logItemType} = logListing._id;\n      const {cataloger, creationTime, logCount} = logListing;\n      return {correlationId, logItemType, cataloger, creationTime, logCount};\n    });\n\n    logger.silly(`Query result: ${JSON.stringify(result)}`);\n    logger.silly(`Query result: ${JSON.stringify(fixedResult)}`);\n\n    logger.debug(`Query result: ${fixedResult.length > 0 ? `Found ${fixedResult.length} log items!` : 'Not found!'}`);\n    return {status: fixedResult.length > 0 ? httpStatus.OK : httpStatus.NOT_FOUND, payload: fixedResult.length > 0 ? fixedResult : 'No logs found'};\n  }\n\n  async function protect(correlationId, blobSequence) {\n    logger.info(`Protecting in Mongo (${collection}) correlationId: ${correlationId}, blobSequence: ${blobSequence}`);\n    const cleanCorrelationId = sanitize(correlationId);\n    const cleanBlobSequence = sanitize(blobSequence);\n    const filter = blobSequence ? {correlationId: cleanCorrelationId, blobSequence: parseInt(cleanBlobSequence, 10)} : {correlationId: cleanCorrelationId};\n\n    try {\n      const result = await db.collection(collection).updateMany(\n        filter,\n        [\n          {\n            $set: {\n              modificationTime: moment().toDate(),\n              protected: {$not: '$protected'}\n            }\n          }\n        ]\n      );\n      return {status: result.modifiedCount > 0 ? httpStatus.OK : httpStatus.NOT_FOUND, payload: result.modifiedCount > 0 ? result : 'No logs found'};\n    } catch (error) {\n      const errorMessage = error.payload || error.message || '';\n      logError(error);\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);\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 (error) {\n      const errorMessage = error.payload || error.message || '';\n      logError(error);\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);\n    }\n  }\n\n  async function removeBySequences(correlationId, sequences = [], force = false) {\n    logger.info(`Removing from Mongo (${collection}) correlationId: ${correlationId}, sequences: ${sequences.length}`);\n    const clean = sanitize(correlationId);\n    // blobSequences are integers that start from 1\n    // we accept also strings that are convertilble to integers greated than 0\n    const cleanSequences = sequences.filter(sequence => Number.isInteger(Number(sequence)) && sequence > 0);\n\n    if (sequences.length !== cleanSequences.length) {\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Invalid sequences in removeBySequences. Sequences should be positive integers`);\n    }\n\n    const filter = force ? {correlationId: clean, blobSequence: {$in: cleanSequences}} : {correlationId: clean, blobSequence: {$in: sequences}, 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 (error) {\n      const errorMessage = error.payload || error.message || '';\n      logError(error);\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);\n    }\n  }\n\n  function checkLogItemType(logItemType, errorUnknown = false, errorNotExisting = false) {\n\n    if (logItemType) {\n      const typeInLogItemTypes = Object.values(LOG_ITEM_TYPE).indexOf(logItemType) > -1;\n      if (typeInLogItemTypes) {\n        return logger.debug(`Valid logItemType: ${logItemType}`);\n      }\n      if (errorUnknown) {\n        throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Unknown logItemType: ${logItemType}`);\n      }\n      return logger.debug(`WARN: We have unknown logType: ${logItemType}`);\n    }\n\n    if (errorNotExisting) {\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `No logItemType: ${logItemType}`);\n    }\n    return logger.debug(`No logItemType: ${logItemType}`);\n  }\n}\n"],"mappings":"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"}

package/package.json

@@ -14,10 +14,10 @@
         "url": "git@github.com:natlibfi/melinda-rest-api-commons.git"
     },
     "license": "AGPL-3.0+",
-    "version": "3.0.4",
+    "version": "3.0.6-alpha.1",
     "main": "./dist/index.js",
     "engines": {
-        "node": ">=14"
+        "node": ">=18"
     },
     "publishConfig": {
         "access": "public"
@@ -41,20 +41,20 @@
         "@natlibfi/fixugen": "^1.1.0",
         "@natlibfi/marc-record": "^7.2.2",
         "@natlibfi/marc-record-serializers": "^9.0.4",
-        "@natlibfi/marc-record-validate": "^7.0.2",
+        "@natlibfi/marc-record-validate": "^7.0.3",
         "@natlibfi/marc-record-validators-melinda": "^9.1.1",
         "@natlibfi/melinda-backend-commons": "^2.1.0",
         "@natlibfi/melinda-commons": "^12.0.7",
-        "amqplib": ">=0.8.0 <1.0.0",
+        "amqplib": ">=0.10.3 <1.0.0",
         "debug": "^4.3.4",
-        "http-status": "^1.5.3",
+        "http-status": "^1.6.2",
         "moment": "^2.29.4",
         "mongo-sanitize": "^1.1.0",
-        "mongodb": "^4.12.1"
+        "mongodb": "^4.13.0"
     },
     "devDependencies": {
-        "@babel/cli": "^7.19.3",
-        "@babel/core": "^7.20.5",
+        "@babel/cli": "^7.20.7",
+        "@babel/core": "^7.20.12",
         "@babel/eslint-parser": "^7.19.1",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/preset-env": "^7.20.2",
@@ -65,8 +65,8 @@
         "babel-plugin-rewire": "^1.2.0",
         "chai": "^4.3.7",
         "cross-env": "^7.0.3",
-        "eslint": "^8.29.0",
-        "mocha": "^10.1.0",
+        "eslint": "^8.32.0",
+        "mocha": "^10.2.0",
         "nodemon": "^2.0.20",
         "nyc": "^15.1.0"
     },