bisaya-kurs korrigiert

backend/services/vocabService.js

@@ -840,15 +840,14 @@ export default class VocabService {
           const answers = Array.isArray(aData.answers)
             ? aData.answers
             : (aData.correct ? (Array.isArray(aData.correct) ? aData.correct : [aData.correct]) : []);
-          const text = String(qData.text || '');
-          const nativeWords = Array.from(text.matchAll(/\(([^)]+)\)/g), (m) => String(m[1] || '').trim());
+          const hintPairs = this._extractGapFillHintPairs(String(qData.text || ''), answers.length);
 
-          if (!answers.length || !nativeWords.length) {
+          if (!answers.length || !hintPairs.length) {
             return;
           }
 
           answers.forEach((answer, index) => {
-            const nativeWord = nativeWords[index];
+            const nativeWord = hintPairs[index] || '';
             const normalizedAnswer = String(answer || '').trim();
             if (!this._isTrainableSrsPair({ learning: nativeWord, reference: normalizedAnswer })) {
               return;
@@ -867,6 +866,28 @@ export default class VocabService {
     return Array.from(vocabMap.values());
   }
 
+  _extractGapFillHintPairs(text, expectedCount = 0) {
+    const source = String(text || '');
+    if (!source) return [];
+
+    const gapRegex = /\{\s*gap\s*\}/gi;
+    const gapMatches = Array.from(source.matchAll(gapRegex));
+    if (!gapMatches.length) return [];
+
+    const hints = gapMatches.map((match, index) => {
+      const start = match.index + match[0].length;
+      const nextStart = index + 1 < gapMatches.length ? gapMatches[index + 1].index : source.length;
+      const segment = source.slice(start, nextStart);
+      const hintMatch = segment.match(/\(([^)]+)\)/);
+      return String(hintMatch?.[1] || '').trim();
+    }).filter(Boolean);
+
+    if (expectedCount > 0) {
+      return hints.slice(0, expectedCount);
+    }
+    return hints;
+  }
+
   _extractTrainerVocabsFromLessonDidactics(lesson) {
     const vocabMap = new Map();
     const corePatterns = Array.isArray(lesson?.corePatterns) ? lesson.corePatterns : [];
@@ -1913,7 +1934,16 @@ export default class VocabService {
         ['stage', 'ASC']
       ]
     });
-    const validDueRows = dueRows.filter((item) => this._isTrainableSrsPair(item));
+    const validPool = await this.getCompletedLessonVocabPool(hashedUserId, course.id);
+    const validKeys = new Set(
+      (Array.isArray(validPool?.vocabs) ? validPool.vocabs : [])
+        .map((entry) => String(entry?.itemKey || '').trim())
+        .filter(Boolean)
+    );
+    const validDueRows = dueRows.filter((item) =>
+      this._isTrainableSrsPair(item)
+      && (!validKeys.size || validKeys.has(String(item.itemKey || '').trim()))
+    );
     const rows = validDueRows.slice(0, limit);
     const totalDueCount = validDueRows.length;