refactor: flatten data layout to data/, drop update/ overrides

- Move 63 Excel files from data/raw/ to data/ (single flat dir)
- Remove all 53 files in data/raw/update/: verified identical SBD
  coverage to raw/ (847349 rows either way), so they added no new
  students — only potential score corrections that can be reintroduced
  later if source is recovered
- Update build-database.js to read data/ directly
- Add scripts/audit-row-counts.js: compares source row count to DB row
  count to verify zero-loss parsing
- Point check-duplicates.js at new data/ location
This commit is contained in:
tiennm99 committed 2026-04-14 21:02:47 +07:00
1 parent c1cd39e535
commit e165e3c5b6
120 files changed
+66 -20

No files matched your search

+63
View File
@@ -0,0 +1,63 @@
// Audit: compare expected unique SBDs from raw Excel files vs DB row count
import XLSX from "xlsx";
import Database from "better-sqlite3";
import fs from "fs";
import path from "path";
const RAW_DIR = "D:/tiennm99/thptqg2017/data";
const DB_PATH = "D:/tiennm99/thptqg2017/public/thptqg2017.db";
function collectFiles() {
const out = [];
for (const f of fs.readdirSync(RAW_DIR)) {
const full = path.join(RAW_DIR, f);
if (fs.statSync(full).isFile() && f.endsWith(".xlsx")) out.push(full);
}
return out;
}
function isHeader(row) {
if (!row || row.length < 3) return false;
const first = String(row[0] || "").toUpperCase();
return first === "HO_TEN" || first === "HỌ TÊN" || first === "STT";
}
const allSbd = new Set();
let totalDataRows = 0,
emptyName = 0,
emptySbd = 0,
bothEmpty = 0;
for (const file of collectFiles()) {
const wb = XLSX.readFile(file);
const ws = wb.Sheets[wb.SheetNames[0]];
const rows = XLSX.utils.sheet_to_json(ws, { header: 1 });
for (let i = 0; i < rows.length; i++) {
const r = rows[i];
if (i === 0 && isHeader(r)) continue;
totalDataRows++;
const hoTen = String(r?.[0] || "").trim();
const sbd = String(r?.[2] || "").trim();
if (!hoTen && !sbd) {
bothEmpty++;
continue;
}
if (!hoTen) emptyName++;
if (!sbd) emptySbd++;
if (sbd) allSbd.add(sbd);
}
}
const db = new Database(DB_PATH, { readonly: true });
const dbCount = db.prepare("SELECT COUNT(*) c FROM student").get().c;
console.log("=== Source vs DB ===");
console.log(`Source: total data rows across all files: ${totalDataRows}`);
console.log(`Source: rows with empty name AND sbd (skipped): ${bothEmpty}`);
console.log(`Source: rows with missing name only: ${emptyName}`);
console.log(`Source: rows with missing sbd only: ${emptySbd}`);
console.log(`Source: distinct SBDs: ${allSbd.size}`);
console.log(`DB: row count: ${dbCount}`);
console.log(
`Match: ${allSbd.size === dbCount ? "YES — all unique SBDs accounted for" : "NO — gap of " + (allSbd.size - dbCount)}`,
);
+2 -16
View File
@@ -6,7 +6,7 @@ import { fileURLToPath } from "url";
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const RAW_DIR = path.join(__dirname, "..", "data", "raw");
const RAW_DIR = path.join(__dirname, "..", "data");
const DB_PATH = path.join(__dirname, "..", "public", "thptqg2017.db");
// Score patterns. Note: source data uses both "X.YZ" and "X" forms; allow optional decimal.
@@ -37,29 +37,15 @@ function toAscii(str) {
.toLowerCase();
}
// Collect all .xlsx files: raw/ first, then raw/(update)/ to overwrite
// Collect all .xlsx files directly under data/
function collectExcelFiles() {
const files = [];
// Main raw files first
for (const f of fs.readdirSync(RAW_DIR)) {
const full = path.join(RAW_DIR, f);
if (fs.statSync(full).isFile() && f.endsWith(".xlsx")) {
files.push(full);
}
}
// Update files second (will overwrite via INSERT OR REPLACE)
const updateDir = path.join(RAW_DIR, "update");
if (fs.existsSync(updateDir)) {
for (const f of fs.readdirSync(updateDir)) {
const full = path.join(updateDir, f);
if (fs.statSync(full).isFile() && f.endsWith(".xlsx")) {
files.push(full);
}
}
}
return files;
}
+1 -4
View File
@@ -3,10 +3,7 @@ import crypto from "crypto";
import fs from "fs";
import path from "path";
const dirs = [
"D:/tiennm99/thptqg2017/data/raw",
"D:/tiennm99/thptqg2017/data/raw/update",
];
const dirs = ["D:/tiennm99/thptqg2017/data"];
const byHash = {};
for (const d of dirs) {