Fix scheduled WhatsApp messages sending as email; add 24h cleanup and recipient display
The scheduled-job store never persisted the channel field, so the send worker always fell through to its email branch regardless of what was requested. Also purges sent jobs 24h after sending instead of keeping them forever, and surfaces who each scheduled job will go to in the admin "manage scheduled" lists (now correctly filtered per channel too). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -46,6 +46,8 @@ function addJob(job) {
|
||||
id,
|
||||
eventId: job.eventId || null,
|
||||
broadcast: !!job.broadcast,
|
||||
channel: job.channel || 'email',
|
||||
recipientSummary: job.recipientSummary || null,
|
||||
createdById: job.createdById || null,
|
||||
scheduledAt: job.scheduledAt,
|
||||
createdAt: now.toISOString(),
|
||||
@@ -66,10 +68,26 @@ function listJobs(filter = {}) {
|
||||
return jobs.filter(j => {
|
||||
if (filter.status && j.status !== filter.status) return false;
|
||||
if (filter.eventId && j.eventId !== filter.eventId) return false;
|
||||
if (filter.channel && (j.channel || 'email') !== filter.channel) return false;
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Permanently remove jobs that finished sending more than maxAgeMs ago.
|
||||
* Only touches 'sent' jobs - queued/sending/error jobs are left for admins to review.
|
||||
*/
|
||||
function purgeSentJobs(maxAgeMs = 24 * 60 * 60 * 1000) {
|
||||
const jobs = loadAll();
|
||||
const now = Date.now();
|
||||
const kept = jobs.filter(j => {
|
||||
if (j.status !== 'sent' || !j.sentAt) return true;
|
||||
return (now - new Date(j.sentAt).getTime()) <= maxAgeMs;
|
||||
});
|
||||
if (kept.length !== jobs.length) saveAll(kept);
|
||||
return jobs.length - kept.length;
|
||||
}
|
||||
|
||||
function getDueJobs(now = new Date()) {
|
||||
const jobs = loadAll();
|
||||
const t = now instanceof Date ? now : new Date(now);
|
||||
@@ -105,4 +123,5 @@ module.exports = {
|
||||
updateJob,
|
||||
getJob,
|
||||
deleteJob,
|
||||
purgeSentJobs,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user