more..

server/routes/admin.ts

@@ -12,6 +12,7 @@ import csv from 'csv-parser';
 import { Word, WordRecord, WordSet, VocabularyTestAttempt, VocabularyTestRecord } from '../models/Vocabulary';
 import mongoose from 'mongoose';
 import { INVALIDATING_VOCABULARY_RISK_FLAGS } from '../utils/vocabularyRisk';
+import { buildVocabularySummaryFilters } from '../utils/vocabularyAuditFilters';
 
 const router = express.Router();
 const adminController = new AdminController();
@@ -62,53 +63,6 @@ const WORD_RECORD_MODES: WordRecordModeKey[] = [
 ];
 
 const getObjectIdString = (value: any): string => value?._id?.toString?.() || value?.toString?.() || '';
-const escapeRegex = (value: string): string => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-
-const parseOptionalPositiveInt = (value: unknown, fieldName: string) => {
-  const raw = String(value ?? '').trim();
-  if (!raw) return { value: undefined as number | undefined };
-
-  if (!/^\d+$/.test(raw)) {
-    return { error: `${fieldName}必须是正整数` };
-  }
-
-  const parsed = Number(raw);
-  if (!Number.isFinite(parsed) || parsed <= 0) {
-    return { error: `${fieldName}必须大于0` };
-  }
-
-  return { value: parsed };
-};
-
-const buildVocabularySummaryFilters = (query: Record<string, any>) => {
-  const studentNo = String(query.studentNo || '').trim();
-  const wordCountResult = parseOptionalPositiveInt(query.minWords, '单次练习单词数量');
-  if ('error' in wordCountResult) return { error: wordCountResult.error };
-
-  const minWords = wordCountResult.value;
-  const userMatchStages = studentNo
-    ? [{
-      $match: {
-        'user.username': {
-          $regex: escapeRegex(studentNo),
-          $options: 'i'
-        }
-      }
-    }]
-    : [];
-
-  const baseMatch: Record<string, any> = {};
-  if (typeof minWords === 'number') {
-    baseMatch['stats.totalWords'] = { $gte: minWords };
-  }
-
-  return {
-    studentNo,
-    minWords,
-    userMatchStages,
-    baseMatch
-  };
-};
 
 const parseAdminDateRange = (source: Record<string, any>) => {
   const start = new Date(String(source.start || source.startTime || ''));

server/utils/vocabularyAuditFilters.test.ts

@@ -0,0 +1,42 @@
+import assert from 'node:assert/strict';
+import { buildVocabularySummaryFilters } from './vocabularyAuditFilters';
+
+const correctWordFilter = buildVocabularySummaryFilters({ minCorrectWords: '40' });
+assert.deepEqual(correctWordFilter, {
+  minCorrectWords: 40,
+  userMatchStages: [],
+  baseMatch: {
+    'stats.correctWords': { $gte: 40 }
+  }
+});
+
+const legacyFilter = buildVocabularySummaryFilters({ minWords: '35' });
+assert.deepEqual(legacyFilter, {
+  minCorrectWords: 35,
+  userMatchStages: [],
+  baseMatch: {
+    'stats.correctWords': { $gte: 35 }
+  }
+});
+
+const emptyFilter = buildVocabularySummaryFilters({});
+assert.deepEqual(emptyFilter, {
+  minCorrectWords: undefined,
+  userMatchStages: [],
+  baseMatch: {}
+});
+
+const studentFilter = buildVocabularySummaryFilters({ studentNo: 'A.12' });
+assert.deepEqual(studentFilter.userMatchStages, [{
+  $match: {
+    'user.username': {
+      $regex: 'A\\.12',
+      $options: 'i'
+    }
+  }
+}]);
+
+const invalidFilter = buildVocabularySummaryFilters({ minCorrectWords: '4.5' });
+assert.deepEqual(invalidFilter, { error: '正确单词数量必须是正整数' });
+
+console.log('vocabularyAuditFilters tests passed');

server/utils/vocabularyAuditFilters.ts

@@ -0,0 +1,47 @@
+const escapeRegex = (value: string): string => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+const parseOptionalPositiveInt = (value: unknown, fieldName: string) => {
+  const raw = String(value ?? '').trim();
+  if (!raw) return { value: undefined as number | undefined };
+
+  if (!/^\d+$/.test(raw)) {
+    return { error: `${fieldName}必须是正整数` };
+  }
+
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed) || parsed <= 0) {
+    return { error: `${fieldName}必须大于0` };
+  }
+
+  return { value: parsed };
+};
+
+export const buildVocabularySummaryFilters = (query: Record<string, any>) => {
+  const studentNo = String(query.studentNo || '').trim();
+  const rawMinCorrectWords = query.minCorrectWords ?? query.minWords;
+  const wordCountResult = parseOptionalPositiveInt(rawMinCorrectWords, '正确单词数量');
+  if ('error' in wordCountResult) return { error: wordCountResult.error };
+
+  const minCorrectWords = wordCountResult.value;
+  const userMatchStages = studentNo
+    ? [{
+      $match: {
+        'user.username': {
+          $regex: escapeRegex(studentNo),
+          $options: 'i'
+        }
+      }
+    }]
+    : [];
+
+  const baseMatch: Record<string, any> = {};
+  if (typeof minCorrectWords === 'number') {
+    baseMatch['stats.correctWords'] = { $gte: minCorrectWords };
+  }
+
+  return {
+    minCorrectWords,
+    userMatchStages,
+    baseMatch
+  };
+};