thatcher 1.0.75 → 1.0.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thatcher",
-  "version": "1.0.75",
+  "version": "1.0.76",
   "description": "A config-driven application framework for building data-intensive web apps without code.",
   "main": "src/index.js",
   "type": "module",

package/src/lib/bulk-operations.js

@@ -56,6 +56,33 @@ async function bulkTransitionOne(entityName, id, workflowName, toState, user) {
   return transition(entityName, id, workflowName, toState, user, 'bulk operation');
 }
 
+async function bulkNotifyOne(entityName, spec, id, user, message) {
+  // Same permission/row-access gate every other bulk action already applies
+  // -- 'notify' reads the record to build the notification, so it must not
+  // bypass the checks a plain view of that record would require.
+  await requirePermission(user, spec, 'view');
+  const existing = await get(entityName, id, { user });
+  if (!existing) throw new Error('Not found');
+  if (!permissionService.checkRowAccess(user, spec, existing)) throw new Error('Access denied');
+
+  const recipientId = existing.owner_id;
+  if (!recipientId) throw new Error('Record has no owner_id to notify');
+
+  const { createNotification } = await import('../services/notification-engine.js');
+  // createNotification stores user_id as the sole addressee -- the existing
+  // /notifications route already filters list('notification',{user_id:...})
+  // scoped by {user}, so a notification is only ever visible to the user it
+  // names, the same row-access guarantee every other entity gets.
+  return createNotification({
+    user_id: recipientId,
+    title: message || `${spec.label || entityName} update`,
+    message: message || `${spec.label || entityName} "${existing.name || id}" requires attention`,
+    entity_type: entityName,
+    entity_id: id,
+    created_by: user?.id || 'system',
+  });
+}
+
 export async function runBulkOperation(entityName, spec, ids, action, user) {
   if (!Array.isArray(ids) || !ids.length) return { ok: false, error: 'ids array required and must be non-empty' };
   if (ids.length > MAX_BULK_IDS) return { ok: false, error: `Cannot process more than ${MAX_BULK_IDS} ids in one bulk operation` };
@@ -77,6 +104,9 @@ export async function runBulkOperation(entityName, spec, ids, action, user) {
         if (!action.workflow || !action.toState) throw new Error('action.workflow and action.toState required');
         await bulkTransitionOne(entityName, id, action.workflow, action.toState, user);
         results.push({ id, success: true });
+      } else if (action.type === 'notify') {
+        await bulkNotifyOne(entityName, spec, id, user, action.message);
+        results.push({ id, success: true });
       } else {
         results.push({ id, success: false, error: `Unknown action type "${action.type}"` });
       }

package/src/lib/contract-expiry.js

@@ -0,0 +1,13 @@
+// Single source of truth for contract expiry math, shared between
+// page-handler.js's detail-view computation and scheduler-engine.js's
+// expiry-notification pre-filter -- kept in one place so the two never drift
+// against each other the way a duplicated formula could.
+export function daysUntilExpiry(endDate, nowSeconds = Math.floor(Date.now() / 1000)) {
+  return Math.floor((Number(endDate) - nowSeconds) / 86400);
+}
+
+export function isWithinNoticeWindow(contract, nowSeconds = Math.floor(Date.now() / 1000)) {
+  if (contract.status !== 'active' || contract.end_date == null) return false;
+  const days = daysUntilExpiry(contract.end_date, nowSeconds);
+  return days <= (contract.notice_period_days ?? 30);
+}

package/src/lib/scheduler-engine.js

@@ -35,7 +35,18 @@ async function runOneJob(job, nowTs) {
     // scoping crud-handlers.js's read path enforces for an interactive
     // request, so a job cannot reach records outside its owner's org just
     // because it runs unattended.
-    const targets = await list(job.entity, filter, { user: owner });
+    let targets = await list(job.entity, filter, { user: owner });
+
+    // job.filter can only express stored-field equality (e.g. status:active);
+    // "expiring within notice_period_days" is a per-record computed
+    // comparison, not a filterable field, so it's checked here in JS against
+    // the SAME shared math the contract detail view uses -- never a second,
+    // divergent formula.
+    if (job.entity === 'contract' && action?.type === 'notify') {
+      const { isWithinNoticeWindow } = await import('./contract-expiry.js');
+      targets = targets.filter(c => isWithinNoticeWindow(c, nowTs));
+    }
+
     const ids = targets.map(r => r.id);
 
     let result = { ok: true, total: 0, succeeded: 0, failed: 0, results: [] };

package/src/ui/page-handler.js

@@ -155,9 +155,8 @@ async function handleGenericEntityView(user, entityName, id, req) {
     // contract before this line is ever reached), never a separate query
     // that could leak the value to a caller who never proved they can view
     // this specific contract.
-    const nowSeconds = Math.floor(Date.now() / 1000);
-    const daysUntilExpiry = Math.floor((Number(resolvedItem.end_date) - nowSeconds) / 86400);
-    resolvedItem = { ...resolvedItem, days_until_expiry: daysUntilExpiry };
+    const { daysUntilExpiry } = await import('@/lib/contract-expiry.js');
+    resolvedItem = { ...resolvedItem, days_until_expiry: daysUntilExpiry(resolvedItem.end_date) };
   }
   // get(...,{user}) above already enforced row/org access for this exact
   // record (a denied/absent record returns null before this point), so