millas 0.2.12-beta-1 → 0.2.12-beta-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "millas",
-  "version": "0.2.12-beta-1",
+  "version": "0.2.12-beta-2",
   "description": "A modern batteries-included backend framework for Node.js — built on Express, inspired by Laravel, Django, and FastAPI",
   "main": "src/index.js",
   "exports": {

package/src/admin/ActivityLog.js

@@ -1,95 +1,196 @@
 'use strict';
 
 /**
- * AdminActivityLog
+ * ActivityLog
  *
- * Lightweight in-process activity log for the admin panel.
- * Stores the last N actions in a ring buffer — no database required.
+ * Persistent admin activity log — equivalent to Django's django_admin_log.
  *
- * Each entry:
- *   { id, action, resource, recordId, label, user, at, meta }
+ * ── Storage strategy ─────────────────────────────────────────────────────────
  *
- * Usage (automatic — Admin.js calls this internally):
- *   ActivityLog.record('create', 'users', 5, 'Alice Smith');
- *   ActivityLog.record('update', 'posts', 12, 'Hello World');
- *   ActivityLog.record('delete', 'comments', 7, '#7');
+ * Writes go to the `millas_admin_log` DB table (created by system migration
+ * 0002_admin_log). If the DB is unavailable (table not yet created, connection
+ * not configured, etc.) it falls back silently to an in-memory ring buffer
+ * so the admin panel never crashes because of a log write.
  *
- * Read:
- *   ActivityLog.recent(20)   // last 20 entries, newest first
- *   ActivityLog.forResource('users', 10)
+ * Reads come from the DB when available, memory otherwise.
+ *
+ * All DB writes are fire-and-forget — they never block or throw into
+ * the calling request handler.
+ *
+ * ── Usage ─────────────────────────────────────────────────────────────────────
+ *
+ *   // Admin.js calls this automatically — you don't call it directly.
+ *   ActivityLog.record('create', 'posts', 5, 'Hello World', req.adminUser);
+ *   ActivityLog.record('update', 'users', 12, 'alice@example.com', req.adminUser);
+ *   ActivityLog.record('delete', 'comments', 7, '#7', req.adminUser);
+ *
+ *   // Dashboard reads
+ *   const entries = await ActivityLog.recent(25);
+ *   const totals  = await ActivityLog.totals();
+ *
+ * ── Entry shape ───────────────────────────────────────────────────────────────
+ *
+ *   {
+ *     id:         number,
+ *     user_id:    number|null,
+ *     user_email: string,
+ *     resource:   string,    // resource slug
+ *     record_id:  string,    // PK of affected record (null for bulk)
+ *     action:     'create'|'update'|'delete',
+ *     label:      string,    // human-readable record name
+ *     change_msg: string,    // optional extra detail
+ *     created_at: string,    // ISO timestamp
+ *   }
  */
 class AdminActivityLog {
-  constructor(maxSize = 200) {
-    this._log     = [];
-    this._maxSize = maxSize;
+  constructor(maxMemory = 200) {
+    this._mem     = [];   // in-memory fallback ring buffer
+    this._maxMem  = maxMemory;
     this._seq     = 0;
+    this._dbReady = null; // null=unknown, true=available, false=unavailable
   }
 
+  // ─── Public API ────────────────────────────────────────────────────────────
+
   /**
    * Record an admin action.
+   *
    * @param {'create'|'update'|'delete'} action
-   * @param {string} resource   — resource slug
-   * @param {*}      recordId
-   * @param {string} label      — human-readable name of the record
-   * @param {string} [user]     — who performed the action (optional)
+   * @param {string}      resource  — resource slug
+   * @param {*}           recordId  — PK of the affected record (null for bulk)
+   * @param {string}      label     — human-readable description
+   * @param {object|null} user      — req.adminUser (live User model instance)
+   * @param {string}      [changeMsg] — optional detail (changed fields, etc.)
    */
-  record(action, resource, recordId, label, user = null) {
-    this._seq++;
+  record(action, resource, recordId, label, user = null, changeMsg = null) {
+    const userId    = user?.id    || null;
+    const userEmail = user?.email || 'System';
     const entry = {
-      id:         this._seq,
-      action,
+      user_id:    userId,
+      user_email: userEmail,
       resource,
-      recordId,
-      label:      label || `#${recordId}`,
-      user:       user || 'Admin',
-      at:         new Date().toISOString(),
-      _ts:        Date.now(),
+      record_id:  recordId !== null && recordId !== undefined ? String(recordId) : null,
+      action,
+      label:      label || (recordId ? `#${recordId}` : resource),
+      change_msg: changeMsg,
+      created_at: new Date().toISOString(),
     };
 
-    this._log.unshift(entry);
+    // ── Write to DB fire-and-forget ──────────────────────────────────────
+    this._writeDb(entry).catch(() => {});
 
-    // Trim to max size
-    if (this._log.length > this._maxSize) {
-      this._log.length = this._maxSize;
-    }
-  }
-
-  /**
-   * Return the most recent N entries, newest first.
-   */
-  recent(n = 20) {
-    return this._log.slice(0, n);
+    // ── Always write to in-memory buffer too ─────────────────────────────
+    // This ensures recent() works immediately even before the DB round-trip
+    // completes, and provides a fallback if DB is unavailable.
+    this._seq++;
+    this._mem.unshift({ id: this._seq, ...entry });
+    if (this._mem.length > this._maxMem) this._mem.length = this._maxMem;
   }
 
   /**
-   * Return recent entries for a specific resource slug.
+   * Return the most recent N log entries, newest first.
+   * Reads from DB if available, memory otherwise.
    */
-  forResource(slug, n = 10) {
-    return this._log.filter(e => e.resource === slug).slice(0, n);
+  async recent(n = 25) {
+    try {
+      const db = this._getDb();
+      if (db) {
+        const rows = await db('millas_admin_log')
+          .orderBy('id', 'desc')
+          .limit(n);
+        return rows;
+      }
+    } catch { /* DB unavailable */ }
+    return this._mem.slice(0, n);
   }
 
   /**
-   * Return totals by action type.
+   * Return action totals for the current calendar day.
    * { create: N, update: N, delete: N }
+   * Reads from DB if available, memory otherwise.
    */
-  totals() {
+  async totals() {
+    try {
+      const db = this._getDb();
+      if (db) {
+        const today = new Date().toISOString().slice(0, 10); // YYYY-MM-DD
+        const rows  = await db('millas_admin_log')
+          .whereRaw(`date(created_at) = ?`, [today])
+          .select('action')
+          .count('* as count')
+          .groupBy('action');
+
+        const t = { create: 0, update: 0, delete: 0 };
+        for (const r of rows) {
+          if (t[r.action] !== undefined) t[r.action] = Number(r.count);
+        }
+        return t;
+      }
+    } catch { /* DB unavailable */ }
+
+    // In-memory fallback — count today's entries
+    const today = new Date().toISOString().slice(0, 10);
     const t = { create: 0, update: 0, delete: 0 };
-    for (const e of this._log) {
-      if (t[e.action] !== undefined) t[e.action]++;
+    for (const e of this._mem) {
+      if (e.created_at?.slice(0, 10) === today && t[e.action] !== undefined) {
+        t[e.action]++;
+      }
     }
     return t;
   }
 
   /**
-   * Clear all log entries.
+   * Return recent entries for a specific resource slug.
    */
-  clear() {
-    this._log = [];
-    this._seq = 0;
+  async forResource(slug, n = 10) {
+    try {
+      const db = this._getDb();
+      if (db) {
+        return db('millas_admin_log')
+          .where('resource', slug)
+          .orderBy('id', 'desc')
+          .limit(n);
+      }
+    } catch {}
+    return this._mem.filter(e => e.resource === slug).slice(0, n);
+  }
+
+  /**
+   * Clear all log entries (DB + memory).
+   * Primarily for testing.
+   */
+  async clear() {
+    this._mem  = [];
+    this._seq  = 0;
+    try {
+      const db = this._getDb();
+      if (db) await db('millas_admin_log').delete();
+    } catch {}
+  }
+
+  // ─── Internals ─────────────────────────────────────────────────────────────
+
+  async _writeDb(entry) {
+    const db = this._getDb();
+    if (!db) return;
+    await db('millas_admin_log').insert(entry);
+    this._dbReady = true;
+  }
+
+  _getDb() {
+    // Don't retry after a confirmed failure in this process lifetime
+    if (this._dbReady === false) return null;
+    try {
+      const DatabaseManager = require('../orm/drivers/DatabaseManager');
+      if (!DatabaseManager._config) return null;
+      return DatabaseManager.connection();
+    } catch {
+      return null;
+    }
   }
 }
 
 // Singleton
 const activityLog = new AdminActivityLog();
 module.exports = activityLog;
-module.exports.AdminActivityLog = AdminActivityLog;
+module.exports.AdminActivityLog = AdminActivityLog;