src/helpers/newsletterHelper.ts

@@ -141,9 +141,9 @@ export abstract class NewsletterHelper {
       }
     }
 
-    let members = await MemberService.getAll({ noLimit: true });
+    let members = await MemberService.getAll({ noLimit: true, ids: queryMemberIds });
-
+    console.log(members);
-    return members[0].filter((m) => queryMemberIds.includes(m.id));
+    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));
 

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()

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")