fix: newsletter receiver backup and env Defaults

This commit is contained in:
Julian Krauser 2025-02-03 16:34:49 +01:00
parent c3e8b6b53b
commit 872e6ef9fe
5 changed files with 30 additions and 12 deletions

View file

@ -32,7 +32,7 @@ RUN apk add --no-cache \
WORKDIR /app WORKDIR /app
RUN mkdir -p /app/export RUN mkdir -p /app/files
ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser

View file

@ -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_NAME = process.env.CLUB_NAME ?? "FF Admin";
export const CLUB_WEBSITE = process.env.CLUB_WEBSITE ?? ""; export const CLUB_WEBSITE = process.env.CLUB_WEBSITE ?? "";
export const BACKUP_INTERVAL = Number(process.env.BACKUP_INTERVAL ?? "0"); export const BACKUP_INTERVAL = Number(process.env.BACKUP_INTERVAL ?? "1");
export const BACKUP_COPIES = Number(process.env.BACKUP_COPIES ?? "0"); export const BACKUP_COPIES = Number(process.env.BACKUP_COPIES ?? "7");
export const BACKUP_AUTO_RESTORE = process.env.BACKUP_AUTO_RESTORE ?? "true"; export const BACKUP_AUTO_RESTORE = process.env.BACKUP_AUTO_RESTORE ?? "true";
export function configCheck() { export function configCheck() {
@ -60,6 +60,8 @@ export function configCheck() {
if (BACKUP_AUTO_RESTORE != "true" && BACKUP_AUTO_RESTORE != "false") if (BACKUP_AUTO_RESTORE != "true" && BACKUP_AUTO_RESTORE != "false")
throw new Error("set 'true' or 'false' to BACKUP_AUTO_RESTORE"); 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) { function checkMS(input: string, origin: string) {

View file

@ -168,8 +168,9 @@ export default abstract class BackupHelper {
this.transactionManager = undefined; this.transactionManager = undefined;
}) })
.catch((err) => { .catch((err) => {
console.log(err);
this.transactionManager = undefined; 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", "newsletter.isSent",
]) ])
.addSelect(["dates.calendarId", "dates.diffTitle", "dates.diffDescription"]) .addSelect(["dates.calendarId", "dates.diffTitle", "dates.diffDescription"])
.addSelect(["recipients.memberId"])
.addSelect([ .addSelect([
...(collectIds ? ["member.id"] : []), ...(collectIds ? ["member.id"] : []),
"member.firstname", "member.firstname",
@ -340,7 +342,13 @@ export default abstract class BackupHelper {
"member.internalId", "member.internalId",
]) ])
.addSelect(["recipientsByQuery.title", "recipientsByQuery.query"]) .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<Array<any>> { private static async getNewsletterConfig(): Promise<Array<any>> {
return await dataSource return await dataSource
@ -630,7 +638,10 @@ export default abstract class BackupHelper {
private static async setNewsletter(data: Array<any>, collectedIds: boolean): Promise<void> { private static async setNewsletter(data: Array<any>, collectedIds: boolean): Promise<void> {
await this.setQueryStore( await this.setQueryStore(
uniqBy( 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" "query"
) )
); );
@ -639,10 +650,14 @@ export default abstract class BackupHelper {
let members = await this.transactionManager.getRepository("member").find(); let members = await this.transactionManager.getRepository("member").find();
let dataWithMappedIds = data.map((d) => ({ let dataWithMappedIds = data.map((d) => ({
...d, ...d,
recipientsByQueryId: { ...(d.recipientsByQuery != null
...d.recipientsByQueryId, ? {
id: queries.find((s) => s.query == d.recipientsByQueryId.query)?.id ?? undefined, recipientsByQuery: {
}, ...d.recipientsByQuery,
id: queries.find((s) => s.title == d.recipientsByQuery.title)?.id ?? undefined,
},
}
: {}),
...(!collectedIds ...(!collectedIds
? { ? {
recipients: d.recipients.map((r: any) => ({ recipients: d.recipients.map((r: any) => ({
@ -687,7 +702,7 @@ export default abstract class BackupHelper {
await this.transactionManager await this.transactionManager
.createQueryBuilder() .createQueryBuilder()
.insert() .insert()
.into("award") .into("calendar_type")
.values(uniqBy([...(data?.["calendar_type"] ?? []), ...usedTypes], "type")) .values(uniqBy([...(data?.["calendar_type"] ?? []), ...usedTypes], "type"))
.orIgnore() .orIgnore()
.execute(); .execute();

View file

@ -23,7 +23,7 @@ import BackupHelper from "./helpers/backupHelper";
dataSource.initialize().then(async () => { dataSource.initialize().then(async () => {
if ((BACKUP_AUTO_RESTORE as "true" | "false") == "true" && (await dataSource.createQueryRunner().hasTable("user"))) { if ((BACKUP_AUTO_RESTORE as "true" | "false") == "true" && (await dataSource.createQueryRunner().hasTable("user"))) {
await BackupHelper.autoRestoreBackup().catch((err) => { await BackupHelper.autoRestoreBackup().catch((err) => {
console.log(`${new Date().toISOString()}: failed auto-restoring database`); console.log(`${new Date().toISOString()}: failed auto-restoring database`, err);
}); });
} }
}); });

View file

@ -20,6 +20,7 @@ export default abstract class NewsletterRecipientsService {
"sendNewsletter", "sendNewsletter",
"sendNewsletter.isSendNewsletter = 1" "sendNewsletter.isSendNewsletter = 1"
) )
.leftJoinAndSelect("member.salutation", "salutation")
.leftJoinAndSelect("sendNewsletter.type", "communicationtype") .leftJoinAndSelect("sendNewsletter.type", "communicationtype")
.leftJoinAndSelect("newsletterRecipients.newsletter", "newsletter") .leftJoinAndSelect("newsletterRecipients.newsletter", "newsletter")
.where("newsletterRecipients.newsletterId = :id", { id: newsletterId }) .where("newsletterRecipients.newsletterId = :id", { id: newsletterId })