@natlibfi/melinda-record-matching 4.1.1 → 4.1.2-alpha.2

package/src/candidate-search/index.js

@@ -119,7 +119,7 @@ export default ({record, searchSpec, url, maxCandidates, maxRecordsPerRequest =
 
         client.searchRetrieve(query, {startRecord: resultSetOffset})
           .on('error', err => {
-            // eslint-disable-next-line functional/no-conditional-statement
+            // eslint-disable-next-line functional/no-conditional-statements
             if (err instanceof SruSearchError) {
               debug(`SRU SruSearchError for query: ${query}: ${err}`);
               reject(new CandidateSearchError(`SRU SruSearchError for query: ${query}: ${err}`));

package/src/candidate-search/index.spec.js

@@ -79,7 +79,7 @@ describe('candidate-search', () => {
     async function iterate({searchOptions, expectedSearchError, expectedErrorStatus, count = 1}) {
       const expectedResults = getFixture(`expectedResults${count}.json`);
 
-      if (expectedSearchError) { // eslint-disable-line functional/no-conditional-statement
+      if (expectedSearchError) { // eslint-disable-line functional/no-conditional-statements
         try {
           await search(searchOptions);
           throw new Error('Expected an error');
@@ -99,7 +99,7 @@ describe('candidate-search', () => {
         }
       }
 
-      // eslint-disable-next-line functional/no-conditional-statement
+      // eslint-disable-next-line functional/no-conditional-statements
       if (!expectedSearchError) {
         const results = await search(searchOptions);
         expect(formatResults(results)).to.eql(expectedResults);

package/src/index.js

@@ -113,7 +113,7 @@ export default ({detection: detectionOptions, search: searchOptions, maxMatches
 
       function handleMatchResult(matchResult, matches, nonMatches, matchErrors) {
         debugData(`- Amount of new matches from record set: ${matchResult.matches.length}`);
-        // eslint-disable-next-line functional/no-conditional-statement
+        // eslint-disable-next-line functional/no-conditional-statements
         if (returnNonMatches) {
           debugData(`- Amount of new nonMatches from record set: ${matchResult.nonMatches.length}`);
         }
@@ -123,7 +123,7 @@ export default ({detection: detectionOptions, search: searchOptions, maxMatches
         const newMatchErrors = matchErrors.concat(matchResult.matchErrors);
 
         debugData(`- Total amount of matches: ${newMatches.length}`);
-        // eslint-disable-next-line functional/no-conditional-statement
+        // eslint-disable-next-line functional/no-conditional-statements
         if (returnNonMatches) {
           debugData(`- Total amount of nonMatches: ${newNonMatches.length}`);
         }
@@ -173,7 +173,7 @@ export default ({detection: detectionOptions, search: searchOptions, maxMatches
       checkCounts({matches, nonMatches, candidateCount, duplicateCount, nonMatchCount, conversionFailureCount, matchErrorCount});
       const matchStatus = getMatchState(state, stopReason, conversionFailureCount, matchErrorCount);
       // add nonMatches to result only if returnNonMatches is 'true', otherwise nonMatches have not been gathered
-      const matchesResult = returnNonMatches ? {matches, matchStatus, nonMatches} : {matches, matchStatus};
+      const matchesResult = returnNonMatches ? {matches, matchStatus, nonMatches, candidateCount} : {matches, matchStatus, candidateCount};
       const failures = [...conversionFailures, ...matchErrors];
       const result = returnFailures ? {...matchesResult, conversionFailures: failures} : matchesResult;
       debugData(`ReturnFailures ${returnFailures}`);
@@ -267,7 +267,7 @@ export default ({detection: detectionOptions, search: searchOptions, maxMatches
 
       if (candidate) {
 
-        // eslint-disable-next-line functional/no-conditional-statement
+        // eslint-disable-next-line functional/no-conditional-statements
         if (candidateNotInMatches(matches.concat(nonMatches), candidate)) {
           const {record: candidateRecord, id: candidateId} = candidate;
           const recordBExternal = {id: candidate.id, recordSource: 'databaseRecord', label: `db-${candidate.id}`};
@@ -330,7 +330,7 @@ export default ({detection: detectionOptions, search: searchOptions, maxMatches
 
         debugData(`- Total matches after this detection: ${matches.concat(newRecordMatches).length} (max: ${maxMatches})`);
 
-        // eslint-disable-next-line functional/no-conditional-statement
+        // eslint-disable-next-line functional/no-conditional-statements
         if (returnNonMatches) {
           debugData(`- Total nonMatches after this detection: ${nonMatches.concat(newRecordNonMatches).length}`);
         }

package/src/index.spec.js

@@ -4,7 +4,7 @@
 *
 * Melinda record matching modules for Javascript
 *
-* 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-record-matching-js
 *
@@ -46,12 +46,8 @@ describe('INDEX', () => {
     }
   });
 
-  async function callback({getFixture, options, enabled = true, expectedMatchStatus, expectedStopReason, expectedFailures}) {
-
-    if (!enabled) {
-      debug(`Disabled test!`);
-      return;
-    }
+  // eslint-disable-next-line max-statements
+  async function callback({getFixture, options, expectedMatchStatus, expectedStopReason, expectedFailures, expectedCandidateCount}) {
 
     const record = new MarcRecord(getFixture('inputRecord.json'), {subfieldValues: false});
     const expectedMatches = getFixture('expectedMatches.json');
@@ -59,11 +55,12 @@ describe('INDEX', () => {
 
 
     const match = createMatchInterface(formatOptions());
-    const {matches, matchStatus, nonMatches, conversionFailures} = await match({record});
+    const {matches, matchStatus, nonMatches, conversionFailures, candidateCount} = await match({record});
     debugData(`Matches: ${matches.length}, Status: ${matchStatus.status}/${matchStatus.stopReason}, NonMatches: ${nonMatches ? nonMatches.length : 'not returned'}, ConversionFailures: ${conversionFailures ? conversionFailures.length : 'not returned'}`);
 
     expect(matchStatus.status).to.eql(expectedMatchStatus);
     expect(matchStatus.stopReason).to.eql(expectedStopReason);
+    expect(candidateCount).to.eql(expectedCandidateCount);
 
     const formattedMatchResult = formatRecordResults(matches);
     expect(formattedMatchResult).to.eql(expectedMatches);
@@ -71,7 +68,7 @@ describe('INDEX', () => {
     const formattedNonMatchResult = formatRecordResults(nonMatches);
     expect(formattedNonMatchResult).to.eql(expectedNonMatches);
 
-    // eslint-disable-next-line functional/no-conditional-statement
+    // eslint-disable-next-line functional/no-conditional-statements
     if (expectedFailures) {
       expect(conversionFailures).to.eql(expectedFailures);
     }