From b196f684e7fc8c9c4e404c37350837cc585f9caa Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Sat, 8 Feb 2025 12:54:50 +0100 Subject: [PATCH 1/3] ENV Update --- .env.example | 2 +- README.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index a91184d..0d9bf9d 100644 --- a/.env.example +++ b/.env.example @@ -38,7 +38,7 @@ BACKUP_COPIES = number of parallel copies # default 7 BACKUP_AUTO_RESTORE = (true|false) # default ist true USE_SECURITY_STRICT_LIMIT = (true|false) # default ist true -SECURITY_STRICT_LIMIT_WINDOW = [0-9]*(y|d|h|m|s) # default ist 15 +SECURITY_STRICT_LIMIT_WINDOW = [0-9]*(y|d|h|m|s) # default ist 15m SECURITY_STRICT_LIMIT_REQUEST_COUNT = strict_request_count # default ist 15 USE_SECURITY_LIMIT = (true|false) # default ist true SECURITY_LIMIT_WINDOW = [0-9]*(y|d|h|m|s) # default ist 1m diff --git a/README.md b/README.md index 7faf8c8..91f6037 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,13 @@ services: - BACKUP_INTERVAL= # alle x Tage, sonst keine - BACKUP_COPIES= # Anzahl parallel bestehender Backups - BACKUP_AUTO_RESTORE= # default ist auf true gesetzt + - USE_SECURITY_STRICT_LIMIT = (true|false) # default ist true + - SECURITY_STRICT_LIMIT_WINDOW = [0-9]*(y|d|h|m|s) # default ist 15 + - SECURITY_STRICT_LIMIT_REQUEST_COUNT = strict_request_count # default ist 15 + - USE_SECURITY_LIMIT = (true|false) # default ist true + - SECURITY_LIMIT_WINDOW = [0-9]*(y|d|h|m|s) # default ist 1m + - SECURITY_LIMIT_REQUEST_COUNT = request_count # default ist 500 + - TRUST_PROXY = # wenn leer, wird dieser Wert nicht angewendet. volumes: - :/app/files networks: -- 2.45.3 From a5bd9ec11410cd3cdb4a201ef8f7f3c1003186c3 Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Sat, 8 Feb 2025 12:55:08 +0100 Subject: [PATCH 2/3] fix: ComTyp Field hide --- src/service/club/member/communicationService.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/service/club/member/communicationService.ts b/src/service/club/member/communicationService.ts index 8a33b41..f63a108 100644 --- a/src/service/club/member/communicationService.ts +++ b/src/service/club/member/communicationService.ts @@ -56,6 +56,9 @@ export default abstract class CommunicationService { static getAvailableColumnsForCommunication(): Array { let metadata = dataSource.getMetadata(communication); let columns = metadata.columns.map((c) => c.propertyName); - return columns.filter((c) => !["id", "preferred", "isSMSAlarming", "type", "member"].includes(c)); + return columns.filter( + (c) => + !["id", "preferred", "isSMSAlarming", "isSendNewsletter", "typeId", "memberId", "type", "member"].includes(c) + ); } } -- 2.45.3 From 08a893aa0e063feca24c566a8397e49e8cc233ce Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Sun, 9 Feb 2025 17:23:54 +0100 Subject: [PATCH 3/3] fix: newsletter send error --- src/helpers/newsletterHelper.ts | 14 ++++++++++---- src/service/club/member/memberService.ts | 2 +- .../club/newsletter/newsletterRecipientsService.ts | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/helpers/newsletterHelper.ts b/src/helpers/newsletterHelper.ts index 56f5865..782594a 100644 --- a/src/helpers/newsletterHelper.ts +++ b/src/helpers/newsletterHelper.ts @@ -141,9 +141,9 @@ export abstract class NewsletterHelper { } } - let members = await MemberService.getAll({ noLimit: true }); - - return members[0].filter((m) => queryMemberIds.includes(m.id)); + let members = await MemberService.getAll({ noLimit: true, ids: queryMemberIds }); + console.log(members); + return members[0]; } public static getICSFilePath(newsletter: newsletter) { @@ -253,7 +253,13 @@ export abstract class NewsletterHelper { for (const [index, rec] of [ ...pdfRecipients, - { id: "0", firstname: "Alle Mitglieder", lastname: CLUB_NAME } as member, + { + id: "0", + firstname: "Alle Mitglieder", + lastname: CLUB_NAME, + nameaffix: "", + salutation: { salutation: "" }, + } as member, ].entries()) { let data = this.buildData(newsletter, dates, rec, printWithAdress.includes(rec.sendNewsletter?.type?.id)); diff --git a/src/service/club/member/memberService.ts b/src/service/club/member/memberService.ts index d9080c1..234b73f 100644 --- a/src/service/club/member/memberService.ts +++ b/src/service/club/member/memberService.ts @@ -135,7 +135,7 @@ export default abstract class MemberService { "member.sendNewsletter", "member.communications", "sendNewsletter", - "sendNewsletter.isSendNewsletter = 1" + "sendNewsletter.isSendNewsletter = true" ) .where("member.id = :id", { id: id }) .getOneOrFail() diff --git a/src/service/club/newsletter/newsletterRecipientsService.ts b/src/service/club/newsletter/newsletterRecipientsService.ts index 558acdf..f860cf3 100644 --- a/src/service/club/newsletter/newsletterRecipientsService.ts +++ b/src/service/club/newsletter/newsletterRecipientsService.ts @@ -18,7 +18,7 @@ export default abstract class NewsletterRecipientsService { "member.sendNewsletter", "member.communications", "sendNewsletter", - "sendNewsletter.isSendNewsletter = 1" + "sendNewsletter.isSendNewsletter = true" ) .leftJoinAndSelect("member.salutation", "salutation") .leftJoinAndSelect("sendNewsletter.type", "communicationtype") -- 2.45.3