Batch bug fix

Author: dcodesdev

RELEASE_NOTES.md

@@ -1,13 +1,11 @@
 ### ✨ Features
 
-- Uses cron job to process queued campaigns, processes messages in batches, much more efficient for large campaigns.
-- Theme toggle updated.
-- Loading state for API keys.
 - New features and improvements.
 
 ### 🐛 Bug Fixes
 
-- Recipient count on campaign page was incorrect.
+- Fixed the issue of campaigns not sending because of incorrect status.
+- Fixed the batch size for processing campaigns.
 - Various bug fixes and optimizations.
 
 ### 📚 Docs

apps/backend/prisma/migrations/20250508171024_creating_state_for_campaign/migration.sql

@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "CampaignStatus" ADD VALUE 'CREATING';

apps/backend/prisma/schema.prisma

@@ -96,6 +96,7 @@ model SubscriberMetadata {
 enum CampaignStatus {
   DRAFT
   SCHEDULED
+  CREATING
   SENDING
   COMPLETED
   CANCELLED

apps/backend/src/campaign/mutation.ts

@@ -375,7 +375,7 @@ export const startCampaign = authProcedure
     const status =
       campaign.scheduledAt && campaign.scheduledAt > new Date()
         ? "SCHEDULED"
-        : "SENDING"
+        : "CREATING"
 
     const updatedCampaign = await prisma.campaign.update({
       where: { id: campaign.id },

apps/backend/src/cron/processQueuedCampaigns.ts

@@ -18,6 +18,7 @@ async function getSubscribersForCampaign(
     where: {
       campaignId,
     },
+    take: BATCH_SIZE,
     include: {
       List: {
         include: {
@@ -86,7 +87,7 @@ export const processQueuedCampaigns = cronJob(
   async () => {
     const queuedCampaigns = await prisma.campaign.findMany({
       where: {
-        status: "SENDING",
+        status: "CREATING",
       },
       include: {
         Organization: {
@@ -154,17 +155,15 @@ export const processQueuedCampaigns = cronJob(
           allSubscribersMap.values()
         ).filter((sub) => !subscribersWithMessage.has(sub.id))
 
-        const batchSubscribers = subscribersToProcess.slice(0, BATCH_SIZE)
-
-        if (batchSubscribers.length === 0) {
+        if (subscribersToProcess.length === 0) {
           continue
         }
 
         await prisma.$transaction(async (tx) => {
           const linkTracker = new LinkTracker(tx)
           const messagesToCreate: Prisma.MessageCreateManyInput[] = []
 
-          for (const subscriber of batchSubscribers) {
+          for (const subscriber of subscribersToProcess) {
             const messageId = uuidV4()
             if (!campaign.content) {
               oneTimeLogger(
@@ -245,6 +244,12 @@ export const processQueuedCampaigns = cronJob(
             await tx.message.createMany({
               data: messagesToCreate,
             })
+
+            await tx.campaign.update({
+              where: { id: campaign.id },
+              data: { status: "SENDING" },
+            })
+
             console.log(
               `Cron job: Created ${messagesToCreate.length} messages for campaign ${campaign.id}.`
             )

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.5.0",
+  "version": "0.5.1",
   "name": "letterspace",
   "private": true,
   "scripts": {