greend-server 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "greend-server",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "GreenD ESG backend — self-hosted Express.js API server",
   "type": "module",
   "main": "server.js",

package/server.js

@@ -103,7 +103,9 @@ async function readEsgData() {
   // yearlyValues and lastModifiedBy are accumulated across all year files.
   const byId = new Map();
   for (const yearRecords of allYearData) {
+    if (!Array.isArray(yearRecords)) continue;
     for (const record of yearRecords) {
+      if (!record || typeof record.id !== 'string') continue;
       if (!byId.has(record.id)) {
         byId.set(record.id, { ...record, yearlyValues: {}, lastModifiedBy: [] });
       }
@@ -116,8 +118,12 @@ async function readEsgData() {
       m.unit       = record.unit;
       m.department = record.department;
       // Year-specific data
-      Object.assign(m.yearlyValues, record.yearlyValues);
-      m.lastModifiedBy.push(...record.lastModifiedBy);
+      if (record.yearlyValues && typeof record.yearlyValues === 'object') {
+        Object.assign(m.yearlyValues, record.yearlyValues);
+      }
+      if (Array.isArray(record.lastModifiedBy)) {
+        m.lastModifiedBy.push(...record.lastModifiedBy);
+      }
     }
   }
 
@@ -129,22 +135,30 @@ async function readEsgData() {
 // can corrupt data. This storage layer is designed for single-user or low-concurrency
 // deployments. For multi-user environments with simultaneous edits, migrate to SQLite.
 async function writeEsgData(records) {
+  if (!Array.isArray(records)) return;
   await mkdir(join(DATA_DIR, 'esg'), { recursive: true });
 
   // Collect every year referenced in values or change history
   const years = new Set();
   for (const r of records) {
-    for (const y of Object.keys(r.yearlyValues)) years.add(Number(y));
-    for (const c of r.lastModifiedBy) years.add(c.year);
+    if (!r) continue;
+    const yv = r.yearlyValues && typeof r.yearlyValues === 'object' ? r.yearlyValues : {};
+    const lm = Array.isArray(r.lastModifiedBy) ? r.lastModifiedBy : [];
+    for (const y of Object.keys(yv)) years.add(Number(y));
+    for (const c of lm) if (c?.year != null) years.add(c.year);
   }
 
   for (const year of [...years].sort()) {
     const yearRecords = records
-      .filter(r => year in r.yearlyValues || r.lastModifiedBy.some(c => c.year === year))
+      .filter(r => {
+        const yv = r?.yearlyValues ?? {};
+        const lm = Array.isArray(r?.lastModifiedBy) ? r.lastModifiedBy : [];
+        return year in yv || lm.some(c => c.year === year);
+      })
       .map(r => ({
         ...r,
-        yearlyValues: year in r.yearlyValues ? { [year]: r.yearlyValues[year] } : {},
-        lastModifiedBy: r.lastModifiedBy.filter(c => c.year === year),
+        yearlyValues: year in (r.yearlyValues ?? {}) ? { [year]: r.yearlyValues[year] } : {},
+        lastModifiedBy: (Array.isArray(r.lastModifiedBy) ? r.lastModifiedBy : []).filter(c => c.year === year),
       }));
     await writeFile(
       join(DATA_DIR, 'esg', `${year}.json`),
@@ -154,13 +168,8 @@ async function writeEsgData(records) {
 }
 
 const DEFAULT_PREFS = {
-  dashboardLayout: [
-    { i: 'emissions', x: 0, y: 0, w: 6, h: 4 },
-    { i: 'energy',    x: 6, y: 0, w: 6, h: 4 },
-    { i: 'diversity', x: 0, y: 4, w: 6, h: 4 },
-    { i: 'summary',   x: 6, y: 4, w: 6, h: 4 },
-  ],
-  dashboardPanels: ['emissions', 'energy', 'diversity', 'summary'],
+  dashboardLayout: [],
+  dashboardPanels: [],
   customPanelConfigs: {},
 };
 
@@ -301,6 +310,7 @@ app.get('/api/data', requireAuth, async (req, res) => {
   res.json(await readEsgData());
 });
 app.put('/api/data', requireAuth, async (req, res) => {
+  if (!Array.isArray(req.body)) return res.status(400).json({ error: 'Body must be an array' });
   await writeEsgData(req.body);
   res.sendStatus(204);
 });