Merge pull request 'patches v1.3.4' (#62) from develop into main

Reviewed-on: #62

.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

README.md

@@ -45,6 +45,13 @@ services:
       - BACKUP_INTERVAL=<number of days (min. 1)> # alle x Tage, sonst keine
       - BACKUP_COPIES=<number of parallel copies> # Anzahl parallel bestehender Backups
       - BACKUP_AUTO_RESTORE=<boolean> # 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 = <boolean|number|ip|ip1,ip2,...> # wenn leer, wird dieser Wert nicht angewendet.
     volumes:
       - <volume|local path>:/app/files
     networks:

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/communicationService.ts

@@ -56,6 +56,9 @@ export default abstract class CommunicationService {
   static getAvailableColumnsForCommunication(): Array<string> {
     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)
+    );
   }
 }

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