refactor: resolve critical tech debt in CRM broadcasts and usage tracking

apps/whatsapp-worker/src/handlers/BroadcastHandler.ts

@@ -3,6 +3,7 @@ import Redis from 'ioredis';
 import { JobHandler, JobData } from './types';
 import { prisma } from '../services/prisma';
 import { logger } from '../logger';
+import { UsageService } from '../services/usage';
 
 export class BroadcastHandler implements JobHandler {
     private async getTenantConfig(organizationId: string, connection: Redis) {
@@ -60,6 +61,13 @@ export class BroadcastHandler implements JobHandler {
 
         for (const contact of list.contacts) {
             try {
+                // 1.5 Check Usage Limit
+                const { allowed } = await UsageService.checkAndIncrement(organizationId, connection);
+                if (!allowed) {
+                    logger.warn({ organizationId, listId }, '[BroadcastHandler] Daily limit reached during broadcast. Halting.');
+                    break;
+                }
+
                 const body = {
                     messaging_product: 'whatsapp',
                     recipient_type: 'individual',
@@ -76,6 +84,21 @@ export class BroadcastHandler implements JobHandler {
 
                 if (response.ok) {
                     successCount++;
+                    // P0 Fix: Persist broadcast message for history
+                    try {
+                        await (prisma as any).message.create({
+                            data: {
+                                organizationId,
+                                contactId: contact.id,
+                                content: message,
+                                direction: 'OUTBOUND',
+                                status: 'SENT',
+                                channel: 'WHATSAPP'
+                            }
+                        });
+                    } catch (dbErr) {
+                        logger.warn({ dbErr, contactId: contact.id }, '[BroadcastHandler] Message persisted failed but Meta send succeeded');
+                    }
                 } else {
                     const errorData = await response.json();
                     logger.warn({ phoneNumber: contact.phoneNumber, errorData }, '[BroadcastHandler] Meta API returned error');

apps/whatsapp-worker/src/index.ts

@@ -169,7 +169,7 @@ const worker = new Worker('whatsapp-queue', async (job: Job<JobData>) => {
     const outboundJobNames = [
         'send-message', 'send-message-direct', 'send-image', 
         'send-interactive-buttons', 'send-interactive-list', 
-        'send-content', 'send-nudge', 'send-broadcast', 'send-direct-message'
+        'send-content', 'send-nudge', 'send-direct-message'
     ];
 
     if (outboundJobNames.includes(job.name)) {

apps/whatsapp-worker/src/services/usage.ts

@@ -8,7 +8,7 @@ export class UsageService {
      * Checks if an organization has exceeded its daily message limit.
      * Increments the count if within limits.
      */
-    static async checkAndIncrement(organizationId: string, redis: Redis): Promise<{ allowed: boolean; current: number; limit: number }> {
+    static async checkAndIncrement(organizationId: string, redis: Redis, amount: number = 1): Promise<{ allowed: boolean; current: number; limit: number }> {
         const org = await getCachedOrganization(organizationId);
         if (!org) return { allowed: false, current: 0, limit: 0 };
 
@@ -16,10 +16,10 @@ export class UsageService {
         const today = new Date().toISOString().split('T')[0];
         const key = `usage:${organizationId}:${today}`;
 
-        // Atomic increment
-        const current = await redis.incr(key);
+        // Atomic increment by amount
+        const current = await redis.incrby(key, amount);
         
-        if (current === 1) {
+        if (current <= amount) {
             // Set expiry for 24h on first use of the day
             await redis.expire(key, 86400);
         }