@natlibfi/melinda-rest-api-commons 4.2.4-alpha.11 → 4.2.4-alpha.13

package/package.json

@@ -14,7 +14,7 @@
     "url": "git@github.com:natlibfi/melinda-rest-api-commons.git"
   },
   "license": "MIT",
-  "version": "4.2.4-alpha.11",
+  "version": "4.2.4-alpha.13",
   "main": "./dist/index.js",
   "engines": {
     "node": ">=18"
@@ -39,7 +39,7 @@
     "@natlibfi/marc-record": "^9.1.3",
     "@natlibfi/marc-record-serializers": "^10.1.5",
     "@natlibfi/marc-record-validate": "^8.0.12",
-    "@natlibfi/marc-record-validators-melinda": "^11.5.3",
+    "@natlibfi/marc-record-validators-melinda": "^11.5.4",
     "@natlibfi/melinda-backend-commons": "^2.3.6",
     "@natlibfi/melinda-commons": "^13.0.19",
     "amqplib": "^0.10.5",
@@ -47,13 +47,13 @@
     "http-status": "^2.1.0",
     "moment": "^2.30.1",
     "mongo-sanitize": "^1.1.0",
-    "mongodb": "^6.12.0"
+    "mongodb": "^6.13.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.26.4",
-    "@babel/core": "^7.26.7",
-    "@babel/plugin-transform-runtime": "^7.25.9",
-    "@babel/preset-env": "^7.26.7",
+    "@babel/core": "^7.26.8",
+    "@babel/plugin-transform-runtime": "^7.26.8",
+    "@babel/preset-env": "^7.26.8",
     "@babel/register": "^7.25.9",
     "@natlibfi/eslint-config-melinda-backend": "^3.0.5",
     "@natlibfi/fixugen": "^2.0.12",

package/tests/mongo-add-blob-size.spec.js

@@ -2,10 +2,9 @@
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 
 let mongoFixtures; // eslint-disable-line functional/no-let
@@ -59,17 +58,10 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-//   contentStream = false,
-//   expectedOpResult = undefined,
-//   updateStateBeforeTest = undefined,
-//   resultIndex = undefined,
-//   createBulkParams = undefined,
-//   expectedFileCount = undefined,
-//   expectUndefined = undefined
+
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-check-and-check-state.spec.js

@@ -2,10 +2,9 @@ import {expect} from 'chai';
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 
 let mongoFixtures; // eslint-disable-line functional/no-let
@@ -58,17 +57,11 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = '',
-  //contentStream = false,
   expectedOpResult = undefined,
   updateStateBeforeTest = undefined
-  //resultIndex = undefined,
-  //createBulkParams = undefined,
-  //expectedFileCount = undefined,
-  //expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-check-and-set-import-job-state.spec.js

@@ -2,10 +2,9 @@ import {expect} from 'chai';
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 let mongoFixtures; // eslint-disable-line functional/no-let
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:check-and-set-import-job-state-test');
@@ -58,20 +57,12 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = '',
-  //contentStream = false,
   expectedOpResult = undefined,
   updateStateBeforeTest = undefined
-  //resultIndex = undefined,
-  //createBulkParams = undefined,
-  //expectedFileCount = undefined,
-  //expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
-  // DEVELOP: we could use sama function for most of tests?
-  // debug(typeof mongoUri); // eslint-disable-line
 
   await doPreFillDb(preFillDb);
 
@@ -89,6 +80,7 @@ async function callback({
       debug(JSON.stringify(params));
       //{correlationId, operation, importJobState, errorMessage = '', errorStatus = ''}
       // timeout
+
       // eslint-disable-next-line functional/no-conditional-statements
       if (updateStateBeforeTest && params.correlationId) {
         debug(`setState to reset modificationTime`);

package/tests/mongo-check-timeout.spec.js

@@ -2,10 +2,9 @@ import {expect} from 'chai';
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 
 let mongoFixtures; // eslint-disable-line functional/no-let
@@ -59,17 +58,11 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = '',
-  //contentStream = false,
   expectedOpResult = undefined,
   updateStateBeforeTest = undefined
-  //resultIndex = undefined,
-  //createBulkParams = undefined,
-  //expectedFileCount = undefined,
-  //expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-create-bulk.spec.js

@@ -1,10 +1,9 @@
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 let mongoFixtures; // eslint-disable-line functional/no-let
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:test:create-bulk');
@@ -52,32 +51,26 @@ async function callback({
   getFixture,
   functionName,
   params,
-  //expectModificationTime = false,
   preFillDb = false,
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = '',
   contentStream = false,
-  //expectedOpResult = undefined,
-  //updateStateBeforeTest = undefined,
-  //resultIndex = undefined,
-  //createBulkParams = undefined,
   expectedFileCount = undefined
-  //expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
-  // DEVELOP: we could use sama function for most of tests?
-  // debug(typeof mongoUri); // eslint-disable-line
 
-  if (preFillDb) { // eslint-disable-line functional/no-conditional-statements
-    await mongoFixtures.populate(getFixture('dbContents.json'));
-  }
-
-  //return {createPrio, createBulk, checkAndSetState, checkAndSetImportJobState, query, queryById, remove, readContent, removeContent, getOne, getStream, setState, setImportJobState, pushIds, pushMessages, setOperation, setOperations, addBlobSize, setBlobSize};
+  await doPreFillDb(preFillDb);
 
+  async function doPreFillDb(preFillDb) {
+    if (preFillDb) {
+      await mongoFixtures.populate(getFixture('dbContents.json'));
+      return;
+    }
+    return;
+  }
 
   if (functionName === 'createBulk') {
     try {

package/tests/mongo-create-prio.spec.js

@@ -2,9 +2,8 @@
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 // import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
 
 let mongoFixtures; // eslint-disable-line functional/no-let
@@ -48,36 +47,28 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
 async function callback({
   getFixture,
   functionName,
   params,
-  //expectModificationTime = false,
   preFillDb = false,
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-  //contentStream = false,
-  //expectedOpResult = undefined,
-  //updateStateBeforeTest = undefined,
-  //resultIndex = undefined,
-  //createBulkParams = undefined,
-  //expectedFileCount = undefined,
-  //expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
-  // DEVELOP: we could use sama function for most of tests?
-  // debug(typeof mongoUri); // eslint-disable-line
 
-  if (preFillDb) { // eslint-disable-line functional/no-conditional-statements
-    await mongoFixtures.populate(getFixture('dbContents.json'));
-  }
+  await doPreFillDb(preFillDb);
 
-  //return {createPrio, createBulk, checkAndSetState, checkAndSetImportJobState, query, queryById, remove, readContent, removeContent, getOne, getStream, setState, setImportJobState, pushIds, pushMessages, setOperation, setOperations, addBlobSize, setBlobSize};
+  async function doPreFillDb(preFillDb) {
+    if (preFillDb) {
+      await mongoFixtures.populate(getFixture('dbContents.json'));
+      return;
+    }
+    return;
+  }
 
   if (functionName === 'createPrio') {
     try {

package/tests/mongo-get-one.spec.js

@@ -2,10 +2,9 @@ import {expect} from 'chai';
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError} from './testUtils';
+import {getMongoOperator, handleError} from './testUtils';
 
 
 let mongoFixtures; // eslint-disable-line functional/no-let
@@ -49,27 +48,18 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
 async function callback({
   getFixture,
   functionName,
   params,
-  //expectModificationTime = false,
   preFillDb = false,
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = '',
-  //contentStream = false,
   expectedOpResult = undefined
-  //updateStateBeforeTest = undefined,
-  //resultIndex = undefined,
-  //createBulkParams = undefined,
-  //expectedFileCount = undefined,
-  //expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   //const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-get-stream.spec.js

@@ -2,10 +2,9 @@ import {expect} from 'chai';
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, streamToString} from './testUtils';
+import {getMongoOperator, handleError, streamToString} from './testUtils';
 
 let mongoFixtures; // eslint-disable-line functional/no-let
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:get-stream:test');
@@ -48,27 +47,20 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
+// eslint-disable-next-line max-statements
 async function callback({
   getFixture,
   functionName,
   params,
-  //expectModificationTime = false,
   preFillDb = false,
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = '',
   contentStream = false,
-  //expectedOpResult = undefined,
-  //updateStateBeforeTest = undefined,
-  //resultIndex = undefined,
   createBulkParams = undefined
-  //expectedFileCount = undefined,
-  //expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   //const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-push-ids.spec.js

@@ -1,10 +1,9 @@
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 
 let mongoFixtures; // eslint-disable-line functional/no-let
@@ -48,7 +47,6 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
 async function callback({
   getFixture,
   functionName,
@@ -58,17 +56,9 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-  //contentStream = false,
-  //expectedOpResult = undefined,
-  //updateStateBeforeTest = undefined,
-  //resultIndex = undefined,
-  //createBulkParams = undefined,
-  //expectedFileCount = undefined,
-  //expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-push-messages.spec.js

@@ -2,10 +2,9 @@
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 let mongoFixtures; // eslint-disable-line functional/no-let
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:push-messages:test');
@@ -48,7 +47,6 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
 async function callback({
   getFixture,
   functionName,
@@ -58,17 +56,9 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-  //contentStream = false,
-//   expectedOpResult = undefined,
-//   updateStateBeforeTest = undefined,
-//   resultIndex = undefined,
-//   createBulkParams = undefined,
-//   expectedFileCount = undefined,
-//   expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-query-by-id.spec.js

@@ -2,10 +2,9 @@ import {expect} from 'chai';
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToDbEntry, formatQueueItem} from './testUtils';
+import {getMongoOperator, handleError, compareToDbEntry, formatQueueItem} from './testUtils';
 
 
 let mongoFixtures; // eslint-disable-line functional/no-let
@@ -49,7 +48,7 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
+// eslint-disable-next-line max-statements
 async function callback({
   getFixture,
   functionName,
@@ -59,17 +58,12 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = '',
-  //contentStream = false,
   expectedOpResult = undefined,
   updateStateBeforeTest = undefined,
   resultIndex = undefined
-  //createBulkParams = undefined,
-  //expectedFileCount = undefined,
-  //expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-query.spec.js

@@ -2,10 +2,9 @@ import {expect} from 'chai';
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError} from './testUtils';
+import {getMongoOperator, handleError} from './testUtils';
 
 let mongoFixtures; // eslint-disable-line functional/no-let
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:test');
@@ -48,27 +47,18 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
 async function callback({
   getFixture,
   functionName,
   params,
-  //expectModificationTime = false,
   preFillDb = false,
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = '',
-  //contentStream = false,
   expectedOpResult = undefined
-  //updateStateBeforeTest = undefined,
-  //resultIndex = undefined,
-  //createBulkParams = undefined,
-  //expectedFileCount = undefined,
-  //expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   //const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-read-content.spec.js

@@ -2,10 +2,9 @@ import {expect} from 'chai';
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, streamToString} from './testUtils';
+import {getMongoOperator, handleError, streamToString} from './testUtils';
 
 
 let mongoFixtures; // eslint-disable-line functional/no-let
@@ -49,27 +48,20 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
+// eslint-disable-next-line max-statements
 async function callback({
   getFixture,
   functionName,
   params,
-  //expectModificationTime = false,
   preFillDb = false,
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = '',
   contentStream = false,
-  //expectedOpResult = undefined,
-  //updateStateBeforeTest = undefined,
-  //resultIndex = undefined,
   createBulkParams = undefined
-  //expectedFileCount = undefined,
-  //expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   //const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-remove.spec.js

@@ -2,10 +2,9 @@
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 
 let mongoFixtures; // eslint-disable-line functional/no-let
@@ -49,7 +48,7 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
+// eslint-disable-next-line max-statements
 async function callback({
   getFixture,
   functionName,
@@ -60,16 +59,12 @@ async function callback({
   expectedErrorMessage = '',
   expectedErrorStatus = '',
   contentStream = false,
-  //expectedOpResult = undefined,
-  //updateStateBeforeTest = undefined,
-  //resultIndex = undefined,
   createBulkParams = undefined,
   expectedFileCount = undefined,
   expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-set-blob-size.spec.js

@@ -2,10 +2,9 @@
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 let mongoFixtures; // eslint-disable-line functional/no-let
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-blob-size:test');
@@ -48,7 +47,6 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
 async function callback({
   getFixture,
   functionName,
@@ -58,17 +56,9 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-//   contentStream = false,
-//   expectedOpResult = undefined,
-//   updateStateBeforeTest = undefined,
-//   resultIndex = undefined,
-//   createBulkParams = undefined,
-//   expectedFileCount = undefined,
-//   expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-set-import-job-state.spec.js

@@ -2,10 +2,9 @@
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 
 let mongoFixtures; // eslint-disable-line functional/no-let
@@ -49,7 +48,6 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
 async function callback({
   getFixture,
   functionName,
@@ -59,17 +57,9 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-//   contentStream = false,
-//   expectedOpResult = undefined,
-//   updateStateBeforeTest = undefined,
-//   resultIndex = undefined,
-//   createBulkParams = undefined,
-//   expectedFileCount = undefined,
-//   expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-set-operation.spec.js

@@ -2,10 +2,9 @@
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 let mongoFixtures; // eslint-disable-line functional/no-let
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-operation:test');
@@ -48,7 +47,6 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
 async function callback({
   getFixture,
   functionName,
@@ -58,17 +56,9 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-//   contentStream = false,
-//   expectedOpResult = undefined,
-//   updateStateBeforeTest = undefined,
-//   resultIndex = undefined,
-//   createBulkParams = undefined,
-//   expectedFileCount = undefined,
-//   expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-set-operations.spec.js

@@ -2,10 +2,9 @@
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 let mongoFixtures; // eslint-disable-line functional/no-let
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-operations:test');
@@ -48,7 +47,6 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
 async function callback({
   getFixture,
   functionName,
@@ -58,17 +56,9 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-//   contentStream = false,
-//   expectedOpResult = undefined,
-//   updateStateBeforeTest = undefined,
-//   resultIndex = undefined,
-//   createBulkParams = undefined,
-//   expectedFileCount = undefined,
-//   expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/mongo-set-state.spec.js

@@ -2,10 +2,9 @@
 import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
-import createMongoOperator from '../src/mongo';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
-import {handleError, compareToFirstDbEntry} from './testUtils';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
 
 
 let mongoFixtures; // eslint-disable-line functional/no-let
@@ -49,7 +48,6 @@ async function initMongofixtures() {
   });
 }
 
-// eslint-disable-next-line max-statements, complexity
 async function callback({
   getFixture,
   functionName,
@@ -59,17 +57,9 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-//   contentStream = false,
-//   expectedOpResult = undefined,
-//   updateStateBeforeTest = undefined,
-//   resultIndex = undefined,
-//   createBulkParams = undefined,
-//   expectedFileCount = undefined,
-//   expectUndefined = undefined
 }) {
 
-  const mongoUri = await mongoFixtures.getUri();
-  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);

package/tests/testUtils.js

@@ -1,9 +1,17 @@
 
 import {expect} from 'chai';
 import createDebugLogger from 'debug';
+import createMongoOperator from '../src/mongo';
+
 
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:test');
 
+export async function getMongoOperator(mongoFixtures) {
+  const mongoUri = await mongoFixtures.getUri();
+  const mongoOperator = await createMongoOperator(mongoUri, 'foobar', '');
+  return mongoOperator;
+}
+
 export async function compareToFirstDbEntry({mongoFixtures, expectedResult, expectModificationTime = false, formatDates = true, expectedFileCount = undefined}) {
   const result = await compareToDbEntry({mongoFixtures, expectedResult, resultIndex: 0, expectModificationTime, formatDates, expectedFileCount});
   return result;