Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 16 Pull requests Projects Releases 35 Packages Wiki Activity Actions

fix: stream newsletter progress to client

Browse source
This commit is contained in:
Julian Krauser 2025-01-12 13:21:34 +01:00
parent e1f6b36336
commit 1c6c123142
2 changed files with 46 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/helpers/newsletterHelper.ts
View file

@ -33,12 +33,21 @@ export abstract class NewsletterHelper {
private static formatJobEmit(
event: "progress" | "complete",
kind: "pdf" | "mail",
factor: "success" | "failed" | "info",
newsletterId: number,
total: number,
iteration: number,
msg: string
) {
this.jobStatus.emit<NewsletterEventType>(event, { kind, newsletterId, total, iteration, msg, date: new Date() });
this.jobStatus.emit<NewsletterEventType>(event, {
kind,
newsletterId,
factor,
total,
iteration,
msg,
date: new Date(),
});
}
public static buildData(
@ -169,18 +178,9 @@ export abstract class NewsletterHelper {
allowedForMail.includes(m.sendNewsletter?.type?.id)
);
this.formatJobEmit("progress", "mail", newsletterId, mailRecipients.length, 0, "starting sending");
this.formatJobEmit("progress", "mail", "info", newsletterId, mailRecipients.length, 0, "starting sending");
for (const [index, rec] of mailRecipients.entries()) {
this.formatJobEmit(
"progress",
"mail",
newsletterId,
mailRecipients.length,
index,
`start sending to ${rec.sendNewsletter.email}`
);
let data = this.buildData(newsletter, dates, rec);
const { body } = await TemplateHelper.renderFileForModule({
@ -195,9 +195,10 @@ export abstract class NewsletterHelper {
this.formatJobEmit(
"progress",
"mail",
"success",
newsletterId,
mailRecipients.length,
index,
index + 1,
`successfully sent to ${rec.sendNewsletter.email}`
);
})
@ -205,9 +206,10 @@ export abstract class NewsletterHelper {
this.formatJobEmit(
"progress",
"mail",
"failed",
newsletterId,
mailRecipients.length,
index,
index + 1,
`failed to send to ${rec.sendNewsletter.email}`
);
});
@ -216,6 +218,7 @@ export abstract class NewsletterHelper {
this.formatJobEmit(
"complete",
"mail",
"info",
newsletterId,
mailRecipients.length,
mailRecipients.length,
@ -246,21 +249,12 @@ export abstract class NewsletterHelper {
(m) => !notAllowedForPdf.includes(m.sendNewsletter?.type?.id) || m.sendNewsletter == null
);
this.formatJobEmit("progress", "pdf", newsletterId, pdfRecipients.length, 0, "starting sending");
this.formatJobEmit("progress", "pdf", "info", newsletterId, pdfRecipients.length + 1, 0, "starting sending");
for (const [index, rec] of [
...pdfRecipients,
{ id: 0, firstname: "Alle Mitglieder", lastname: CLUB_NAME } as member,
].entries()) {
this.formatJobEmit(
"progress",
"pdf",
newsletterId,
pdfRecipients.length,
index,
`start print for ${rec.lastname}, ${rec.firstname}`
);
let data = this.buildData(newsletter, dates, rec, printWithAdress.includes(rec.sendNewsletter?.type?.id));
await PdfExport.renderFile({
@ -274,9 +268,10 @@ export abstract class NewsletterHelper {
this.formatJobEmit(
"progress",
"pdf",
"success",
newsletterId,
pdfRecipients.length,
index,
pdfRecipients.length + 1,
index + 1,
`successfully printed for ${rec.lastname}, ${rec.firstname}`
);
})
@ -284,23 +279,15 @@ export abstract class NewsletterHelper {
this.formatJobEmit(
"progress",
"pdf",
"failed",
newsletterId,
pdfRecipients.length,
index,
pdfRecipients.length + 1,
index + 1,
`failed print for ${rec.lastname}, ${rec.firstname}`
);
});
}
this.formatJobEmit(
"progress",
"pdf",
newsletterId,
pdfRecipients.length,
pdfRecipients.length,
"starting pdf combine"
);
await PdfExport.sqashToSingleFile(
`newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`,
"allPdfsTogether",
@ -310,9 +297,10 @@ export abstract class NewsletterHelper {
this.formatJobEmit(
"progress",
"pdf",
"success",
newsletterId,
pdfRecipients.length,
pdfRecipients.length,
pdfRecipients.length + 1,
pdfRecipients.length + 1,
"sucessfully combined pdf"
);
})
@ -320,9 +308,10 @@ export abstract class NewsletterHelper {
this.formatJobEmit(
"progress",
"pdf",
"failed",
newsletterId,
pdfRecipients.length,
pdfRecipients.length,
pdfRecipients.length + 1,
pdfRecipients.length + 1,
"failed combining pdf"
);
});
@ -330,9 +319,10 @@ export abstract class NewsletterHelper {
this.formatJobEmit(
"complete",
"pdf",
"info",
newsletterId,
pdfRecipients.length,
pdfRecipients.length,
pdfRecipients.length + 1,
pdfRecipients.length + 1,
`completed printing process`
);
}