Possible answers penalty fixes, logging imporvements, added tests

src/utils/classes.ts

@@ -33,6 +33,7 @@ export interface WorkerResult {
   msg: string
   workerIndex: number
   result?: SearchResultQuestion[]
+  error?: boolean
 }
 
 interface DetailedMatch {
@@ -63,7 +64,7 @@ const commonUselessAnswerParts = [
 // const commonUselessStringParts = [',', '\\.', ':', '!', '\\+', '\\s*\\.']
 /* Percent minus for length difference */
 const lengthDiffMultiplier = 10
-const noPossibleAnswerMatchPenalty = 5
+export const noPossibleAnswerMatchPenalty = 5
 /* Minimum ammount to consider that two questions match during answering */
 const minMatchAmmount = 75
 const magicNumber = 0.7 // same as minMatchAmmount, but /100
@@ -574,39 +575,52 @@ function doSearch(
 }
 
 function setNoPossibleAnswersPenalties(
-  possibleAnswers: QuestionData['possibleAnswers'],
-  result: SearchResultQuestion[]
+  questionPossibleAnswers: QuestionData['possibleAnswers'],
+  results: SearchResultQuestion[]
 ): SearchResultQuestion[] {
-  if (!Array.isArray(possibleAnswers)) {
-    return result
+  if (!Array.isArray(questionPossibleAnswers)) {
+    return results
   }
-  const noneHasPossibleAnswers = result.every((x) => {
+  const noneHasPossibleAnswers = results.every((x) => {
     return !Array.isArray(x.q.data.possibleAnswers)
   })
-  if (noneHasPossibleAnswers) return result
+  if (noneHasPossibleAnswers) return results
 
   let possibleAnswerMatch = false
-  const updated = result.map((result) => {
-    const hasMatch = result.q.data.possibleAnswers.some((possibleAnswer) => {
-      return possibleAnswers.some((questionPossibleAnswer) => {
-        // FIXME: this could be object: questionPossibleAnswer
-        return questionPossibleAnswer.text.includes(possibleAnswer.text)
-      })
-    })
-    if (hasMatch) {
+  const updated = results.map((result) => {
+    const matchCount = Array.isArray(result.q.data.possibleAnswers)
+      ? result.q.data.possibleAnswers.filter((resultPossibleAnswer) => {
+          return questionPossibleAnswers.some((questionPossibleAnswer) => {
+            if (questionPossibleAnswer.val && resultPossibleAnswer.val) {
+              return questionPossibleAnswer.val.includes(
+                resultPossibleAnswer.val
+              )
+            } else {
+              return false
+            }
+          })
+        }).length
+      : 0
+
+    if (matchCount === questionPossibleAnswers.length) {
       possibleAnswerMatch = true
+      return result
     } else {
-      result.match = result.match - noPossibleAnswerMatchPenalty
-      result.detailedMatch.qMatch =
-        result.detailedMatch.qMatch - noPossibleAnswerMatchPenalty
+      return {
+        ...result,
+        match: result.match - noPossibleAnswerMatchPenalty,
+        detailedMatch: {
+          ...result.detailedMatch,
+          qMatch: result.detailedMatch.qMatch - noPossibleAnswerMatchPenalty,
+        },
+      }
     }
-    return result
   })
 
   if (possibleAnswerMatch) {
     return updated
   } else {
-    return result
+    return results
   }
 }
 
@@ -646,6 +660,7 @@ if (!isMainThread) {
       }: WorkData = msg.data
 
       let searchResult: SearchResultQuestion[] = []
+      let error = false
 
       try {
         qdbs.forEach((qdb) => {
@@ -674,14 +689,21 @@ if (!isMainThread) {
       } catch (err) {
         logger.Log('Error in worker thread!', logger.GetColor('redbg'))
         console.error(err)
-        console.error({
-          subjName: subjName,
-          question: question,
-          searchTillMatchPercent: searchTillMatchPercent,
-          searchInAllIfNoResult: searchInAllIfNoResult,
-          searchIn: searchIn,
-          index: index,
-        })
+        console.error(
+          JSON.stringify(
+            {
+              subjName: subjName,
+              question: question,
+              searchTillMatchPercent: searchTillMatchPercent,
+              searchInAllIfNoResult: searchInAllIfNoResult,
+              searchIn: searchIn,
+              index: index,
+            },
+            null,
+            2
+          )
+        )
+        error = true
       }
 
       // sorting
@@ -703,6 +725,7 @@ if (!isMainThread) {
         }done`,
         workerIndex: workerIndex,
         result: sortedResult,
+        error: error,
       }
 
       // ONDONE:
@@ -810,4 +833,5 @@ export {
   addQuestion,
   dataToString,
   doSearch,
+  setNoPossibleAnswersPenalties,
 }