Press n or j to go to the next uncovered block, b, p or k for the previous block.
| 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 | 5x 5x 2x 2x 2x 2x 2x 6x 6x 3x 3x 2x 2x 2x 2x 2x 2x 2x 26x 42x 1x 35x 35x 33x 33x 1x 32x 1x 31x 31x 33x 33x 31x 31x 31x 31x 31x 1x 1x 1x 31x 31x 31x 8x 8x 7x 7x 7x 7x 2x 2x 7x 3x 3x 7x 8x 1x 8x 5x 7x 1x 1x 1x 1x 7x 6x 7x 7x 7x 4x 4x 4x 3x 3x 4x 2x 2x 1x 1x 1x 2x 2x 8x 8x 8x 7x 1x 6x 6x 5x 5x 5x 5x 5x 5x 4x 4x 3x 2x 2x 2x 2x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 71x | import {
MAX_WHATSAPP_RECIPIENTS_PER_PRO,
WHATSAPP_OTP_EXPIRY_MINUTES,
WHATSAPP_OTP_RESEND_COOLDOWN_SECONDS,
} from "@interioring/utils/constants/whatsapp";
import { and, asc, eq, isNotNull, ne, sql } from "drizzle-orm";
import type { DrizzleD1Database } from "drizzle-orm/d1";
import * as schema from "../db/schema";
import type {
NewProWhatsAppRecipientEvent,
ProWhatsAppRecipient,
ProWhatsAppRecipientEventType,
} from "../db/schema/pro-whatsapp-recipients";
import { generateOtp, hashOtp, verifyOtp } from "../lib/crypto/otp";
const RECIPIENTS = schema.proWhatsAppRecipients;
const EVENTS = schema.proWhatsAppRecipientEvents;
export type CreateRecipientInput = {
proId: string;
label: string;
number: string; // pre-normalised E.164
makePrimary?: boolean;
actorUserId?: string;
};
export type CreatedRecipient = {
recipient: ProWhatsAppRecipient;
otpCode: string; // raw code; caller dispatches via WhatsApp
};
export type UpdateRecipientPatch = {
label?: string;
notificationsEnabled?: boolean;
isPrimary?: boolean;
};
export class RecipientLimitError extends Error {
code = "MAX_RECIPIENTS";
constructor(public max: number) {
super(`Maximum of ${max} WhatsApp recipients allowed`);
}
}
export class DuplicateRecipientError extends Error {
code = "DUPLICATE_NUMBER";
constructor() {
super("This number is already a recipient for this pro");
}
}
export class RecipientNotFoundError extends Error {
code = "NOT_FOUND";
constructor() {
super("Recipient not found");
}
}
export class AlreadyVerifiedError extends Error {
code = "ALREADY_VERIFIED";
constructor() {
super("Recipient is already verified");
}
}
export class OtpExpiredError extends Error {
code = "OTP_EXPIRED";
constructor() {
super("OTP has expired");
}
}
export class OtpMismatchError extends Error {
code = "OTP_MISMATCH";
constructor() {
super("OTP is incorrect");
}
}
export class OtpCooldownError extends Error {
code = "OTP_COOLDOWN";
constructor(public retryAfterSeconds: number) {
super(`Please wait ${retryAfterSeconds}s before requesting another OTP`);
}
}
export class ProWhatsAppRecipientsDal {
constructor(private db: DrizzleD1Database<typeof schema>) {}
async listByProId(proId: string): Promise<ProWhatsAppRecipient[]> {
// Primary first, then oldest first.
return await this.db
.select()
.from(RECIPIENTS)
.where(eq(RECIPIENTS.proId, proId))
.orderBy(sql`${RECIPIENTS.isPrimary} DESC`, asc(RECIPIENTS.dateCreated));
}
async listEligibleByProId(proId: string): Promise<ProWhatsAppRecipient[]> {
// Verified + opted in. Used by the new-inquiry handler.
return await this.db
.select()
.from(RECIPIENTS)
.where(
and(
eq(RECIPIENTS.proId, proId),
eq(RECIPIENTS.notificationsEnabled, true),
isNotNull(RECIPIENTS.verifiedAt),
),
)
.orderBy(sql`${RECIPIENTS.isPrimary} DESC`, asc(RECIPIENTS.dateCreated));
}
async findById(
id: number,
proId: string,
): Promise<ProWhatsAppRecipient | undefined> {
const rows = await this.db
.select()
.from(RECIPIENTS)
.where(and(eq(RECIPIENTS.id, id), eq(RECIPIENTS.proId, proId)))
.limit(1);
return rows[0];
}
async create(input: CreateRecipientInput): Promise<CreatedRecipient> {
const existing = await this.listByProId(input.proId);
if (existing.length >= MAX_WHATSAPP_RECIPIENTS_PER_PRO) {
throw new RecipientLimitError(MAX_WHATSAPP_RECIPIENTS_PER_PRO);
}
if (existing.some((r) => r.number === input.number)) {
throw new DuplicateRecipientError();
}
const isFirst = existing.length === 0;
const requestedPrimary = isFirst || input.makePrimary === true;
const code = generateOtp();
const otpHash = await hashOtp(code);
const now = new Date();
const expires = new Date(
now.getTime() + WHATSAPP_OTP_EXPIRY_MINUTES * 60 * 1000,
);
const inserted = await this.db
.insert(RECIPIENTS)
.values({
proId: input.proId,
label: input.label,
number: input.number,
isPrimary: requestedPrimary,
notificationsEnabled: true,
verifiedAt: null,
otpHash,
otpExpiresAt: expires,
otpLastSentAt: now,
dateCreated: now,
dateUpdated: now,
})
.returning();
const recipient = inserted[0];
// If this row claimed primary AND there were others, demote them.
if (requestedPrimary && existing.length > 0) {
await this.db
.update(RECIPIENTS)
.set({ isPrimary: false, dateUpdated: now })
.where(
and(
eq(RECIPIENTS.proId, input.proId),
ne(RECIPIENTS.id, recipient.id),
eq(RECIPIENTS.isPrimary, true),
),
);
for (const r of existing.filter((r) => r.isPrimary)) {
await this.writeEvent({
recipientId: r.id,
proId: input.proId,
eventType: "primary_unset",
actorUserId: input.actorUserId ?? null,
metadata: { reason: "new_primary_added", newRecipientId: recipient.id },
});
}
}
await this.writeEvent({
recipientId: recipient.id,
proId: input.proId,
eventType: "created",
actorUserId: input.actorUserId ?? null,
metadata: { label: input.label, isPrimary: requestedPrimary },
});
await this.writeEvent({
recipientId: recipient.id,
proId: input.proId,
eventType: "otp_sent",
actorUserId: input.actorUserId ?? null,
metadata: { reason: "create" },
});
return { recipient, otpCode: code };
}
async updatePartial(
id: number,
proId: string,
patch: UpdateRecipientPatch,
actorUserId?: string,
): Promise<ProWhatsAppRecipient> {
const current = await this.findById(id, proId);
if (!current) throw new RecipientNotFoundError();
const now = new Date();
const sets: Record<string, unknown> = { dateUpdated: now };
const events: NewProWhatsAppRecipientEvent[] = [];
if (patch.label !== undefined && patch.label !== current.label) {
sets.label = patch.label;
events.push({
recipientId: id,
proId,
eventType: "label_updated",
actorUserId: actorUserId ?? null,
metadata: { from: current.label, to: patch.label },
dateCreated: now,
});
}
if (
patch.notificationsEnabled !== undefined &&
patch.notificationsEnabled !== current.notificationsEnabled
) {
sets.notificationsEnabled = patch.notificationsEnabled;
events.push({
recipientId: id,
proId,
eventType: patch.notificationsEnabled
? "notifications_enabled"
: "notifications_disabled",
actorUserId: actorUserId ?? null,
metadata: null,
dateCreated: now,
});
}
const wantsPrimary = patch.isPrimary === true && !current.isPrimary;
// Capture pre-flip primaries (needed for accurate primary_unset audit events)
// before any state mutation.
const priorPrimaries = wantsPrimary
? (
await this.db
.select({ id: RECIPIENTS.id })
.from(RECIPIENTS)
.where(
and(
eq(RECIPIENTS.proId, proId),
eq(RECIPIENTS.isPrimary, true),
ne(RECIPIENTS.id, id),
),
)
).map((r) => r.id)
: [];
// Apply non-primary updates first.
if (Object.keys(sets).length > 1) {
await this.db.update(RECIPIENTS).set(sets).where(eq(RECIPIENTS.id, id));
}
if (wantsPrimary) {
// Atomic flip via D1 batch: demote others, promote this row.
await this.db.batch([
this.db
.update(RECIPIENTS)
.set({ isPrimary: false, dateUpdated: now })
.where(
and(eq(RECIPIENTS.proId, proId), eq(RECIPIENTS.isPrimary, true)),
),
this.db
.update(RECIPIENTS)
.set({ isPrimary: true, dateUpdated: now })
.where(eq(RECIPIENTS.id, id)),
]);
for (const demotedId of priorPrimaries) {
events.push({
recipientId: demotedId,
proId,
eventType: "primary_unset",
actorUserId: actorUserId ?? null,
metadata: { reason: "primary_replaced", newPrimaryId: id },
dateCreated: now,
});
}
events.push({
recipientId: id,
proId,
eventType: "primary_set",
actorUserId: actorUserId ?? null,
metadata: { reason: "user_promoted" },
dateCreated: now,
});
}
if (events.length > 0) {
await this.db.insert(EVENTS).values(events);
}
const updated = await this.findById(id, proId);
Iif (!updated) throw new RecipientNotFoundError();
return updated;
}
async delete(
id: number,
proId: string,
actorUserId?: string,
): Promise<void> {
const all = await this.listByProId(proId);
const target = all.find((r) => r.id === id);
if (!target) throw new RecipientNotFoundError();
const now = new Date();
if (target.isPrimary) {
// listByProId already orders by isPrimary DESC, then dateCreated ASC.
// After excluding the deleted primary, remaining[0] is the next-oldest.
const remaining = all.filter((r) => r.id !== id);
const promote = remaining[0];
if (promote) {
await this.db.batch([
this.db.delete(RECIPIENTS).where(eq(RECIPIENTS.id, id)),
this.db
.update(RECIPIENTS)
.set({ isPrimary: true, dateUpdated: now })
.where(eq(RECIPIENTS.id, promote.id)),
]);
await this.db.insert(EVENTS).values([
{
recipientId: id,
proId,
eventType: "deleted",
actorUserId: actorUserId ?? null,
metadata: { wasPrimary: true, promotedRecipientId: promote.id },
dateCreated: now,
},
{
recipientId: promote.id,
proId,
eventType: "primary_set",
actorUserId: actorUserId ?? null,
metadata: { reason: "primary_handoff" },
dateCreated: now,
},
]);
return;
}
}
await this.db.delete(RECIPIENTS).where(eq(RECIPIENTS.id, id));
await this.writeEvent({
recipientId: id,
proId,
eventType: "deleted",
actorUserId: actorUserId ?? null,
metadata: { wasPrimary: target.isPrimary },
});
}
async verify(
id: number,
proId: string,
code: string,
actorUserId?: string,
): Promise<ProWhatsAppRecipient> {
const current = await this.findById(id, proId);
Iif (!current) throw new RecipientNotFoundError();
if (current.verifiedAt) throw new AlreadyVerifiedError();
if (
!current.otpHash ||
!current.otpExpiresAt ||
current.otpExpiresAt.getTime() < Date.now()
) {
throw new OtpExpiredError();
}
const ok = await verifyOtp(code, current.otpHash);
if (!ok) throw new OtpMismatchError();
const now = new Date();
await this.db
.update(RECIPIENTS)
.set({
verifiedAt: now,
otpHash: null,
otpExpiresAt: null,
dateUpdated: now,
})
.where(eq(RECIPIENTS.id, id));
await this.writeEvent({
recipientId: id,
proId,
eventType: "verified",
actorUserId: actorUserId ?? null,
metadata: null,
});
const updated = await this.findById(id, proId);
Iif (!updated) throw new RecipientNotFoundError();
return updated;
}
async regenerateOtp(
id: number,
proId: string,
actorUserId?: string,
): Promise<{ recipient: ProWhatsAppRecipient; otpCode: string }> {
const current = await this.findById(id, proId);
if (!current) throw new RecipientNotFoundError();
if (current.verifiedAt) throw new AlreadyVerifiedError();
Eif (current.otpLastSentAt) {
const elapsed = Date.now() - current.otpLastSentAt.getTime();
const cooldown = WHATSAPP_OTP_RESEND_COOLDOWN_SECONDS * 1000;
if (elapsed < cooldown) {
throw new OtpCooldownError(Math.ceil((cooldown - elapsed) / 1000));
}
}
const code = generateOtp();
const otpHash = await hashOtp(code);
const now = new Date();
const expires = new Date(
now.getTime() + WHATSAPP_OTP_EXPIRY_MINUTES * 60 * 1000,
);
await this.db
.update(RECIPIENTS)
.set({
otpHash,
otpExpiresAt: expires,
otpLastSentAt: now,
dateUpdated: now,
})
.where(eq(RECIPIENTS.id, id));
await this.writeEvent({
recipientId: id,
proId,
eventType: "otp_sent",
actorUserId: actorUserId ?? null,
metadata: { reason: "resend" },
});
const updated = await this.findById(id, proId);
Iif (!updated) throw new RecipientNotFoundError();
return { recipient: updated, otpCode: code };
}
private async writeEvent(input: {
recipientId: number;
proId: string;
eventType: ProWhatsAppRecipientEventType;
actorUserId: string | null;
metadata: Record<string, unknown> | null;
}): Promise<void> {
await this.db.insert(EVENTS).values({
recipientId: input.recipientId,
proId: input.proId,
eventType: input.eventType,
actorUserId: input.actorUserId,
metadata: input.metadata,
dateCreated: new Date(),
});
}
}
|