From 08a893aa0e063feca24c566a8397e49e8cc233ce Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sun, 9 Feb 2025 17:23:54 +0100
Subject: [PATCH] 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")