diff --git a/app/accounting/gl_entries.php b/app/accounting/gl_entries.php index 18cf4ae..0428e95 100644 --- a/app/accounting/gl_entries.php +++ b/app/accounting/gl_entries.php @@ -69,35 +69,6 @@ - - - + diff --git a/app/include_setting_sidebar.php b/app/include_setting_sidebar.php index 28d1a66..e7aa966 100644 --- a/app/include_setting_sidebar.php +++ b/app/include_setting_sidebar.php @@ -61,6 +61,18 @@ +
  • + Maintenance +
    • + +
  • + + + GL Maintenance + +
    • +
  • Navigation diff --git a/app/setting/api/engine/gl_maintenance.php b/app/setting/api/engine/gl_maintenance.php new file mode 100644 index 0000000..38805ef --- /dev/null +++ b/app/setting/api/engine/gl_maintenance.php @@ -0,0 +1,44 @@ +getStatus(); + $answer['success'] = 1; + exit(json_encode($answer)); + } + + if ($action === 'get_periods') { + $sth = $pdo2->prepare( + "SELECT DISTINCT period FROM td_gl WHERE company_id = :cid ORDER BY period" + ); + $sth->execute([':cid' => $company_id]); + $answer['output'] = $sth->fetchAll(PDO::FETCH_COLUMN); + $answer['success'] = 1; + exit(json_encode($answer)); + } + + if ($action === 'rebuild_period') { + $period = $data['period'] ?? ''; + if (!preg_match('/^\d{4}-\d{2}$/', $period)) { + $answer['message'] = 'Invalid period.'; + exit(json_encode($answer)); + } + $etl->rebuildPeriod($period); + $answer['success'] = 1; + exit(json_encode($answer)); + } + + $answer['message'] = 'Invalid action.'; +} catch (Exception $e) { + $answer['message'] = $e->getMessage(); + http_response_code(400); +} + +exit(json_encode($answer)); diff --git a/app/setting/gl_maintenance.php b/app/setting/gl_maintenance.php new file mode 100644 index 0000000..7ccfdf3 --- /dev/null +++ b/app/setting/gl_maintenance.php @@ -0,0 +1,194 @@ + + + + + + +
    +
    + +
    +
    +
    +
    +

    ETL GL Summary Maintenance

    +

    Manages the etl_gl_summary table used by the accounting reports

    +
    +
    +
    +
    + +
    + + +
    +
    +
    +
    Automatic Maintenance
    +
    +
    +

    + The system automatically checks and repairs the GL summary table nightly. + Each company is assigned a fixed time slot to distribute load across the day. +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Scheduled slot—
    Last ran—
    Last result—
    Gaps found—
    Periods rebuilt—
    Next run—
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    Manual Full Rebuild
    +
    +
    +

    + Wipes and rebuilds the entire GL summary table from raw journal entries. + Use this after a direct database fix, data migration, or if dashboard figures look incorrect. +

    +
    + + Rebuilds one month at a time. The dashboard stays usable during the rebuild — it falls back to raw data for any period not yet in the summary. +
    +
    + +
    +
    +
    +
    + +
    + +
    +
    + + + + + + + diff --git a/nodejs/.env.example b/nodejs/.env.example index aa17f6e..6319c58 100644 --- a/nodejs/.env.example +++ b/nodejs/.env.example @@ -5,5 +5,10 @@ PORT=3000 # Secret key — PHP sends this in x-emit-secret header to authenticate /emit calls +# Also used by Node.js scheduler as x-cron-secret when calling PHP cron endpoints # Use a long random string in production EMIT_SECRET= + +# PHP internal base URL (scheduler → PHP cron endpoints) +PHP_BASE_URL=http://127.0.0.1 +PHP_WEBROOT=/mn3wms/app diff --git a/nodejs/package-lock.json b/nodejs/package-lock.json index 5e356b4..4be8660 100644 --- a/nodejs/package-lock.json +++ b/nodejs/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "dotenv": "^16.0.0", "express": "^4.18.0", + "node-cron": "^4.2.1", "socket.io": "^4.7.0" } }, @@ -651,6 +652,15 @@ "node": ">= 0.6" } }, + "node_modules/node-cron": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/node-cron/-/node-cron-4.2.1.tgz", + "integrity": "sha512-lgimEHPE/QDgFlywTd8yTR61ptugX3Qer29efeyWw2rv259HtGBNn1vZVmp8lB9uo9wC0t/AT4iGqXxia+CJFg==", + "license": "ISC", + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", diff --git a/nodejs/package.json b/nodejs/package.json index 5731066..36b96b6 100644 --- a/nodejs/package.json +++ b/nodejs/package.json @@ -7,8 +7,9 @@ "start": "node server.js" }, "dependencies": { + "dotenv": "^16.0.0", "express": "^4.18.0", - "socket.io": "^4.7.0", - "dotenv": "^16.0.0" + "node-cron": "^4.2.1", + "socket.io": "^4.7.0" } } diff --git a/nodejs/scheduler.js b/nodejs/scheduler.js new file mode 100644 index 0000000..cc2e2d6 --- /dev/null +++ b/nodejs/scheduler.js @@ -0,0 +1,67 @@ +require('dotenv').config(); + +const cron = require('node-cron'); +const http = require('http'); + +const PHP_BASE = process.env.PHP_BASE_URL || 'http://127.0.0.1'; +const PHP_WEBROOT = process.env.PHP_WEBROOT || '/mn3wms/app'; +const SECRET = process.env.EMIT_SECRET || ''; + +function callPhp(path, body) { + return new Promise((resolve, reject) => { + const payload = JSON.stringify(body); + const url = new URL(PHP_BASE + PHP_WEBROOT + path); + + const options = { + hostname: url.hostname, + port: url.port || 80, + path: url.pathname, + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'Content-Length': Buffer.byteLength(payload), + 'x-cron-secret': SECRET, + }, + }; + + const req = http.request(options, (res) => { + let data = ''; + res.on('data', (chunk) => { data += chunk; }); + res.on('end', () => { + try { resolve(JSON.parse(data)); } + catch (e) { reject(new Error('Bad JSON: ' + data.slice(0, 100))); } + }); + }); + + req.on('error', reject); + req.write(payload); + req.end(); + }); +} + +// ── ETL GL Summary maintenance — runs every hour ───────────────────────────── +// Checks and repairs etl_gl_summary (GL aggregation table). +// Each company has a fixed slot = company_id % 24 — load is spread across 24 hours. +// For etl_stock_summary add a separate schedule below when ready. +cron.schedule('0 * * * *', async () => { + const slot = new Date().getHours(); + console.log(`[scheduler] etl_gl slot=${slot}`); + + try { + const result = await callPhp('/cron/etl_gl_maintenance.php', { slot }); + const summary = (result.results || []).map(r => + r.error + ? `company=${r.company_id} ERROR: ${r.error}` + : `company=${r.company_id} gaps=${r.gaps_found} rebuilt=${r.periods_rebuilt}` + ); + if (summary.length === 0) { + console.log(`[scheduler] etl_gl slot=${slot} — no companies`); + } else { + summary.forEach(s => console.log(`[scheduler] etl_gl ${s}`)); + } + } catch (e) { + console.error('[scheduler] etl_gl_maintenance failed:', e.message); + } +}); + +console.log('[scheduler] running — etl_gl_maintenance wired (hourly, slot-based)');