@peopl-health/nexus 5.68.7 → 5.68.8

package/lib/models/escalationReviewModel.js

@@ -98,6 +98,7 @@ const draftSchema = new mongoose.Schema({
   missingCharacterization: { type: [String], default: undefined },
   suggestCall: { type: suggestCallSchema, default: undefined },
   sectionsUnavailable: { type: [String], default: undefined },
+  snapshotAt: { type: Date, default: undefined },
 }, { timestamps: { createdAt: true, updatedAt: false } });
 
 const doctorHandoffSchema = new mongoose.Schema({

package/lib/services/escalationReviewService.js

@@ -44,7 +44,7 @@ const AUDIT_SOURCE = 'escalation_review';
 const RECENT_REVIEW_LIMIT = 20;
 const TIMELINE_LIMIT = 500;
 const MAX_REVIEW_UPDATES = 50;
-const DRAFT_DEBOUNCE_MS = 60 * 1000;
+const DRAFT_DEBOUNCE_MS = 20 * 1000;
 const DRAFT_OPERATOR = 'bot:escalationDraft';
 const DIRECT_CHAT_ATTEMPTS = 3;
 const RECHECK_DELAY_MS = 60 * 1000;
@@ -1098,6 +1098,7 @@ async function settleFollowUp(snapshot, { background = true } = {}) {
 }
 
 async function generateBotDraft({ id, lease = null } = {}) {
+  const startedAt = new Date();
   const review = await loadReview(reviewIdOf(id));
   if (review.closedAt || !DOCUMENTING_STATUSES.includes(review.status)) return { review: null, retry: false };
   const latest = (review.drafts ?? []).at(-1);
@@ -1127,6 +1128,7 @@ async function generateBotDraft({ id, lease = null } = {}) {
   }
 
   const entry = {
+    snapshotAt: startedAt,
     doctorText: withIdentity({ identity, review, doctorText: draft.doctorText }),
     patientMessage: draft.patientMessage,
     writtenBy: DRAFT_OPERATOR,
@@ -1137,13 +1139,16 @@ async function generateBotDraft({ id, lease = null } = {}) {
     ...(draft.suggestCall && { suggestCall: draft.suggestCall }),
     ...(draft.sectionsUnavailable?.length && { sectionsUnavailable: draft.sectionsUnavailable }),
   };
-  const saved = await getEscalationReview().findOneAndUpdate(
-    { _id: review._id, status: { $in: DOCUMENTING_STATUSES }, draftDueAt: lease, drafts: { $size: (review.drafts ?? []).length } },
-    { $push: { drafts: entry }, $set: { status: 'draft_ready', draftDueAt: null, draftFailedAt: null }, $unset: { identityBlock: '' } },
+  const EscalationReview = getEscalationReview();
+  const saved = await EscalationReview.findOneAndUpdate(
+    { _id: review._id, status: { $in: DOCUMENTING_STATUSES }, draftDueAt: { $lte: lease }, drafts: { $size: (review.drafts ?? []).length } },
+    { $push: { drafts: entry }, $set: { status: 'draft_ready', draftFailedAt: null }, $unset: { identityBlock: '' } },
     { new: true },
   ).lean();
-  if (saved) await audit(saved, DRAFT_OPERATOR, null, { action: 'draft_saved', draftNumber: saved.drafts.length });
-  return { review: saved, retry: false };
+  if (!saved) return { review: null, retry: false };
+  const released = await EscalationReview.updateOne({ _id: review._id, draftDueAt: lease }, { $set: { draftDueAt: null } }, BOOKKEEPING);
+  await audit(saved, DRAFT_OPERATOR, null, { action: 'draft_saved', draftNumber: saved.drafts.length });
+  return { review: released.matchedCount ? { ...saved, draftDueAt: null } : saved, retry: false };
 }
 
 async function noteFactsContext(review) {
@@ -1361,7 +1366,7 @@ async function handOffToDoctor({ id, mode, physicianEmail = null, sentBy, reques
     if (!approver) throw httpError(403, 'The physician is not an escalation review approver');
   }
 
-  const draftedAt = draft.createdAt ? new Date(draft.createdAt).getTime() : null;
+  const draftedAt = draftTimeOf(draft) ? new Date(draftTimeOf(draft)).getTime() : null;
   if (draftedAt && (review.alarms ?? []).some((alarm) => new Date(alarm.raisedAt).getTime() > draftedAt)) {
     throw httpError(409, 'A new alarm arrived after this draft was written; review it and save a new draft before sending it to the doctor');
   }
@@ -1457,7 +1462,7 @@ async function recordDoctorDecision({
   // Truthiness, not != null: an empty textarea is a decline with nothing to say.
   if (decision === 'needs_intervention' && finalText) approvedText = requiredText(finalText, 'finalText');
 
-  if (APPROVALS.includes(decision) && arrivedAfter(review, draft.createdAt)) {
+  if (APPROVALS.includes(decision) && arrivedAfter(review, draftTimeOf(draft))) {
     if (review.status === 'awaiting_doctor') {
       const redraft = draft.writtenBy === DRAFT_OPERATOR ? { draftDueAt: new Date(), draftAttempts: 0 } : {};
       const returned = await updateReview(reviewId, ['awaiting_doctor'], { $set: { status: 'documenting', ...redraft } }, {
@@ -1572,6 +1577,8 @@ const latestUpdateGuard = (review) => {
   return { updates: { $size: updates.length }, [`updates.${updates.length - 1}.turnId`]: updates.at(-1).turnId };
 };
 
+const draftTimeOf = (draft) => draft.snapshotAt ?? draft.createdAt;
+
 const arrivedAfter = (review, since) => Boolean(since) && [
   ...(review.alarms ?? []).map((alarm) => alarm.raisedAt),
   ...(review.updates ?? []).map((update) => update.at),

package/lib/services/reviewDraftSweepService.js

@@ -6,7 +6,7 @@ const { getEscalationReview } = require('../models/escalationReviewModel');
 const { BOOKKEEPING, DOCUMENTING_STATUSES, generateBotDraft } = require('./escalationReviewService');
 
 const SWEEP_LIMIT = 1;
-const DEFAULT_SWEEP_INTERVAL_MS = 30 * 1000;
+const DEFAULT_SWEEP_INTERVAL_MS = 10 * 1000;
 const RETRY_DELAY_MS = 5 * 60 * 1000;
 const MAX_DRAFT_ATTEMPTS = 3;
 const LEASE_MS = 10 * 60 * 1000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peopl-health/nexus",
-  "version": "5.68.7",
+  "version": "5.68.8",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "keywords": [
     "whatsapp",