From 872e6ef9fe3b86aa9d033d9029706dd349f88150 Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Mon, 3 Feb 2025 16:34:49 +0100 Subject: [PATCH] fix: newsletter receiver backup and env Defaults --- Dockerfile | 2 +- src/env.defaults.ts | 6 ++-- src/helpers/backupHelper.ts | 31 ++++++++++++++----- src/index.ts | 2 +- .../newsletter/newsletterRecipientsService.ts | 1 + 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index a059687..cba8aa0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ RUN apk add --no-cache \ WORKDIR /app -RUN mkdir -p /app/export +RUN mkdir -p /app/files ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser diff --git a/src/env.defaults.ts b/src/env.defaults.ts index 61562b5..19024c2 100644 --- a/src/env.defaults.ts +++ b/src/env.defaults.ts @@ -24,8 +24,8 @@ export const MAIL_SECURE = process.env.MAIL_SECURE ?? "false"; export const CLUB_NAME = process.env.CLUB_NAME ?? "FF Admin"; export const CLUB_WEBSITE = process.env.CLUB_WEBSITE ?? ""; -export const BACKUP_INTERVAL = Number(process.env.BACKUP_INTERVAL ?? "0"); -export const BACKUP_COPIES = Number(process.env.BACKUP_COPIES ?? "0"); +export const BACKUP_INTERVAL = Number(process.env.BACKUP_INTERVAL ?? "1"); +export const BACKUP_COPIES = Number(process.env.BACKUP_COPIES ?? "7"); export const BACKUP_AUTO_RESTORE = process.env.BACKUP_AUTO_RESTORE ?? "true"; export function configCheck() { @@ -60,6 +60,8 @@ export function configCheck() { if (BACKUP_AUTO_RESTORE != "true" && BACKUP_AUTO_RESTORE != "false") throw new Error("set 'true' or 'false' to BACKUP_AUTO_RESTORE"); + if (BACKUP_INTERVAL < 1) throw new Error("BACKUP_INTERVAL has to be at least 1"); + if (BACKUP_COPIES < 1) throw new Error("BACKUP_COPIES has to be at least 1"); } function checkMS(input: string, origin: string) { diff --git a/src/helpers/backupHelper.ts b/src/helpers/backupHelper.ts index ff69e71..1024943 100644 --- a/src/helpers/backupHelper.ts +++ b/src/helpers/backupHelper.ts @@ -168,8 +168,9 @@ export default abstract class BackupHelper { this.transactionManager = undefined; }) .catch((err) => { + console.log(err); this.transactionManager = undefined; - throw new DatabaseActionException("BACKUP RESTORE", include.join(", "), err); + throw new DatabaseActionException("BACKUP RESTORE", include.join(", ") || "FULL", err); }); } @@ -331,6 +332,7 @@ export default abstract class BackupHelper { "newsletter.isSent", ]) .addSelect(["dates.calendarId", "dates.diffTitle", "dates.diffDescription"]) + .addSelect(["recipients.memberId"]) .addSelect([ ...(collectIds ? ["member.id"] : []), "member.firstname", @@ -340,7 +342,13 @@ export default abstract class BackupHelper { "member.internalId", ]) .addSelect(["recipientsByQuery.title", "recipientsByQuery.query"]) - .getMany(); + .getMany() + .then((res: any) => + res.map((n: any) => ({ + ...n, + recipients: n.recipients.map((r: any) => ({ ...r, ...(false ? {} : { memberId: undefined }) })), + })) + ); } private static async getNewsletterConfig(): Promise> { return await dataSource @@ -630,7 +638,10 @@ export default abstract class BackupHelper { private static async setNewsletter(data: Array, collectedIds: boolean): Promise { await this.setQueryStore( uniqBy( - data.map((d) => d.recipientsByQueryId).map((d) => ({ ...d, id: undefined })), + data + .map((d) => d.recipientsByQuery) + .filter((q) => q != null) + .map((d) => ({ ...d, id: undefined })), "query" ) ); @@ -639,10 +650,14 @@ export default abstract class BackupHelper { let members = await this.transactionManager.getRepository("member").find(); let dataWithMappedIds = data.map((d) => ({ ...d, - recipientsByQueryId: { - ...d.recipientsByQueryId, - id: queries.find((s) => s.query == d.recipientsByQueryId.query)?.id ?? undefined, - }, + ...(d.recipientsByQuery != null + ? { + recipientsByQuery: { + ...d.recipientsByQuery, + id: queries.find((s) => s.title == d.recipientsByQuery.title)?.id ?? undefined, + }, + } + : {}), ...(!collectedIds ? { recipients: d.recipients.map((r: any) => ({ @@ -687,7 +702,7 @@ export default abstract class BackupHelper { await this.transactionManager .createQueryBuilder() .insert() - .into("award") + .into("calendar_type") .values(uniqBy([...(data?.["calendar_type"] ?? []), ...usedTypes], "type")) .orIgnore() .execute(); diff --git a/src/index.ts b/src/index.ts index 5aa758a..3517a6b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -23,7 +23,7 @@ import BackupHelper from "./helpers/backupHelper"; dataSource.initialize().then(async () => { if ((BACKUP_AUTO_RESTORE as "true" | "false") == "true" && (await dataSource.createQueryRunner().hasTable("user"))) { await BackupHelper.autoRestoreBackup().catch((err) => { - console.log(`${new Date().toISOString()}: failed auto-restoring database`); + console.log(`${new Date().toISOString()}: failed auto-restoring database`, err); }); } }); diff --git a/src/service/club/newsletter/newsletterRecipientsService.ts b/src/service/club/newsletter/newsletterRecipientsService.ts index ec6d846..558acdf 100644 --- a/src/service/club/newsletter/newsletterRecipientsService.ts +++ b/src/service/club/newsletter/newsletterRecipientsService.ts @@ -20,6 +20,7 @@ export default abstract class NewsletterRecipientsService { "sendNewsletter", "sendNewsletter.isSendNewsletter = 1" ) + .leftJoinAndSelect("member.salutation", "salutation") .leftJoinAndSelect("sendNewsletter.type", "communicationtype") .leftJoinAndSelect("newsletterRecipients.newsletter", "newsletter") .where("newsletterRecipients.newsletterId = :id", { id: newsletterId })