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

package/dist/helpers/fix-strip-f884s.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.stripF884s = stripF884s;
 var _marcRecord = require("@natlibfi/marc-record");
 var _debug = _interopRequireDefault(require("debug"));
-var _fixUtils = require("./fix-utils");
+var _util = require("util");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
 *
@@ -14,7 +14,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 *
 * Shared modules for microservices of Melinda rest api batch import system
 *
-* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)
+* Copyright (C) 2020-2023 University Of Helsinki (The National Library Of Finland)
 *
 * This file is part of melinda-rest-api-commons
 *
@@ -36,6 +36,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 *
 */
 
+//import {sortFieldsBySubfieldValue, removeSubfield} from './fix-utils';
+
 function stripF884s(newRecord, options) {
   const debug = (0, _debug.default)('@natlibfi/melinda-rest-api-commons:fixRecord:stripF884s');
   const debugData = debug.extend('data');
@@ -53,35 +55,185 @@ function stripF884s(newRecord, options) {
   }) => code === '5' && value === 'MELINDA');
   const f884Melindas = newRecord.fields.filter(isMelindaf884);
   debugData(`Melinda's f884s (${f884Melindas.length}) \n ${JSON.stringify(f884Melindas)}`);
+  //debugData(`Melinda's f884s (${f884Melindas.length}) \n ${inspect(f884Melindas, {depth: 3})}`);
+
   if (f884Melindas.length < 2) {
-    debug(`Not enough Melinda's f884.s to filter (${f884Melindas.length})`);
+    debug(`Not enough Melinda's f884s to filter (${f884Melindas.length})`);
     return newRecord;
   }
 
-  // Sort fields by date subfield $g, so we'll keep the oldest one
-  const sortedFields = (0, _fixUtils.sortFieldsBySubfieldValue)(f884Melindas, 'g');
-  debugData(`Melinda's f884s sorted by 'g' - oldest first: (${sortedFields.length}) \n ${JSON.stringify(sortedFields)}`);
+  // Pick data (firstDate, lastDate, hash with latest date) for all conversion : source combinations
+  const results = f884Melindas.reduce((allResults, f884, index) => {
+    debugData(`All results: ${JSON.stringify(allResults)}`);
+    //debugData(`Handling field (${index}): ${inspect(f884, {depth: 3})}`);
+    debugData(`Handling field *(${index})*: ${JSON.stringify(f884)}`);
+    const conversion = findConversion(f884);
+    const source = findSource(f884);
+    const convSource = `${conversion}:${source}`;
+    const {
+      firstDate,
+      lastDate
+    } = findDates(f884);
+    const hash = findHash(f884);
 
-  // Drop fields that are similar without date subfield $g
-  const uniqFields = uniqWithOutSubfield(sortedFields, 'g');
-  debugData(`Melindas f884s uniqued without sf $g (${uniqFields.length}) \n ${JSON.stringify(uniqFields)}`);
+    // Find currently existing data for conversion : source combination
+    const currResult = allResults[convSource];
+    debugData(JSON.stringify(currResult));
 
-  // Replace original Melinda-f884s with remaining Melinda-f884s
-  // NOTE: this sorts MELINDA-f884s after possible other f884s
-  newRecord.removeFields(f884Melindas);
-  newRecord.insertFields(uniqFields);
-  return newRecord;
+    // If we do not have any current data, add data from field
+    if (!currResult) {
+      debug(`Add a new convSource ${convSource} to results`);
+      const newResult = {
+        conversion,
+        source,
+        firstDate,
+        lastDate,
+        hash
+      };
+      debugData(`- New result: ${JSON.stringify(newResult)}`);
+      return {
+        ...allResults,
+        [convSource]: newResult
+      };
+    }
+    // If we have current data, update it from the data from field, if needed
+    debug(`Update result for ${convSource}`);
+    debugData(`- Current result: ${JSON.stringify(currResult)}`);
+    const updatedResult = {
+      ...currResult,
+      firstDate: currResult.firstDate > firstDate && firstDate !== '00000000' ? firstDate : currResult.firstDate,
+      lastDate: currResult.lastDate < lastDate ? lastDate : currResult.lastDate,
+      hash: currResult.lastDate < lastDate && lastDate !== '00000000' && hash !== '0000000000000000000000000000000000000000000000000000000000000000' ? hash : currResult.hash
+    };
+    debugData(`- Updated result: ${JSON.stringify(updatedResult)}`);
+    return {
+      ...allResults,
+      [convSource]: updatedResult
+    };
+  }, {});
+  debugData(`RESULTS: ${JSON.stringify(results)}`);
+  const editedf884s = editFields(f884Melindas, results);
+  debug(`Edited fields (${editedf884s.length})`);
+  //debugData(inspect(editedf884s, {depth: 3}));
+  debugData(`${JSON.stringify(editedf884s)}`);
+
+  // We update each field based on the results we got from fields
+  // Note: we do not add $g:s or $k:s if the field doesn't have them
+  function editFields(fields, results) {
+    debug(`EDITING FIELDS (${fields.length})`);
+    const editedFields = fields.map(field => {
+      const convSource = `${findConversion(field)}:${findSource(field)}`;
+      debug(`Looking for: ${convSource}`);
+      if (convSource && results[convSource]) {
+        debugData(`Found: ${JSON.stringify(results[convSource])}`);
+        const firstDate = results[convSource].firstDate && results[convSource].firstDate !== '00000000' ? results[convSource].firstDate : '';
+        const lastDate = results[convSource].lastDate && results[convSource].lastDate !== '00000000' ? results[convSource].lastDate : '';
+        const source = results[convSource].source && results[convSource].source !== 'NO_SOURCE' ? results[convSource].source : '';
+        const hash = results[convSource].hash && results[convSource].hash !== '0000000000000000000000000000000000000000000000000000000000000000' ? results[convSource].hash : '';
+        const sfGAll = firstDate === lastDate ? `${firstDate}` : `${firstDate} - ${lastDate}`;
+        debugData(`EditedDates: ${sfGAll}`);
+        const sfKAll = `${source}:${hash}`;
+        const sfG = sfGAll.replace(/^ - /u, '').replace(/ - $/u, '');
+        const sfK = sfKAll.replace(/^:/u, '').replace(/:$/u, '');
+        return {
+          ...field,
+          subfields: field.subfields.map(subfield => {
+            // we don't get $g or $k if the original field doesn't have them
+            if (subfield.code === 'g') {
+              return {
+                code: subfield.code,
+                value: sfG
+              };
+            }
+            if (subfield.code === 'k') {
+              return {
+                code: subfield.code,
+                value: sfK
+              };
+            }
+            return subfield;
+          })
+        };
+      }
+      debug(`Not found: ${convSource}`);
+      return field;
+    });
+    return editedFields;
+  }
+
+  // we'll need to uniq these too
 
-  // Keep just first instance of each similar field, compare without subfield with subfieldCode
-  function uniqWithOutSubfield(fields, subfieldCode) {
+  const uniq884s = uniqFields(editedf884s);
+  debug(`UniqFields (${uniq884s.length})`);
+  debugData((0, _util.inspect)(uniq884s, {
+    depth: 3
+  }));
+  function uniqFields(fields) {
     return fields.reduce((uniq, field) => {
-      if (!uniq.some(f => _marcRecord.MarcRecord.isEqual((0, _fixUtils.removeSubfield)(f, subfieldCode), (0, _fixUtils.removeSubfield)(field, subfieldCode)))) {
-        // eslint-disable-line functional/no-conditional-statement
+      if (!uniq.some(f => _marcRecord.MarcRecord.isEqual(f, field))) {
+        // eslint-disable-line functional/no-conditional-statements
         uniq.push(field); // eslint-disable-line functional/immutable-data
       }
 
       return uniq;
     }, []);
   }
+  // Replace original Melinda-f884s with remaining Melinda-f884s
+  // NOTE: this sorts MELINDA-f884s after possible other f884s
+  newRecord.removeFields(f884Melindas);
+  newRecord.insertFields(uniq884s);
+  return newRecord;
+
+  // Find conversion:source pairs
+  // Find first date
+  // Find last date and last hash
+
+  function findConversion(f884) {
+    const [sfA] = f884.subfields.filter(subfield => subfield.code === 'a').map(subfield => subfield.value);
+    const conversion = sfA;
+    debugData(`Conversion: "${conversion}"`);
+    return conversion;
+  }
+  function findSource(f884) {
+    const [sfK] = f884.subfields.filter(subfield => subfield.code === 'k').map(subfield => subfield.value);
+    const source = sfK.replace(/:.*$/u, '');
+    if (source && source.length !== 64) {
+      debugData(`Source: "${source}"`);
+      return source;
+    }
+    const emptySource = 'NO_SOURCE';
+    debugData(`Source: "${emptySource}"`);
+    return emptySource;
+  }
+  function findHash(f884) {
+    const [sfK] = f884.subfields.filter(subfield => subfield.code === 'k').map(subfield => subfield.value);
+    const hash = sfK.replace(/^.*:/u, '');
+    if (hash && hash.length === 64) {
+      debugData(`Hash: "${hash}"`);
+      return hash;
+    }
+    const emptyHash = '0000000000000000000000000000000000000000000000000000000000000000';
+    debugData(`Hash: "${emptyHash}"`);
+    return emptyHash;
+  }
+  function findDates(f884) {
+    const [sfG] = f884.subfields.filter(subfield => subfield.code === 'g').map(subfield => subfield.value);
+    if (sfG && / - /u.test(sfG)) {
+      const firstDate = sfG.replace(/ - .*$/u, '').padStart(8, '0');
+      const lastDate = sfG.replace(/^.* - /u, '').padStart(8, '0');
+      debugData(`FirstDate: "${firstDate}", LastDate: "${lastDate}"`);
+      return {
+        firstDate,
+        lastDate
+      };
+    }
+    const firstDate = sfG ? sfG.padStart(8, '0') : '00000000';
+    const lastDate = sfG ? sfG.padStart(8, '0') : '00000000';
+    debugData(`FirstDate: "${firstDate}", LastDate: "${lastDate}"`);
+    return {
+      firstDate,
+      lastDate
+    };
+  }
 }
 //# sourceMappingURL=fix-strip-f884s.js.map

package/dist/helpers/fix-strip-f884s.js.map

@@ -1 +1 @@
-{"version":3,"file":"fix-strip-f884s.js","names":["stripF884s","newRecord","options","debug","createDebugLogger","debugData","extend","JSON","stringify","isMelindaf884","f","tag","subfields","some","code","value","f884Melindas","fields","filter","length","sortedFields","sortFieldsBySubfieldValue","uniqFields","uniqWithOutSubfield","removeFields","insertFields","subfieldCode","reduce","uniq","field","MarcRecord","isEqual","removeSubfield","push"],"sources":["../../src/helpers/fix-strip-f884s.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 {MarcRecord} from '@natlibfi/marc-record';\nimport createDebugLogger from 'debug';\nimport {sortFieldsBySubfieldValue, removeSubfield} from './fix-utils';\n\n\nexport function stripF884s(newRecord, options) {\n  const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons:fixRecord:stripF884s');\n  const debugData = debug.extend('data');\n\n  if (options !== true) {\n    debug(`NOT running stripF884s fixer, no options`);\n    return newRecord;\n  }\n\n  debug(`Running stripF884s fixer`);\n  debugData(`Options for stripF884s: ${JSON.stringify(options)}`);\n\n  // Handle only f884 with $5 MELINDA - let's no remove random f884s\n  const isMelindaf884 = f => f.tag === '884' && f.subfields.some(({code, value}) => code === '5' && value === 'MELINDA');\n\n  const f884Melindas = newRecord.fields.filter(isMelindaf884);\n  debugData(`Melinda's f884s (${f884Melindas.length}) \\n ${JSON.stringify(f884Melindas)}`);\n\n  if (f884Melindas.length < 2) {\n    debug(`Not enough Melinda's f884.s to filter (${f884Melindas.length})`);\n    return newRecord;\n  }\n\n  // Sort fields by date subfield $g, so we'll keep the oldest one\n  const sortedFields = sortFieldsBySubfieldValue(f884Melindas, 'g');\n  debugData(`Melinda's f884s sorted by 'g' - oldest first: (${sortedFields.length}) \\n ${JSON.stringify(sortedFields)}`);\n\n  // Drop fields that are similar without date subfield $g\n  const uniqFields = uniqWithOutSubfield(sortedFields, 'g');\n  debugData(`Melindas f884s uniqued without sf $g (${uniqFields.length}) \\n ${JSON.stringify(uniqFields)}`);\n\n  // Replace original Melinda-f884s with remaining Melinda-f884s\n  // NOTE: this sorts MELINDA-f884s after possible other f884s\n  newRecord.removeFields(f884Melindas);\n  newRecord.insertFields(uniqFields);\n  return newRecord;\n\n  // Keep just first instance of each similar field, compare without subfield with subfieldCode\n  function uniqWithOutSubfield(fields, subfieldCode) {\n    return fields.reduce((uniq, field) => {\n      if (!uniq.some(f => MarcRecord.isEqual(removeSubfield(f, subfieldCode), removeSubfield(field, subfieldCode)))) { // eslint-disable-line functional/no-conditional-statement\n        uniq.push(field); // eslint-disable-line functional/immutable-data\n      }\n\n      return uniq;\n    }, []);\n  }\n}\n"],"mappings":";;;;;;AA4BA;AACA;AACA;AAAsE;AA9BtE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAOO,SAASA,UAAU,CAACC,SAAS,EAAEC,OAAO,EAAE;EAC7C,MAAMC,KAAK,GAAG,IAAAC,cAAiB,EAAC,yDAAyD,CAAC;EAC1F,MAAMC,SAAS,GAAGF,KAAK,CAACG,MAAM,CAAC,MAAM,CAAC;EAEtC,IAAIJ,OAAO,KAAK,IAAI,EAAE;IACpBC,KAAK,CAAE,0CAAyC,CAAC;IACjD,OAAOF,SAAS;EAClB;EAEAE,KAAK,CAAE,0BAAyB,CAAC;EACjCE,SAAS,CAAE,2BAA0BE,IAAI,CAACC,SAAS,CAACN,OAAO,CAAE,EAAC,CAAC;;EAE/D;EACA,MAAMO,aAAa,GAAGC,CAAC,IAAIA,CAAC,CAACC,GAAG,KAAK,KAAK,IAAID,CAAC,CAACE,SAAS,CAACC,IAAI,CAAC,CAAC;IAACC,IAAI;IAAEC;EAAK,CAAC,KAAKD,IAAI,KAAK,GAAG,IAAIC,KAAK,KAAK,SAAS,CAAC;EAEtH,MAAMC,YAAY,GAAGf,SAAS,CAACgB,MAAM,CAACC,MAAM,CAACT,aAAa,CAAC;EAC3DJ,SAAS,CAAE,oBAAmBW,YAAY,CAACG,MAAO,QAAOZ,IAAI,CAACC,SAAS,CAACQ,YAAY,CAAE,EAAC,CAAC;EAExF,IAAIA,YAAY,CAACG,MAAM,GAAG,CAAC,EAAE;IAC3BhB,KAAK,CAAE,0CAAyCa,YAAY,CAACG,MAAO,GAAE,CAAC;IACvE,OAAOlB,SAAS;EAClB;;EAEA;EACA,MAAMmB,YAAY,GAAG,IAAAC,mCAAyB,EAACL,YAAY,EAAE,GAAG,CAAC;EACjEX,SAAS,CAAE,kDAAiDe,YAAY,CAACD,MAAO,QAAOZ,IAAI,CAACC,SAAS,CAACY,YAAY,CAAE,EAAC,CAAC;;EAEtH;EACA,MAAME,UAAU,GAAGC,mBAAmB,CAACH,YAAY,EAAE,GAAG,CAAC;EACzDf,SAAS,CAAE,yCAAwCiB,UAAU,CAACH,MAAO,QAAOZ,IAAI,CAACC,SAAS,CAACc,UAAU,CAAE,EAAC,CAAC;;EAEzG;EACA;EACArB,SAAS,CAACuB,YAAY,CAACR,YAAY,CAAC;EACpCf,SAAS,CAACwB,YAAY,CAACH,UAAU,CAAC;EAClC,OAAOrB,SAAS;;EAEhB;EACA,SAASsB,mBAAmB,CAACN,MAAM,EAAES,YAAY,EAAE;IACjD,OAAOT,MAAM,CAACU,MAAM,CAAC,CAACC,IAAI,EAAEC,KAAK,KAAK;MACpC,IAAI,CAACD,IAAI,CAACf,IAAI,CAACH,CAAC,IAAIoB,sBAAU,CAACC,OAAO,CAAC,IAAAC,wBAAc,EAACtB,CAAC,EAAEgB,YAAY,CAAC,EAAE,IAAAM,wBAAc,EAACH,KAAK,EAAEH,YAAY,CAAC,CAAC,CAAC,EAAE;QAAE;QAC/GE,IAAI,CAACK,IAAI,CAACJ,KAAK,CAAC,CAAC,CAAC;MACpB;;MAEA,OAAOD,IAAI;IACb,CAAC,EAAE,EAAE,CAAC;EACR;AACF"}
+{"version":3,"file":"fix-strip-f884s.js","names":["_marcRecord","require","_debug","_interopRequireDefault","_util","obj","__esModule","default","stripF884s","newRecord","options","debug","createDebugLogger","debugData","extend","JSON","stringify","isMelindaf884","f","tag","subfields","some","code","value","f884Melindas","fields","filter","length","results","reduce","allResults","f884","index","conversion","findConversion","source","findSource","convSource","firstDate","lastDate","findDates","hash","findHash","currResult","newResult","updatedResult","editedf884s","editFields","editedFields","map","field","sfGAll","sfKAll","sfG","replace","sfK","subfield","uniq884s","uniqFields","inspect","depth","uniq","MarcRecord","isEqual","push","removeFields","insertFields","sfA","emptySource","emptyHash","test","padStart"],"sources":["../../src/helpers/fix-strip-f884s.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-2023 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 {MarcRecord} from '@natlibfi/marc-record';\nimport createDebugLogger from 'debug';\n//import {sortFieldsBySubfieldValue, removeSubfield} from './fix-utils';\nimport {inspect} from 'util';\n\nexport function stripF884s(newRecord, options) {\n  const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons:fixRecord:stripF884s');\n  const debugData = debug.extend('data');\n\n  if (options !== true) {\n    debug(`NOT running stripF884s fixer, no options`);\n    return newRecord;\n  }\n\n  debug(`Running stripF884s fixer`);\n  debugData(`Options for stripF884s: ${JSON.stringify(options)}`);\n\n  // Handle only f884 with $5 MELINDA - let's no remove random f884s\n  const isMelindaf884 = f => f.tag === '884' && f.subfields.some(({code, value}) => code === '5' && value === 'MELINDA');\n\n  const f884Melindas = newRecord.fields.filter(isMelindaf884);\n  debugData(`Melinda's f884s (${f884Melindas.length}) \\n ${JSON.stringify(f884Melindas)}`);\n  //debugData(`Melinda's f884s (${f884Melindas.length}) \\n ${inspect(f884Melindas, {depth: 3})}`);\n\n  if (f884Melindas.length < 2) {\n    debug(`Not enough Melinda's f884s to filter (${f884Melindas.length})`);\n    return newRecord;\n  }\n\n  // Pick data (firstDate, lastDate, hash with latest date) for all conversion : source combinations\n  const results = f884Melindas.reduce((allResults, f884, index) => {\n    debugData(`All results: ${JSON.stringify(allResults)}`);\n    //debugData(`Handling field (${index}): ${inspect(f884, {depth: 3})}`);\n    debugData(`Handling field *(${index})*: ${JSON.stringify(f884)}`);\n\n    const conversion = findConversion(f884);\n    const source = findSource(f884);\n    const convSource = `${conversion}:${source}`;\n    const {firstDate, lastDate} = findDates(f884);\n    const hash = findHash(f884);\n\n    // Find currently existing data for conversion : source combination\n    const currResult = allResults[convSource];\n    debugData(JSON.stringify(currResult));\n\n    // If we do not have any current data, add data from field\n    if (!currResult) {\n      debug(`Add a new convSource ${convSource} to results`);\n      const newResult = {\n        conversion,\n        source,\n        firstDate,\n        lastDate,\n        hash\n      };\n      debugData(`- New result: ${JSON.stringify(newResult)}`);\n      return {\n        ...allResults,\n        [convSource]: newResult\n      };\n    }\n    // If we have current data, update it from the data from field, if needed\n    debug(`Update result for ${convSource}`);\n    debugData(`- Current result: ${JSON.stringify(currResult)}`);\n\n    const updatedResult = {\n      ...currResult,\n      firstDate: currResult.firstDate > firstDate && firstDate !== '00000000' ? firstDate : currResult.firstDate,\n      lastDate: currResult.lastDate < lastDate ? lastDate : currResult.lastDate,\n      hash: currResult.lastDate < lastDate && lastDate !== '00000000' && hash !== '0000000000000000000000000000000000000000000000000000000000000000' ? hash : currResult.hash\n    };\n    debugData(`- Updated result: ${JSON.stringify(updatedResult)}`);\n    return {\n      ...allResults,\n      [convSource]: updatedResult\n    };\n  }, {});\n\n  debugData(`RESULTS: ${JSON.stringify(results)}`);\n  const editedf884s = editFields(f884Melindas, results);\n\n  debug(`Edited fields (${editedf884s.length})`);\n  //debugData(inspect(editedf884s, {depth: 3}));\n  debugData(`${JSON.stringify(editedf884s)}`);\n\n  // We update each field based on the results we got from fields\n  // Note: we do not add $g:s or $k:s if the field doesn't have them\n  function editFields(fields, results) {\n    debug(`EDITING FIELDS (${fields.length})`);\n    const editedFields = fields.map((field) => {\n      const convSource = `${findConversion(field)}:${findSource(field)}`;\n      debug(`Looking for: ${convSource}`);\n\n      if (convSource && results[convSource]) {\n        debugData(`Found: ${JSON.stringify(results[convSource])}`);\n        const firstDate = results[convSource].firstDate && results[convSource].firstDate !== '00000000' ? results[convSource].firstDate : '';\n        const lastDate = results[convSource].lastDate && results[convSource].lastDate !== '00000000' ? results[convSource].lastDate : '';\n\n        const source = results[convSource].source && results[convSource].source !== 'NO_SOURCE' ? results[convSource].source : '';\n        const hash = results[convSource].hash && results[convSource].hash !== '0000000000000000000000000000000000000000000000000000000000000000' ? results[convSource].hash : '';\n\n        const sfGAll = firstDate === lastDate ? `${firstDate}` : `${firstDate} - ${lastDate}`;\n        debugData(`EditedDates: ${sfGAll}`);\n        const sfKAll = `${source}:${hash}`;\n\n        const sfG = sfGAll.replace(/^ - /u, '').replace(/ - $/u, '');\n        const sfK = sfKAll.replace(/^:/u, '').replace(/:$/u, '');\n\n        return {\n          ...field,\n          subfields: field.subfields.map(subfield => {\n\n            // we don't get $g or $k if the original field doesn't have them\n            if (subfield.code === 'g') {\n              return {\n                code: subfield.code,\n                value: sfG\n              };\n            }\n\n            if (subfield.code === 'k') {\n              return {\n                code: subfield.code,\n                value: sfK\n              };\n            }\n\n            return subfield;\n          })\n\n        };\n      }\n      debug(`Not found: ${convSource}`);\n      return field;\n    });\n    return editedFields;\n  }\n\n  // we'll need to uniq these too\n\n  const uniq884s = uniqFields(editedf884s);\n  debug(`UniqFields (${uniq884s.length})`);\n  debugData(inspect(uniq884s, {depth: 3}));\n\n\n  function uniqFields(fields) {\n    return fields.reduce((uniq, field) => {\n      if (!uniq.some(f => MarcRecord.isEqual(f, field))) { // eslint-disable-line functional/no-conditional-statements\n        uniq.push(field); // eslint-disable-line functional/immutable-data\n      }\n\n      return uniq;\n    }, []);\n  }\n  // Replace original Melinda-f884s with remaining Melinda-f884s\n  // NOTE: this sorts MELINDA-f884s after possible other f884s\n  newRecord.removeFields(f884Melindas);\n  newRecord.insertFields(uniq884s);\n\n  return newRecord;\n\n\n  // Find conversion:source pairs\n  // Find first date\n  // Find last date and last hash\n\n\n  function findConversion(f884) {\n    const [sfA] = f884.subfields.filter((subfield) => subfield.code === 'a').map(subfield => subfield.value);\n    const conversion = sfA;\n    debugData(`Conversion: \"${conversion}\"`);\n    return conversion;\n  }\n\n  function findSource(f884) {\n    const [sfK] = f884.subfields.filter((subfield) => subfield.code === 'k').map(subfield => subfield.value);\n    const source = sfK.replace(/:.*$/u, '');\n    if (source && source.length !== 64) {\n      debugData(`Source: \"${source}\"`);\n      return source;\n    }\n    const emptySource = 'NO_SOURCE';\n    debugData(`Source: \"${emptySource}\"`);\n    return emptySource;\n  }\n\n  function findHash(f884) {\n    const [sfK] = f884.subfields.filter((subfield) => subfield.code === 'k').map(subfield => subfield.value);\n    const hash = sfK.replace(/^.*:/u, '');\n    if (hash && hash.length === 64) {\n      debugData(`Hash: \"${hash}\"`);\n      return hash;\n    }\n    const emptyHash = '0000000000000000000000000000000000000000000000000000000000000000';\n    debugData(`Hash: \"${emptyHash}\"`);\n    return emptyHash;\n  }\n\n  function findDates(f884) {\n    const [sfG] = f884.subfields.filter((subfield) => subfield.code === 'g').map(subfield => subfield.value);\n    if (sfG && (/ - /u).test(sfG)) {\n      const firstDate = sfG.replace(/ - .*$/u, '').padStart(8, '0');\n      const lastDate = sfG.replace(/^.* - /u, '').padStart(8, '0');\n      debugData(`FirstDate: \"${firstDate}\", LastDate: \"${lastDate}\"`);\n      return {firstDate, lastDate};\n    }\n    const firstDate = sfG ? sfG.padStart(8, '0') : '00000000';\n    const lastDate = sfG ? sfG.padStart(8, '0') : '00000000';\n\n    debugData(`FirstDate: \"${firstDate}\", LastDate: \"${lastDate}\"`);\n    return {firstDate, lastDate};\n  }\n\n}\n"],"mappings":"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"}

package/dist/helpers/fix-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"fix-utils.js","names":["removeSubfield","field","code","isNaN","tag","parseInt","filteredSubfields","subfields","filter","sf","length","ind1","ind2","sortFieldsBySubfieldValue","fields","subfieldCode","sort","a","b","a1value","getFirstSubfieldValue","b1value","subs","subf","value"],"sources":["../../src/helpers/fix-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-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\nexport function removeSubfield(field, code) {\n\n  // Handle non-numeric fields, and fields with a numeric tag of 010 and greater\n  // Aleph's FMT as a controlfield might be a problem\n  if (!isNaN(field.tag) && parseInt(field.tag, 10) >= 10) {\n\n    const filteredSubfields = field.subfields.filter(sf => sf.code !== code);\n\n    // Remove whole field if there are no subfields left\n    if (filteredSubfields.length < 1) {\n      return false;\n    }\n\n    return {\n      tag: field.tag,\n      ind1: field.ind1,\n      ind2: field.ind2,\n      subfields: filteredSubfields\n    };\n  }\n  // return controlFields as is\n  return field;\n}\n\n\n// sort fields by value of each fields first subfield with subfielCode\nexport function sortFieldsBySubfieldValue(fields, subfieldCode) {\n  return [...fields].sort((a, b) => {\n    const a1value = getFirstSubfieldValue(a, subfieldCode);\n    const b1value = getFirstSubfieldValue(b, subfieldCode);\n    if (a1value && !b1value) {\n      return -1;\n    }\n    if (!a1value && b1value) {\n      return 1;\n    }\n    if (a1value > b1value) {\n      return 1;\n    }\n    if (b1value > a1value) {\n      return -1;\n    }\n    return 0;\n  });\n  // get value for the for instance of subfield with subfieldCode\n  function getFirstSubfieldValue(field, subfieldCode) {\n    const subs = field.subfields ? field.subfields.filter(subf => subf.code === subfieldCode) : [];\n    return subs.length > 0 ? subs[0].value : '';\n  }\n}\n"],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEO,SAASA,cAAc,CAACC,KAAK,EAAEC,IAAI,EAAE;EAE1C;EACA;EACA,IAAI,CAACC,KAAK,CAACF,KAAK,CAACG,GAAG,CAAC,IAAIC,QAAQ,CAACJ,KAAK,CAACG,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;IAEtD,MAAME,iBAAiB,GAAGL,KAAK,CAACM,SAAS,CAACC,MAAM,CAACC,EAAE,IAAIA,EAAE,CAACP,IAAI,KAAKA,IAAI,CAAC;;IAExE;IACA,IAAII,iBAAiB,CAACI,MAAM,GAAG,CAAC,EAAE;MAChC,OAAO,KAAK;IACd;IAEA,OAAO;MACLN,GAAG,EAAEH,KAAK,CAACG,GAAG;MACdO,IAAI,EAAEV,KAAK,CAACU,IAAI;MAChBC,IAAI,EAAEX,KAAK,CAACW,IAAI;MAChBL,SAAS,EAAED;IACb,CAAC;EACH;EACA;EACA,OAAOL,KAAK;AACd;;AAGA;AACO,SAASY,yBAAyB,CAACC,MAAM,EAAEC,YAAY,EAAE;EAC9D,OAAO,CAAC,GAAGD,MAAM,CAAC,CAACE,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAK;IAChC,MAAMC,OAAO,GAAGC,qBAAqB,CAACH,CAAC,EAAEF,YAAY,CAAC;IACtD,MAAMM,OAAO,GAAGD,qBAAqB,CAACF,CAAC,EAAEH,YAAY,CAAC;IACtD,IAAII,OAAO,IAAI,CAACE,OAAO,EAAE;MACvB,OAAO,CAAC,CAAC;IACX;IACA,IAAI,CAACF,OAAO,IAAIE,OAAO,EAAE;MACvB,OAAO,CAAC;IACV;IACA,IAAIF,OAAO,GAAGE,OAAO,EAAE;MACrB,OAAO,CAAC;IACV;IACA,IAAIA,OAAO,GAAGF,OAAO,EAAE;MACrB,OAAO,CAAC,CAAC;IACX;IACA,OAAO,CAAC;EACV,CAAC,CAAC;EACF;EACA,SAASC,qBAAqB,CAACnB,KAAK,EAAEc,YAAY,EAAE;IAClD,MAAMO,IAAI,GAAGrB,KAAK,CAACM,SAAS,GAAGN,KAAK,CAACM,SAAS,CAACC,MAAM,CAACe,IAAI,IAAIA,IAAI,CAACrB,IAAI,KAAKa,YAAY,CAAC,GAAG,EAAE;IAC9F,OAAOO,IAAI,CAACZ,MAAM,GAAG,CAAC,GAAGY,IAAI,CAAC,CAAC,CAAC,CAACE,KAAK,GAAG,EAAE;EAC7C;AACF"}
+{"version":3,"file":"fix-utils.js","names":["removeSubfield","field","code","isNaN","tag","parseInt","filteredSubfields","subfields","filter","sf","length","ind1","ind2","sortFieldsBySubfieldValue","fields","subfieldCode","sort","a","b","a1value","getFirstSubfieldValue","b1value","subs","subf","value"],"sources":["../../src/helpers/fix-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-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\nexport function removeSubfield(field, code) {\n\n  // Handle non-numeric fields, and fields with a numeric tag of 010 and greater\n  // Aleph's FMT as a controlfield might be a problem\n  if (!isNaN(field.tag) && parseInt(field.tag, 10) >= 10) {\n\n    const filteredSubfields = field.subfields.filter(sf => sf.code !== code);\n\n    // Remove whole field if there are no subfields left\n    if (filteredSubfields.length < 1) {\n      return false;\n    }\n\n    return {\n      tag: field.tag,\n      ind1: field.ind1,\n      ind2: field.ind2,\n      subfields: filteredSubfields\n    };\n  }\n  // return controlFields as is\n  return field;\n}\n\n\n// sort fields by value of each fields first subfield with subfielCode\nexport function sortFieldsBySubfieldValue(fields, subfieldCode) {\n  return [...fields].sort((a, b) => {\n    const a1value = getFirstSubfieldValue(a, subfieldCode);\n    const b1value = getFirstSubfieldValue(b, subfieldCode);\n    if (a1value && !b1value) {\n      return -1;\n    }\n    if (!a1value && b1value) {\n      return 1;\n    }\n    if (a1value > b1value) {\n      return 1;\n    }\n    if (b1value > a1value) {\n      return -1;\n    }\n    return 0;\n  });\n  // get value for the for instance of subfield with subfieldCode\n  function getFirstSubfieldValue(field, subfieldCode) {\n    const subs = field.subfields ? field.subfields.filter(subf => subf.code === subfieldCode) : [];\n    return subs.length > 0 ? subs[0].value : '';\n  }\n}\n"],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEO,SAASA,cAAcA,CAACC,KAAK,EAAEC,IAAI,EAAE;EAE1C;EACA;EACA,IAAI,CAACC,KAAK,CAACF,KAAK,CAACG,GAAG,CAAC,IAAIC,QAAQ,CAACJ,KAAK,CAACG,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;IAEtD,MAAME,iBAAiB,GAAGL,KAAK,CAACM,SAAS,CAACC,MAAM,CAACC,EAAE,IAAIA,EAAE,CAACP,IAAI,KAAKA,IAAI,CAAC;;IAExE;IACA,IAAII,iBAAiB,CAACI,MAAM,GAAG,CAAC,EAAE;MAChC,OAAO,KAAK;IACd;IAEA,OAAO;MACLN,GAAG,EAAEH,KAAK,CAACG,GAAG;MACdO,IAAI,EAAEV,KAAK,CAACU,IAAI;MAChBC,IAAI,EAAEX,KAAK,CAACW,IAAI;MAChBL,SAAS,EAAED;IACb,CAAC;EACH;EACA;EACA,OAAOL,KAAK;AACd;;AAGA;AACO,SAASY,yBAAyBA,CAACC,MAAM,EAAEC,YAAY,EAAE;EAC9D,OAAO,CAAC,GAAGD,MAAM,CAAC,CAACE,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAK;IAChC,MAAMC,OAAO,GAAGC,qBAAqB,CAACH,CAAC,EAAEF,YAAY,CAAC;IACtD,MAAMM,OAAO,GAAGD,qBAAqB,CAACF,CAAC,EAAEH,YAAY,CAAC;IACtD,IAAII,OAAO,IAAI,CAACE,OAAO,EAAE;MACvB,OAAO,CAAC,CAAC;IACX;IACA,IAAI,CAACF,OAAO,IAAIE,OAAO,EAAE;MACvB,OAAO,CAAC;IACV;IACA,IAAIF,OAAO,GAAGE,OAAO,EAAE;MACrB,OAAO,CAAC;IACV;IACA,IAAIA,OAAO,GAAGF,OAAO,EAAE;MACrB,OAAO,CAAC,CAAC;IACX;IACA,OAAO,CAAC;EACV,CAAC,CAAC;EACF;EACA,SAASC,qBAAqBA,CAACnB,KAAK,EAAEc,YAAY,EAAE;IAClD,MAAMO,IAAI,GAAGrB,KAAK,CAACM,SAAS,GAAGN,KAAK,CAACM,SAAS,CAACC,MAAM,CAACe,IAAI,IAAIA,IAAI,CAACrB,IAAI,KAAKa,YAAY,CAAC,GAAG,EAAE;IAC9F,OAAOO,IAAI,CAACZ,MAAM,GAAG,CAAC,GAAGY,IAAI,CAAC,CAAC,CAAC,CAACE,KAAK,GAAG,EAAE;EAC7C;AACF"}

package/dist/helpers/fix.js

@@ -126,7 +126,8 @@ function generateMissingSIDs(record, options) {
   const fSIDs = sidsToSidInfo(record.get(/^SID$/u));
   const sidsToBeAdded = genNewSids(fSIDs.length === 0 ? f035s
   // test that SIDs are not there yet
-  : f035s.filter(f035SidInfo => fSIDs.some(fSIDInfo => f035SidInfo.SID !== fSIDInfo.SID && f035SidInfo.value !== fSIDInfo.value)));
+  : f035s.filter(f035SidInfo => !fSIDs.some(fSIDInfo => f035SidInfo.SID === fSIDInfo.SID && f035SidInfo.value === fSIDInfo.value)));
+  debugData(`Adding (${sidsToBeAdded.length}) SIDs: ${JSON.stringify(sidsToBeAdded)}`);
 
   // Add new SIDs
   sidsToBeAdded.forEach(sidField => record.insertField(sidField));

package/dist/helpers/fix.js.map

@@ -1 +1 @@
-{"version":3,"file":"fix.js","names":["logger","createLogger","debug","createDebugLogger","debugData","extend","fixRecord","record","settings","verbose","JSON","stringify","newRecord","MarcRecord","clone","subfieldValues","generateMissingSIDsOptions","generateMissingSIDs","undefined","newRecord1","replacePrefixesOptions","replacePrefixes","newRecord2","replaceAllPrefixes","newRecord3","handleTempUrns","newRecord4","stripF884s","toObject","length","forEach","options","replacePrefix","oldPrefix","newPrefix","prefixReplaceCodes","pattern","replacement","getDatafields","field","subfields","filter","code","includes","subfield","value","replace","f035Filters","fSIDFilters","f035s","f035ToSidInfo","get","fSIDs","sidsToSidInfo","sidsToBeAdded","genNewSids","f035SidInfo","some","fSIDInfo","SID","sidField","insertField","map","sidInfo","tag","ind1","ind2","SIDs","flatMap","sub","wantedSub","regexp","test","findIndex","slice","indexOf"],"sources":["../../src/helpers/fix.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 {MarcRecord} from '@natlibfi/marc-record';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport createDebugLogger from 'debug';\n\nimport {handleTempUrns} from './fix-handle-tempurns';\nimport {stripF884s} from './fix-strip-f884s';\n\nexport * from './fix-constants';\n\nconst logger = createLogger();\nconst debug = createDebugLogger('@natlibfi/melinda-rest-api-commons:fixRecord');\nconst debugData = debug.extend('data');\n\nexport function fixRecord(record, settings = {}) {\n\n  logger.verbose(`We will apply formatting to the record according to settings: ${JSON.stringify(settings)}`);\n  const newRecord = MarcRecord.clone(record, {subfieldValues: false});\n  debugData(`settings: ${JSON.stringify(settings)}`);\n\n  // We should handle these in some prettier way ...\n\n  // Fix 1, generate SIDs\n  const generateMissingSIDsOptions = settings.generateMissingSIDs || undefined;\n  const newRecord1 = generateMissingSIDs(newRecord, generateMissingSIDsOptions);\n\n  // Fix 2, replace identifier prefixes\n  const replacePrefixesOptions = settings.replacePrefixes || [];\n  const newRecord2 = replaceAllPrefixes(newRecord1, replacePrefixesOptions);\n\n  // Fix 3, handle temporary URNs from legal deposit record import\n  const newRecord3 = handleTempUrns(newRecord2, settings.handleTempUrns);\n\n  // Fix 4, strip extra field 884s\n  const newRecord4 = stripF884s(newRecord3, settings.stripF884s);\n\n  return newRecord4.toObject();\n\n}\n\n\nfunction replaceAllPrefixes(record, replacePrefixesOptions) {\n  if (replacePrefixesOptions.length < 1) {\n    debug(`NOT running replacePrefixes, no options`);\n    return record;\n  }\n\n  debug(`Running replacePrefixes fixer`);\n  debugData(`replacePrefixesOptions: ${JSON.stringify(replacePrefixesOptions)}`);\n\n  replacePrefixesOptions.forEach(options => {\n    replacePrefix(record, options);\n  });\n  return record;\n}\n\n\n// Replace prefix in all specified subfields\nfunction replacePrefix(record, options) {\n  const {oldPrefix, newPrefix, prefixReplaceCodes} = options;\n  debug(`Replacing ${oldPrefix} with ${newPrefix} in subfields ${prefixReplaceCodes}`);\n  const pattern = `(${oldPrefix})`;\n  const replacement = `(${newPrefix})`;\n  record.getDatafields()\n    .forEach(field => {\n      field.subfields\n        .filter(({code}) => prefixReplaceCodes.includes(code))\n        .forEach(subfield => {\n          subfield.value = subfield.value.replace(pattern, replacement); // eslint-disable-line functional/immutable-data\n        });\n    });\n  return record;\n}\n\n\nfunction generateMissingSIDs(record, options) {\n\n  const f035Filters = options && options.f035Filters ? options.f035Filters : [];\n  const fSIDFilters = options && options.fSIDFilters ? options.fSIDFilters : [];\n\n  if (f035Filters.length !== fSIDFilters.length || f035Filters.length < 1 || fSIDFilters.length < 1) {\n    debug(`NOT running generateMissingsSIDs, no options`);\n    return record;\n  }\n\n  debug(`Running generateMissingSIDs fixer`);\n  debugData(`generateMissingSIDs options: ${JSON.stringify(options)}`);\n\n  const f035s = f035ToSidInfo(record.get(/^035$/u));\n  const fSIDs = sidsToSidInfo(record.get(/^SID$/u));\n\n  const sidsToBeAdded = genNewSids(fSIDs.length === 0\n    ? f035s\n  // test that SIDs are not there yet\n    : f035s.filter(f035SidInfo => fSIDs.some(fSIDInfo => f035SidInfo.SID !== fSIDInfo.SID && f035SidInfo.value !== fSIDInfo.value)));\n\n  // Add new SIDs\n  sidsToBeAdded.forEach(sidField => record.insertField(sidField));\n  return record;\n\n  function genNewSids(sidsToBeAdded) {\n    return sidsToBeAdded.map(sidInfo => ({tag: 'SID', ind1: ' ', ind2: ' ', subfields: [{code: 'c', value: sidInfo.value}, {code: 'b', value: sidInfo.SID}]}));\n  }\n\n  function sidsToSidInfo(SIDs) {\n    return SIDs.flatMap(({subfields}) => {\n      const [SID] = subfields.filter(sub => sub.code === 'b' && fSIDFilters.includes(sub.value)).map(sub => sub.value);\n      const [value] = subfields.filter(sub => sub.code === 'c' && sub.value !== undefined).map(sub => sub.value);\n\n      if (SID && value) {\n        return {\n          SID,\n          value\n        };\n      }\n\n      return undefined;\n    }).filter(value => value !== undefined);\n  }\n\n  function f035ToSidInfo(f035s) {\n    return f035s.flatMap(({subfields}) => {\n      const [wantedSub] = subfields.filter(sub => sub.code === 'a' && f035Filters.some(regexp => regexp.test(sub.value)));\n\n      if (wantedSub) {\n        return {\n          SID: fSIDFilters[f035Filters.findIndex(regexp => regexp.test(wantedSub.value))],\n          value: wantedSub.value.slice(wantedSub.value.indexOf(')') + 1)\n        };\n      }\n\n      return undefined;\n    }).filter(value => value !== undefined);\n  }\n}\n\n\n"],"mappings":"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"}
+{"version":3,"file":"fix.js","names":["_marcRecord","require","_melindaBackendCommons","_debug","_interopRequireDefault","_fixHandleTempurns","_fixStripF884s","_fixConstants","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","obj","__esModule","default","logger","createLogger","debug","createDebugLogger","debugData","extend","fixRecord","record","settings","verbose","JSON","stringify","newRecord","MarcRecord","clone","subfieldValues","generateMissingSIDsOptions","generateMissingSIDs","undefined","newRecord1","replacePrefixesOptions","replacePrefixes","newRecord2","replaceAllPrefixes","newRecord3","handleTempUrns","newRecord4","stripF884s","toObject","length","options","replacePrefix","oldPrefix","newPrefix","prefixReplaceCodes","pattern","replacement","getDatafields","field","subfields","filter","code","includes","subfield","value","replace","f035Filters","fSIDFilters","f035s","f035ToSidInfo","fSIDs","sidsToSidInfo","sidsToBeAdded","genNewSids","f035SidInfo","some","fSIDInfo","SID","sidField","insertField","map","sidInfo","tag","ind1","ind2","SIDs","flatMap","sub","wantedSub","regexp","test","findIndex","slice","indexOf"],"sources":["../../src/helpers/fix.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 {MarcRecord} from '@natlibfi/marc-record';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport createDebugLogger from 'debug';\n\nimport {handleTempUrns} from './fix-handle-tempurns';\nimport {stripF884s} from './fix-strip-f884s';\n\nexport * from './fix-constants';\n\nconst logger = createLogger();\nconst debug = createDebugLogger('@natlibfi/melinda-rest-api-commons:fixRecord');\nconst debugData = debug.extend('data');\n\nexport function fixRecord(record, settings = {}) {\n\n  logger.verbose(`We will apply formatting to the record according to settings: ${JSON.stringify(settings)}`);\n  const newRecord = MarcRecord.clone(record, {subfieldValues: false});\n  debugData(`settings: ${JSON.stringify(settings)}`);\n\n  // We should handle these in some prettier way ...\n\n  // Fix 1, generate SIDs\n  const generateMissingSIDsOptions = settings.generateMissingSIDs || undefined;\n  const newRecord1 = generateMissingSIDs(newRecord, generateMissingSIDsOptions);\n\n  // Fix 2, replace identifier prefixes\n  const replacePrefixesOptions = settings.replacePrefixes || [];\n  const newRecord2 = replaceAllPrefixes(newRecord1, replacePrefixesOptions);\n\n  // Fix 3, handle temporary URNs from legal deposit record import\n  const newRecord3 = handleTempUrns(newRecord2, settings.handleTempUrns);\n\n  // Fix 4, strip extra field 884s\n  const newRecord4 = stripF884s(newRecord3, settings.stripF884s);\n\n  return newRecord4.toObject();\n\n}\n\n\nfunction replaceAllPrefixes(record, replacePrefixesOptions) {\n  if (replacePrefixesOptions.length < 1) {\n    debug(`NOT running replacePrefixes, no options`);\n    return record;\n  }\n\n  debug(`Running replacePrefixes fixer`);\n  debugData(`replacePrefixesOptions: ${JSON.stringify(replacePrefixesOptions)}`);\n\n  replacePrefixesOptions.forEach(options => {\n    replacePrefix(record, options);\n  });\n  return record;\n}\n\n\n// Replace prefix in all specified subfields\nfunction replacePrefix(record, options) {\n  const {oldPrefix, newPrefix, prefixReplaceCodes} = options;\n  debug(`Replacing ${oldPrefix} with ${newPrefix} in subfields ${prefixReplaceCodes}`);\n  const pattern = `(${oldPrefix})`;\n  const replacement = `(${newPrefix})`;\n  record.getDatafields()\n    .forEach(field => {\n      field.subfields\n        .filter(({code}) => prefixReplaceCodes.includes(code))\n        .forEach(subfield => {\n          subfield.value = subfield.value.replace(pattern, replacement); // eslint-disable-line functional/immutable-data\n        });\n    });\n  return record;\n}\n\n\nfunction generateMissingSIDs(record, options) {\n\n  const f035Filters = options && options.f035Filters ? options.f035Filters : [];\n  const fSIDFilters = options && options.fSIDFilters ? options.fSIDFilters : [];\n\n  if (f035Filters.length !== fSIDFilters.length || f035Filters.length < 1 || fSIDFilters.length < 1) {\n    debug(`NOT running generateMissingsSIDs, no options`);\n    return record;\n  }\n\n  debug(`Running generateMissingSIDs fixer`);\n  debugData(`generateMissingSIDs options: ${JSON.stringify(options)}`);\n\n  const f035s = f035ToSidInfo(record.get(/^035$/u));\n  const fSIDs = sidsToSidInfo(record.get(/^SID$/u));\n\n  const sidsToBeAdded = genNewSids(fSIDs.length === 0\n    ? f035s\n  // test that SIDs are not there yet\n    : f035s.filter(f035SidInfo => !fSIDs.some(fSIDInfo => f035SidInfo.SID === fSIDInfo.SID && f035SidInfo.value === fSIDInfo.value)));\n\n  debugData(`Adding (${sidsToBeAdded.length}) SIDs: ${JSON.stringify(sidsToBeAdded)}`);\n\n  // Add new SIDs\n  sidsToBeAdded.forEach(sidField => record.insertField(sidField));\n  return record;\n\n  function genNewSids(sidsToBeAdded) {\n    return sidsToBeAdded.map(sidInfo => ({tag: 'SID', ind1: ' ', ind2: ' ', subfields: [{code: 'c', value: sidInfo.value}, {code: 'b', value: sidInfo.SID}]}));\n  }\n\n  function sidsToSidInfo(SIDs) {\n    return SIDs.flatMap(({subfields}) => {\n      const [SID] = subfields.filter(sub => sub.code === 'b' && fSIDFilters.includes(sub.value)).map(sub => sub.value);\n      const [value] = subfields.filter(sub => sub.code === 'c' && sub.value !== undefined).map(sub => sub.value);\n\n      if (SID && value) {\n        return {\n          SID,\n          value\n        };\n      }\n\n      return undefined;\n    }).filter(value => value !== undefined);\n  }\n\n  function f035ToSidInfo(f035s) {\n    return f035s.flatMap(({subfields}) => {\n      const [wantedSub] = subfields.filter(sub => sub.code === 'a' && f035Filters.some(regexp => regexp.test(sub.value)));\n\n      if (wantedSub) {\n        return {\n          SID: fSIDFilters[f035Filters.findIndex(regexp => regexp.test(wantedSub.value))],\n          value: wantedSub.value.slice(wantedSub.value.indexOf(')') + 1)\n        };\n      }\n\n      return undefined;\n    }).filter(value => value !== undefined);\n  }\n}\n\n\n"],"mappings":"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"}

package/dist/helpers/fix.spec.js

@@ -10,7 +10,7 @@ var _debug = _interopRequireDefault(require("debug"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-//import inspect from 'util';
+// import inspect from 'util';
 
 const debug = (0, _debug.default)('@natlibfi/melinda-rest-api-commons:fix:test');
 const debugData = debug.extend('data');
@@ -39,8 +39,8 @@ function callback({
   debug(`Running fixer with settings ${settings}.`);
   debugData(JSON.stringify(runSettings, null, 2));
   const resultRecord = (0, _fix.fixRecord)(record, runSettings);
-  debugData(resultRecord);
-  debugData(expectedRecord);
+  debugData(`Result:   ${JSON.stringify(resultRecord)}`);
+  debugData(`Expected: ${JSON.stringify(expectedRecord)}`);
   (0, _chai.expect)(resultRecord).to.eql(expectedRecord);
 }
 //# sourceMappingURL=fix.spec.js.map

package/dist/helpers/fix.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"fix.spec.js","names":["debug","createDebugLogger","debugData","extend","generateTests","callback","path","__dirname","recurse","useMetadataFile","fixura","failWhenNotFound","reader","READERS","JSON","getFixture","settings","undefined","fixSettings","Error","runSettings","record","MarcRecord","subfieldValues","expectedRecord","stringify","resultRecord","fixRecord","expect","to","eql"],"sources":["../../src/helpers/fix.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport {fixRecord} from './fix';\nimport * as fixSettings from './fix-constants';\nimport createDebugLogger from 'debug';\n//import inspect from 'util';\n\nconst debug = createDebugLogger('@natlibfi/melinda-rest-api-commons:fix:test');\nconst debugData = debug.extend('data');\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', '..', 'test-fixtures', 'fix'],\n  recurse: true,\n  useMetadataFile: true,\n  fixura: {\n    failWhenNotFound: false,\n    reader: READERS.JSON\n  }\n});\n\nfunction callback({getFixture, settings = undefined}) {\n  if (settings !== undefined && fixSettings[settings] === undefined) {\n    throw new Error(`There are no settings ${settings} defined!`);\n  }\n  const runSettings = fixSettings[settings] || settings;\n\n  const record = new MarcRecord(getFixture('record.json'), {subfieldValues: false});\n  const expectedRecord = getFixture('expectedRecord.json');\n\n  debug(`Running fixer with settings ${settings}.`);\n  debugData(JSON.stringify(runSettings, null, 2));\n\n  const resultRecord = fixRecord(record, runSettings);\n  debugData(resultRecord);\n  debugData(expectedRecord);\n  expect(resultRecord).to.eql(expectedRecord);\n\n}\n"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAAsC;AAAA;AAAA;AACtC;;AAEA,MAAMA,KAAK,GAAG,IAAAC,cAAiB,EAAC,6CAA6C,CAAC;AAC9E,MAAMC,SAAS,GAAGF,KAAK,CAACG,MAAM,CAAC,MAAM,CAAC;AAEtC,IAAAC,gBAAa,EAAC;EACZC,QAAQ;EACRC,IAAI,EAAE,CAACC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC;EACrDC,OAAO,EAAE,IAAI;EACbC,eAAe,EAAE,IAAI;EACrBC,MAAM,EAAE;IACNC,gBAAgB,EAAE,KAAK;IACvBC,MAAM,EAAEC,eAAO,CAACC;EAClB;AACF,CAAC,CAAC;AAEF,SAAST,QAAQ,CAAC;EAACU,UAAU;EAAEC,QAAQ,GAAGC;AAAS,CAAC,EAAE;EACpD,IAAID,QAAQ,KAAKC,SAAS,IAAIC,WAAW,CAACF,QAAQ,CAAC,KAAKC,SAAS,EAAE;IACjE,MAAM,IAAIE,KAAK,CAAE,yBAAwBH,QAAS,WAAU,CAAC;EAC/D;EACA,MAAMI,WAAW,GAAGF,WAAW,CAACF,QAAQ,CAAC,IAAIA,QAAQ;EAErD,MAAMK,MAAM,GAAG,IAAIC,sBAAU,CAACP,UAAU,CAAC,aAAa,CAAC,EAAE;IAACQ,cAAc,EAAE;EAAK,CAAC,CAAC;EACjF,MAAMC,cAAc,GAAGT,UAAU,CAAC,qBAAqB,CAAC;EAExDf,KAAK,CAAE,+BAA8BgB,QAAS,GAAE,CAAC;EACjDd,SAAS,CAACY,IAAI,CAACW,SAAS,CAACL,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;EAE/C,MAAMM,YAAY,GAAG,IAAAC,cAAS,EAACN,MAAM,EAAED,WAAW,CAAC;EACnDlB,SAAS,CAACwB,YAAY,CAAC;EACvBxB,SAAS,CAACsB,cAAc,CAAC;EACzB,IAAAI,YAAM,EAACF,YAAY,CAAC,CAACG,EAAE,CAACC,GAAG,CAACN,cAAc,CAAC;AAE7C"}
+{"version":3,"file":"fix.spec.js","names":["_chai","require","_marcRecord","_fixura","_fixugen","_interopRequireDefault","_fix","fixSettings","_interopRequireWildcard","_debug","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","debug","createDebugLogger","debugData","extend","generateTests","callback","path","__dirname","recurse","useMetadataFile","fixura","failWhenNotFound","reader","READERS","JSON","getFixture","settings","undefined","Error","runSettings","record","MarcRecord","subfieldValues","expectedRecord","stringify","resultRecord","fixRecord","expect","to","eql"],"sources":["../../src/helpers/fix.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport {fixRecord} from './fix';\nimport * as fixSettings from './fix-constants';\nimport createDebugLogger from 'debug';\n// import inspect from 'util';\n\nconst debug = createDebugLogger('@natlibfi/melinda-rest-api-commons:fix:test');\nconst debugData = debug.extend('data');\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', '..', 'test-fixtures', 'fix'],\n  recurse: true,\n  useMetadataFile: true,\n  fixura: {\n    failWhenNotFound: false,\n    reader: READERS.JSON\n  }\n});\n\nfunction callback({getFixture, settings = undefined}) {\n  if (settings !== undefined && fixSettings[settings] === undefined) {\n    throw new Error(`There are no settings ${settings} defined!`);\n  }\n  const runSettings = fixSettings[settings] || settings;\n\n  const record = new MarcRecord(getFixture('record.json'), {subfieldValues: false});\n  const expectedRecord = getFixture('expectedRecord.json');\n\n  debug(`Running fixer with settings ${settings}.`);\n  debugData(JSON.stringify(runSettings, null, 2));\n\n  const resultRecord = fixRecord(record, runSettings);\n  debugData(`Result:   ${JSON.stringify(resultRecord)}`);\n  debugData(`Expected: ${JSON.stringify(expectedRecord)}`);\n  expect(resultRecord).to.eql(expectedRecord);\n\n}\n"],"mappings":"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"}

package/dist/helpers/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","names":["logger","createLogger","verbose","validate","validateFactory","fieldStructure","tag","valuePattern","unvalidRecord","record","valid","report","fix","validateFixes","subfieldValues","failed","messages"],"sources":["../../src/helpers/validation.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 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 validateFactory from '@natlibfi/marc-record-validate';\nimport {\n  FieldStructure as fieldStructure\n} from '@natlibfi/marc-record-validators-melinda';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\n\nexport default async () => {\n  const logger = createLogger();\n\n  logger.verbose('Running inbuilt record validations');\n  const validate = validateFactory([await fieldStructure([{tag: /^003$/u, valuePattern: /^FI-MELINDA$/u}])]);\n\n  return async unvalidRecord => {\n    const {record, valid, report} = await validate(unvalidRecord, {fix: false, validateFixes: false}, {subfieldValues: false});\n\n    return {\n      record,\n      failed: valid === false,\n      messages: report\n    };\n  };\n};\n"],"mappings":";;;;;;AA4BA;AACA;AAGA;AAA+D;AAhC/D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AA1BA,eAkCe,YAAY;EACzB,MAAMA,MAAM,GAAG,IAAAC,mCAAY,GAAE;EAE7BD,MAAM,CAACE,OAAO,CAAC,oCAAoC,CAAC;EACpD,MAAMC,QAAQ,GAAG,IAAAC,2BAAe,EAAC,CAAC,MAAM,IAAAC,2CAAc,EAAC,CAAC;IAACC,GAAG,EAAE,QAAQ;IAAEC,YAAY,EAAE;EAAe,CAAC,CAAC,CAAC,CAAC,CAAC;EAE1G,OAAO,MAAMC,aAAa,IAAI;IAC5B,MAAM;MAACC,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAG,MAAMR,QAAQ,CAACK,aAAa,EAAE;MAACI,GAAG,EAAE,KAAK;MAAEC,aAAa,EAAE;IAAK,CAAC,EAAE;MAACC,cAAc,EAAE;IAAK,CAAC,CAAC;IAE1H,OAAO;MACLL,MAAM;MACNM,MAAM,EAAEL,KAAK,KAAK,KAAK;MACvBM,QAAQ,EAAEL;IACZ,CAAC;EACH,CAAC;AACH,CAAC;AAAA"}
+{"version":3,"file":"validation.js","names":["_marcRecordValidate","_interopRequireDefault","require","_marcRecordValidatorsMelinda","_melindaBackendCommons","obj","__esModule","default","_default","logger","createLogger","verbose","validate","validateFactory","fieldStructure","tag","valuePattern","unvalidRecord","record","valid","report","fix","validateFixes","subfieldValues","failed","messages","exports"],"sources":["../../src/helpers/validation.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 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 validateFactory from '@natlibfi/marc-record-validate';\nimport {\n  FieldStructure as fieldStructure\n} from '@natlibfi/marc-record-validators-melinda';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\n\nexport default async () => {\n  const logger = createLogger();\n\n  logger.verbose('Running inbuilt record validations');\n  const validate = validateFactory([await fieldStructure([{tag: /^003$/u, valuePattern: /^FI-MELINDA$/u}])]);\n\n  return async unvalidRecord => {\n    const {record, valid, report} = await validate(unvalidRecord, {fix: false, validateFixes: false}, {subfieldValues: false});\n\n    return {\n      record,\n      failed: valid === false,\n      messages: report\n    };\n  };\n};\n"],"mappings":";;;;;;AA4BA,IAAAA,mBAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,4BAAA,GAAAD,OAAA;AAGA,IAAAE,sBAAA,GAAAF,OAAA;AAA+D,SAAAD,uBAAAI,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAhC/D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AA1BA,IAAAG,QAAA,GAkCe,MAAAA,CAAA,KAAY;EACzB,MAAMC,MAAM,GAAG,IAAAC,mCAAY,EAAC,CAAC;EAE7BD,MAAM,CAACE,OAAO,CAAC,oCAAoC,CAAC;EACpD,MAAMC,QAAQ,GAAG,IAAAC,2BAAe,EAAC,CAAC,MAAM,IAAAC,2CAAc,EAAC,CAAC;IAACC,GAAG,EAAE,QAAQ;IAAEC,YAAY,EAAE;EAAe,CAAC,CAAC,CAAC,CAAC,CAAC;EAE1G,OAAO,MAAMC,aAAa,IAAI;IAC5B,MAAM;MAACC,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAG,MAAMR,QAAQ,CAACK,aAAa,EAAE;MAACI,GAAG,EAAE,KAAK;MAAEC,aAAa,EAAE;IAAK,CAAC,EAAE;MAACC,cAAc,EAAE;IAAK,CAAC,CAAC;IAE1H,OAAO;MACLL,MAAM;MACNM,MAAM,EAAEL,KAAK,KAAK,KAAK;MACvBM,QAAQ,EAAEL;IACZ,CAAC;EACH,CAAC;AACH,CAAC;AAAAM,OAAA,CAAAnB,OAAA,GAAAC,QAAA"}

package/dist/helpers/validation.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.spec.js","names":["describe","FIXTURES_PATH","__dirname","getFixture","fixtureFactory","root","reader","READERS","JSON","it","validator","createValidator","record","MarcRecord","components","result","toObject","expected","expect","to","eql","failed","equal"],"sources":["../../src/helpers/validation.spec.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 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 {expect} from 'chai';\nimport fixtureFactory, {READERS} from '@natlibfi/fixura';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport createValidator from './validation';\n\ndescribe('services/validate', () => {\n  const FIXTURES_PATH = [\n    __dirname,\n    '..',\n    '..',\n    'test-fixtures',\n    'validation'\n  ];\n  const {getFixture} = fixtureFactory({root: FIXTURES_PATH, reader: READERS.JSON});\n\n  describe('f003-fi-melinda', () => {\n    it('Should have failed: false', async () => {\n      const validator = await createValidator();\n      const record = new MarcRecord(getFixture({\n        components: [\n          'in',\n          'f003-fi-melinda.json'\n        ]\n      }));\n      const result = await validator(record.toObject());\n      const expected = getFixture({\n        components: [\n          'out',\n          'f003-fi-melinda.json'\n        ]\n      });\n      expect(result).to.eql(expected);\n      expect(result.failed).to.equal(false);\n    });\n  });\n\n  describe('f003-not-fi-melinda', () => {\n    it('Should have failed: true', async () => {\n      const validator = await createValidator();\n      const record = new MarcRecord(getFixture({\n        components: [\n          'in',\n          'f003-not-fi-melinda.json'\n        ]\n      }));\n      const result = await validator(record.toObject());\n      const expected = getFixture({\n        components: [\n          'out',\n          'f003-not-fi-melinda.json'\n        ]\n      });\n      expect(result).to.eql(expected);\n      expect(result.failed).to.equal(true);\n    });\n  });\n});\n\n"],"mappings":";;AA4BA;AACA;AACA;AACA;AAA2C;AAAA;AAAA;AA/B3C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAOAA,QAAQ,CAAC,mBAAmB,EAAE,MAAM;EAClC,MAAMC,aAAa,GAAG,CACpBC,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,eAAe,EACf,YAAY,CACb;EACD,MAAM;IAACC;EAAU,CAAC,GAAG,IAAAC,eAAc,EAAC;IAACC,IAAI,EAAEJ,aAAa;IAAEK,MAAM,EAAEC,eAAO,CAACC;EAAI,CAAC,CAAC;EAEhFR,QAAQ,CAAC,iBAAiB,EAAE,MAAM;IAChCS,EAAE,CAAC,2BAA2B,EAAE,YAAY;MAC1C,MAAMC,SAAS,GAAG,MAAM,IAAAC,mBAAe,GAAE;MACzC,MAAMC,MAAM,GAAG,IAAIC,sBAAU,CAACV,UAAU,CAAC;QACvCW,UAAU,EAAE,CACV,IAAI,EACJ,sBAAsB;MAE1B,CAAC,CAAC,CAAC;MACH,MAAMC,MAAM,GAAG,MAAML,SAAS,CAACE,MAAM,CAACI,QAAQ,EAAE,CAAC;MACjD,MAAMC,QAAQ,GAAGd,UAAU,CAAC;QAC1BW,UAAU,EAAE,CACV,KAAK,EACL,sBAAsB;MAE1B,CAAC,CAAC;MACF,IAAAI,YAAM,EAACH,MAAM,CAAC,CAACI,EAAE,CAACC,GAAG,CAACH,QAAQ,CAAC;MAC/B,IAAAC,YAAM,EAACH,MAAM,CAACM,MAAM,CAAC,CAACF,EAAE,CAACG,KAAK,CAAC,KAAK,CAAC;IACvC,CAAC,CAAC;EACJ,CAAC,CAAC;EAEFtB,QAAQ,CAAC,qBAAqB,EAAE,MAAM;IACpCS,EAAE,CAAC,0BAA0B,EAAE,YAAY;MACzC,MAAMC,SAAS,GAAG,MAAM,IAAAC,mBAAe,GAAE;MACzC,MAAMC,MAAM,GAAG,IAAIC,sBAAU,CAACV,UAAU,CAAC;QACvCW,UAAU,EAAE,CACV,IAAI,EACJ,0BAA0B;MAE9B,CAAC,CAAC,CAAC;MACH,MAAMC,MAAM,GAAG,MAAML,SAAS,CAACE,MAAM,CAACI,QAAQ,EAAE,CAAC;MACjD,MAAMC,QAAQ,GAAGd,UAAU,CAAC;QAC1BW,UAAU,EAAE,CACV,KAAK,EACL,0BAA0B;MAE9B,CAAC,CAAC;MACF,IAAAI,YAAM,EAACH,MAAM,CAAC,CAACI,EAAE,CAACC,GAAG,CAACH,QAAQ,CAAC;MAC/B,IAAAC,YAAM,EAACH,MAAM,CAACM,MAAM,CAAC,CAACF,EAAE,CAACG,KAAK,CAAC,IAAI,CAAC;IACtC,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"validation.spec.js","names":["_chai","require","_fixura","_interopRequireWildcard","_marcRecord","_validation","_interopRequireDefault","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","describe","FIXTURES_PATH","__dirname","getFixture","fixtureFactory","root","reader","READERS","JSON","it","validator","createValidator","record","MarcRecord","components","result","toObject","expected","expect","to","eql","failed","equal"],"sources":["../../src/helpers/validation.spec.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 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 {expect} from 'chai';\nimport fixtureFactory, {READERS} from '@natlibfi/fixura';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport createValidator from './validation';\n\ndescribe('services/validate', () => {\n  const FIXTURES_PATH = [\n    __dirname,\n    '..',\n    '..',\n    'test-fixtures',\n    'validation'\n  ];\n  const {getFixture} = fixtureFactory({root: FIXTURES_PATH, reader: READERS.JSON});\n\n  describe('f003-fi-melinda', () => {\n    it('Should have failed: false', async () => {\n      const validator = await createValidator();\n      const record = new MarcRecord(getFixture({\n        components: [\n          'in',\n          'f003-fi-melinda.json'\n        ]\n      }));\n      const result = await validator(record.toObject());\n      const expected = getFixture({\n        components: [\n          'out',\n          'f003-fi-melinda.json'\n        ]\n      });\n      expect(result).to.eql(expected);\n      expect(result.failed).to.equal(false);\n    });\n  });\n\n  describe('f003-not-fi-melinda', () => {\n    it('Should have failed: true', async () => {\n      const validator = await createValidator();\n      const record = new MarcRecord(getFixture({\n        components: [\n          'in',\n          'f003-not-fi-melinda.json'\n        ]\n      }));\n      const result = await validator(record.toObject());\n      const expected = getFixture({\n        components: [\n          'out',\n          'f003-not-fi-melinda.json'\n        ]\n      });\n      expect(result).to.eql(expected);\n      expect(result.failed).to.equal(true);\n    });\n  });\n});\n\n"],"mappings":"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"}

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../src/index.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 mongoFactory from './mongo';\nimport mongoLogFactory from './mongoLog';\nimport amqpFactory from './amqp';\nimport conversions from './helpers/conversion';\nimport validations from './helpers/validation';\nimport * as fixes from './helpers/fix';\nimport {logError, createImportJobState, createImportJobStateForQuery, createRecordResponseItem, addRecordResponseItem, addRecordResponseItems} from './utils';\n\nexport {mongoFactory, mongoLogFactory, amqpFactory, conversions, validations, fixes, logError, createImportJobState, createImportJobStateForQuery, createRecordResponseItem, addRecordResponseItem, addRecordResponseItems};\nexport * from './constants';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BA;AACA;AACA;AACA;AACA;AACA;AAAuC;AACvC;AAGA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAA4B;AAAA;AAAA"}
+{"version":3,"file":"index.js","names":["_mongo","_interopRequireDefault","require","_mongoLog","_amqp","_conversion","_validation","fixes","_interopRequireWildcard","exports","_utils","_constants","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","defineProperty","enumerable","get","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","newObj","hasPropertyDescriptor","getOwnPropertyDescriptor","desc","set"],"sources":["../src/index.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 mongoFactory from './mongo';\nimport mongoLogFactory from './mongoLog';\nimport amqpFactory from './amqp';\nimport conversions from './helpers/conversion';\nimport validations from './helpers/validation';\nimport * as fixes from './helpers/fix';\nimport {logError, createImportJobState, createImportJobStateForQuery, createRecordResponseItem, addRecordResponseItem, addRecordResponseItems} from './utils';\n\nexport {mongoFactory, mongoLogFactory, amqpFactory, conversions, validations, fixes, logError, createImportJobState, createImportJobStateForQuery, createRecordResponseItem, addRecordResponseItem, addRecordResponseItems};\nexport * from './constants';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,SAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,KAAA,GAAAH,sBAAA,CAAAC,OAAA;AACA,IAAAG,WAAA,GAAAJ,sBAAA,CAAAC,OAAA;AACA,IAAAI,WAAA,GAAAL,sBAAA,CAAAC,OAAA;AACA,IAAAK,KAAA,GAAAC,uBAAA,CAAAN,OAAA;AAAuCO,OAAA,CAAAF,KAAA,GAAAA,KAAA;AACvC,IAAAG,MAAA,GAAAR,OAAA;AAGA,IAAAS,UAAA,GAAAT,OAAA;AAAAU,MAAA,CAAAC,IAAA,CAAAF,UAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAN,OAAA,IAAAA,OAAA,CAAAM,GAAA,MAAAJ,UAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAQ,cAAA,CAAAX,OAAA,EAAAM,GAAA;IAAAM,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAX,UAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AAA4B,SAAAQ,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAhB,wBAAAoB,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAT,GAAA,CAAAM,GAAA,SAAAK,MAAA,WAAAC,qBAAA,GAAAtB,MAAA,CAAAQ,cAAA,IAAAR,MAAA,CAAAuB,wBAAA,WAAApB,GAAA,IAAAa,GAAA,QAAAb,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAU,GAAA,EAAAb,GAAA,SAAAqB,IAAA,GAAAF,qBAAA,GAAAtB,MAAA,CAAAuB,wBAAA,CAAAP,GAAA,EAAAb,GAAA,cAAAqB,IAAA,KAAAA,IAAA,CAAAd,GAAA,IAAAc,IAAA,CAAAC,GAAA,KAAAzB,MAAA,CAAAQ,cAAA,CAAAa,MAAA,EAAAlB,GAAA,EAAAqB,IAAA,YAAAH,MAAA,CAAAlB,GAAA,IAAAa,GAAA,CAAAb,GAAA,SAAAkB,MAAA,CAAAH,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAM,GAAA,CAAAT,GAAA,EAAAK,MAAA,YAAAA,MAAA;AAAA,SAAAhC,uBAAA2B,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA"}

package/dist/mongo.js

@@ -20,7 +20,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 *
 * Shared modules for microservices of Melinda rest api batch import system
 *
-* Copyright (C) 2020-2021 University Of Helsinki (The National Library Of Finland)
+* Copyright (C) 2020-2023 University Of Helsinki (The National Library Of Finland)
 *
 * This file is part of melinda-rest-api-commons
 *
@@ -43,7 +43,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 */
 
 //import isDeepStrictEqual from 'util';
-
 /* QueueItem:
 {
   "correlationId":"FOO",
@@ -72,7 +71,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   "modificationTime":"2020-01-01T00:00:01.000Z",
 }
 */
-
 async function _default(MONGO_URI, collection) {
   const logger = (0, _melindaBackendCommons.createLogger)();
 
@@ -187,7 +185,7 @@ async function _default(MONGO_URI, collection) {
       modificationTime: time
     };
 
-    // eslint-disable-next-line functional/no-conditional-statement
+    // eslint-disable-next-line functional/no-conditional-statements
     if (stream) {
       try {
         // No await here, promises later
@@ -206,7 +204,7 @@ async function _default(MONGO_URI, collection) {
       }
     }
     logger.debug(`No stream`);
-    // eslint-disable-next-line functional/no-conditional-statement
+    // eslint-disable-next-line functional/no-conditional-statements
     if (!stream) {
       try {
         const result = await db.collection(collection).insertOne(newQueueItem);
@@ -277,29 +275,54 @@ async function _default(MONGO_URI, collection) {
     return false;
   }
   async function query(params, showParams = {}) {
-    const {
-      showOperations = 0,
-      showOperationSettings = 0,
-      showRecordLoadParams = 0,
-      showImportJobState = 0
-    } = showParams;
+    logger.debug(`Querying: ${JSON.stringify(params)}, ${JSON.stringify(showParams)}`);
     const {
       limit = 1000,
       skip = 0,
       ...rest
     } = params;
     const result = await db.collection(collection).find(rest, {
-      projection: {
-        _id: 0,
-        operations: showOperations,
-        operationSettings: showOperationSettings,
-        recordLoadParams: showRecordLoadParams,
-        importJobState: showImportJobState
-      }
+      projection: createProjection(showParams)
     }).limit(parseInt(limit, 10)).skip(parseInt(skip, 10)).toArray();
     logger.debug(`Query result: ${result.length > 0 ? 'Found!' : 'Not found!'}`);
+    logger.silly(`${JSON.stringify(result)}`);
     return result;
   }
+
+  // We default to NOT showing operations, operationSettings, recordLoadParams and importJobState when a queueItem is queried
+  // These can all be shown with showAll
+  // Single fields can be shown by showOperation, showOperationSettings, showRecordLoadParams and showImportJobState
+
+  function createProjection(showParams = {}) {
+    logger.silly(`Creating projection for query: ${JSON.stringify(showParams)}`);
+    const {
+      showAll = 0,
+      showOperations = 0,
+      showOperationSettings = 0,
+      showRecordLoadParams = 0,
+      showImportJobState = 0
+    } = showParams;
+    logger.debug(`showAll: ${showAll}, showOperations: ${showOperations}, showOperationSettings: ${showOperationSettings}, showRecordLoadParams: ${showRecordLoadParams}, showImportJobState: ${showImportJobState}`);
+    if (showAll) {
+      return {
+        _id: 0
+      };
+    }
+    const showParamToField = {
+      'showOperations': 'operations',
+      'showOperationSettings': 'operationSettings',
+      'showRecordLoadParams': 'recordLoadParams',
+      'showImportJobState': 'importJobState'
+    };
+    const result = Object.keys(showParams).filter(param => param !== 'showAll' && showParams[param] !== true && showParams[param] !== 1).filter(param => showParamToField[param]).map(param => showParamToField[param]);
+    logger.debug(`We want to exclude from projection: ${JSON.stringify(result)}`);
+    const excludeObject = Object.fromEntries(result.map(param => [param, 0]));
+    logger.debug(`We want to exclude from projection: ${JSON.stringify(excludeObject)}`);
+    return {
+      _id: 0,
+      ...excludeObject
+    };
+  }
   async function queryById({
     correlationId,
     checkModTime = false