.env.example

@@ -10,7 +10,6 @@ SERVER_PORT = portnumber
 JWT_SECRET = ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890
 JWT_EXPIRATION = [0-9]*(y|d|h|m|s)
 REFRESH_EXPIRATION = [0-9]*(y|d|h|m|s)
-PWA_REFRESH_EXPIRATION = [0-9]*(y|d|h|m|s)
 
 MAIL_USERNAME = mail_username
 MAIL_PASSWORD = mail_password

README.md

@@ -6,7 +6,7 @@ Administration für Feuerwehren und Vereine (Backend).
 
 Dieses Projekt, `ff-admin-server`, ist das Backend zur Verwaltung von Mitgliederdaten. Die zugehörige Webapp ist im Repository [ff-admin-ui](https://forgejo.jk-effects.cloud/Ehrenamt/ff-admin) zu finden.
 
-Eine Demo zusammen mit der `ff-admin` finden Sie unter [https://admin-demo.ff-admin.de](https://admin-demo.ff-admin.de).
+Eine Demo zusammen mit der `ff-admin` finden Sie unter [ff-admin-demo.jk-effects.cloud](ff-admin-demo.jk-effects.cloud).
 
 ## Installation
 
@@ -25,21 +25,20 @@ services:
     container_name: ff_member_administration_server
     restart: unless-stopped
     environment:
-      - DB_TYPE=<mysql|sqlite> # default ist auf mysql gesetzt
+      - DB_TYPE=mysql
       - DB_HOST=ffm-db
-      - DB_PORT=<number> # default ist auf 3306 gesetzt
+      - DB_PORT=<number> # fallback ist auf 3306 gesetzt
       - DB_NAME=ffadmin
       - DB_USERNAME=administration_backend
       - DB_PASSWORD=<dbuserpasswd>
       - JWT_SECRET=<tobemodified>
-      - JWT_EXPIRATION=<number[m|d] - bsp.:15m> # default ist auf 15m gesetzt
-      - REFRESH_EXPIRATION=<number[m|d] - bsp.:1d> # default ist auf 1d gesetzt
-      - PWA_REFRESH_EXPIRATION=<number[m|d] - bsp.:5d> # default ist auf 5d gesetzt
+      - JWT_EXPIRATION=<number[m|d] - bsp.:15m>
+      - REFRESH_EXPIRATION=<number[m|d] - bsp.:1d>
       - MAIL_USERNAME=<mailadress|username>
       - MAIL_PASSWORD=<password>
       - MAIL_HOST=<url>
-      - MAIL_PORT=<port> # default ist auf 578 gesetzt
-      - MAIL_SECURE=<boolean> # default ist auf false gesetzt
+      - MAIL_PORT=<port>
+      - MAIL_SECURE=<boolean>
       - CLUB_NAME=<tobemodified>
       - CLUB_WEBSITE=<tobemodified>
     volumes:

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ff-admin-server",
-  "version": "1.1.1",
+  "version": "1.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ff-admin-server",
-      "version": "1.1.1",
+      "version": "1.0.1",
       "license": "GPL-3.0-only",
       "dependencies": {
         "cors": "^2.8.5",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ff-admin-server",
-  "version": "1.1.1",
+  "version": "1.0.1",
   "description": "Feuerwehr/Verein Mitgliederverwaltung Server",
   "main": "dist/index.js",
   "scripts": {

src/command/club/member/memberCommandHandler.ts

@@ -43,6 +43,7 @@ export default abstract class MemberCommandHandler {
    * @returns {Promise<void>}
    */
   static async update(updateMember: UpdateMemberCommand): Promise<void> {
+    console.log(updateMember);
     return await dataSource
       .createQueryBuilder()
       .update(member)

src/command/club/member/membershipCommandHandler.ts

@@ -31,7 +31,7 @@ export default abstract class MembershipCommandHandler {
           .createQueryBuilder()
           .update(membership)
           .set({
-            end: new Date(new Date(createMembership.start).setDate(new Date(createMembership.start).getDate() - 1)),
+            end: new Date(createMembership.start).setDate(new Date(createMembership.start).getDate() - 1),
             terminationReason: "beendet durch neuen Eintrag.",
           })
           .where("end IS NULL")

src/command/club/protocol/protocolPresenceCommand.ts

@@ -6,5 +6,4 @@ export interface SynchronizeProtocolPresenceCommand {
 export interface ProtocolPresenceCommand {
   memberId: number;
   absent: boolean;
-  excused: boolean;
 }

src/command/club/protocol/protocolPresenceCommandHandler.ts

@@ -74,7 +74,6 @@ export default abstract class ProtocolPresenceCommandHandler {
       .update(protocolPresence)
       .set({
         absent: member.absent,
-        excused: member.excused,
       })
       .where("memberId = :memberId", { memberId: member.memberId })
       .andWhere("protocolId = :protocolId", { protocolId })

src/command/refreshCommand.ts

@@ -1,6 +1,5 @@
 export interface CreateRefreshCommand {
   userId: number;
-  isFromPwa?: boolean;
 }
 
 export interface DeleteRefreshCommand {

src/command/refreshCommandHandler.ts

@@ -1,9 +1,11 @@
 import { dataSource } from "../data-source";
 import { refresh } from "../entity/refresh";
-import { PWA_REFRESH_EXPIRATION, REFRESH_EXPIRATION } from "../env.defaults";
+import { REFRESH_EXPIRATION } from "../env.defaults";
 import InternalException from "../exceptions/internalException";
+import { JWTHelper } from "../helpers/jwtHelper";
 import { StringHelper } from "../helpers/stringHelper";
 import UserService from "../service/user/userService";
+import { JWTRefresh } from "../type/jwtTypes";
 import { CreateRefreshCommand, DeleteRefreshCommand } from "./refreshCommand";
 import ms from "ms";
 
@@ -14,6 +16,10 @@ export default abstract class RefreshCommandHandler {
    * @returns {Promise<string>}
    */
   static async create(createRefresh: CreateRefreshCommand): Promise<string> {
+    // let createRefreshToken: JWTRefresh = {
+    //   userId: createRefresh.userId,
+    // };
+    // const refreshToken = await JWTHelper.create(createRefreshToken);
     const refreshToken = StringHelper.random(32);
 
     return await dataSource
@@ -23,9 +29,7 @@ export default abstract class RefreshCommandHandler {
       .values({
         token: refreshToken,
         user: await UserService.getById(createRefresh.userId),
-        expiry: createRefresh.isFromPwa
-          ? new Date(Date.now() + ms(PWA_REFRESH_EXPIRATION))
-          : new Date(Date.now() + ms(REFRESH_EXPIRATION)),
+        expiry: new Date(Date.now() + ms(REFRESH_EXPIRATION)),
       })
       .execute()
       .then((result) => {

src/command/settings/award/awardCommandHandler.ts

@@ -60,10 +60,7 @@ export default abstract class AwardCommandHandler {
       .execute()
       .then(() => {})
       .catch((err) => {
-        throw new InternalException(
-          `Failed deleting award ${err.code.includes("ER_ROW_IS_REFERENCED") ? " due to referenced data" : ""}`,
-          err
-        );
+        throw new InternalException("Failed deleting award", err);
       });
   }
 }

src/command/settings/calendarType/calendarTypeCommandHandler.ts

@@ -66,10 +66,7 @@ export default abstract class CalendarTypeCommandHandler {
       .execute()
       .then(() => {})
       .catch((err) => {
-        throw new InternalException(
-          `Failed deleting calendarType${err.code.includes("ER_ROW_IS_REFERENCED") ? " due to referenced data" : ""}`,
-          err
-        );
+        throw new InternalException("Failed deleting calendarType", err);
       });
   }
 }

src/command/settings/communicationType/communicationTypeCommandHandler.ts

@@ -66,12 +66,7 @@ export default abstract class CommunicationTypeCommandHandler {
       .execute()
       .then(() => {})
       .catch((err) => {
-        throw new InternalException(
-          `Failed deleting communicationType${
-            err.code.includes("ER_ROW_IS_REFERENCED") ? " due to referenced data" : ""
-          }`,
-          err
-        );
+        throw new InternalException("Failed deleting communicationType", err);
       });
   }
 }

src/command/settings/executivePosition/executivePositionCommandHandler.ts

@@ -64,12 +64,7 @@ export default abstract class ExecutivePositionCommandHandler {
       .execute()
       .then(() => {})
       .catch((err) => {
-        throw new InternalException(
-          `Failed deleting executivePosition${
-            err.code.includes("ER_ROW_IS_REFERENCED") ? " due to referenced data" : ""
-          }`,
-          err
-        );
+        throw new InternalException("Failed deleting executivePosition", err);
       });
   }
 }

src/command/settings/membershipStatus/membershipStatusCommandHandler.ts

@@ -64,12 +64,7 @@ export default abstract class MembershipStatusCommandHandler {
       .execute()
       .then(() => {})
       .catch((err) => {
-        throw new InternalException(
-          `Failed deleting membershipStatus${
-            err.code.includes("ER_ROW_IS_REFERENCED") ? " due to referenced data" : ""
-          }`,
-          err
-        );
+        throw new InternalException("Failed deleting membershipStatus", err);
       });
   }
 }

src/command/settings/newsletterConfig/newsletterConfigCommand.ts

@@ -4,3 +4,7 @@ export interface SetNewsletterConfigCommand {
   comTypeId: number;
   config: NewsletterConfigType;
 }
+
+export interface DeleteNewsletterConfigCommand {
+  comTypeId: number;
+}

src/command/settings/newsletterConfig/newsletterConfigCommandHandler.ts

@@ -1,7 +1,7 @@
 import { dataSource } from "../../../data-source";
 import { newsletterConfig } from "../../../entity/settings/newsletterConfig";
 import InternalException from "../../../exceptions/internalException";
-import { SetNewsletterConfigCommand } from "./newsletterConfigCommand";
+import { DeleteNewsletterConfigCommand, SetNewsletterConfigCommand } from "./newsletterConfigCommand";
 
 export default abstract class NewsletterConfigCommandHandler {
   /**
@@ -27,4 +27,21 @@ export default abstract class NewsletterConfigCommandHandler {
         throw new InternalException("Failed setting newsletterConfig", err);
       });
   }
+  /**
+   * @description delete newsletterConfig
+   * @param {DeleteNewsletterConfigCommand} deleteNewsletterConfig
+   * @returns {Promise<void>}
+   */
+  static async delete(deleteNewsletterConfig: DeleteNewsletterConfigCommand): Promise<void> {
+    return await dataSource
+      .createQueryBuilder()
+      .delete()
+      .from(newsletterConfig)
+      .where("comTypeId = :comTypeId", { comTypeId: deleteNewsletterConfig.comTypeId })
+      .execute()
+      .then(() => {})
+      .catch((err) => {
+        throw new InternalException("Failed setting newsletterConfig", err);
+      });
+  }
 }

src/command/settings/qualification/qualificationCommandHandler.ts

@@ -66,10 +66,7 @@ export default abstract class QualificationCommandHandler {
       .execute()
       .then(() => {})
       .catch((err) => {
-        throw new InternalException(
-          `Failed deleting qualification${err.code.includes("ER_ROW_IS_REFERENCED") ? " due to referenced data" : ""}`,
-          err
-        );
+        throw new InternalException("Failed deleting qualification", err);
       });
   }
 }

src/command/settings/queryStore/queryStoreCommandHandler.ts

@@ -63,10 +63,7 @@ export default abstract class QueryStoreCommandHandler {
       .execute()
       .then(() => {})
       .catch((err) => {
-        throw new InternalException(
-          `Failed deleting queryStore${err.code.includes("ER_ROW_IS_REFERENCED") ? " due to referenced data" : ""}`,
-          err
-        );
+        throw new InternalException("Failed deleting queryStore", err);
       });
   }
 }

src/command/settings/template/templateCommandHandler.ts

@@ -64,10 +64,7 @@ export default abstract class TemplateCommandHandler {
       .execute()
       .then(() => {})
       .catch((err) => {
-        throw new InternalException(
-          `Failed deleting template${err.code.includes("ER_ROW_IS_REFERENCED") ? " due to referenced data" : ""}`,
-          err
-        );
+        throw new InternalException("Failed deleting template", err);
       });
   }
 }

src/controller/admin/club/memberController.ts

@@ -61,13 +61,8 @@ export async function getAllMembers(req: Request, res: Response): Promise<any> {
   let offset = parseInt((req.query.offset as string) ?? "0");
   let count = parseInt((req.query.count as string) ?? "25");
   let search = (req.query.search as string) ?? "";
-  let noLimit = req.query.noLimit === "true";
-  let ids = ((req.query.ids ?? "") as string)
-    .split(",")
-    .filter((i) => i)
-    .map((i) => parseInt(i));
 
-  let [members, total] = await MemberService.getAll({ offset, count, search, noLimit, ids });
+  let [members, total] = await MemberService.getAll(offset, count, search);
 
   res.json({
     members: MemberFactory.mapToBase(members),

src/controller/admin/club/newsletterController.ts

@@ -6,10 +6,7 @@ import NewsletterDatesFactory from "../../../factory/admin/club/newsletter/newsl
 import NewsletterRecipientsService from "../../../service/club/newsletter/newsletterRecipientsService";
 import NewsletterRecipientsFactory from "../../../factory/admin/club/newsletter/newsletterRecipients";
 import { FileSystemHelper } from "../../../helpers/fileSystemHelper";
-import {
-  CreateNewsletterCommand,
-  SynchronizeNewsletterCommand,
-} from "../../../command/club/newsletter/newsletterCommand";
+import { CreateNewsletterCommand, SynchronizeNewsletterCommand } from "../../../command/club/newsletter/newsletterCommand";
 import NewsletterCommandHandler from "../../../command/club/newsletter/newsletterCommandHandler";
 import { SynchronizeNewsletterDatesCommand } from "../../../command/club/newsletter/newsletterDatesCommand";
 import NewsletterDatesCommandHandler from "../../../command/club/newsletter/newsletterDatesCommandHandler";
@@ -191,14 +188,15 @@ export async function createNewsletter(req: Request, res: Response): Promise<any
 export async function getNewsletterPrintoutProgressById(req: Request, res: Response): Promise<any> {
   let newsletterId = parseInt(req.params.newsletterId);
 
-  res.writeHead(200, {
-    "Content-Type": "text/plain",
-    "Transfer-Encoding": "chunked",
-  });
+  res.setHeader("Content-Type", "text/event-stream");
+  res.setHeader("Cache-Control", "no-cache");
+  res.setHeader("Connection", "keep-alive");
+
+  res.flushHeaders();
 
   const progressHandler = (data: NewsletterEventType) => {
     if (data.newsletterId == newsletterId && data.kind == "pdf") {
-      res.write(JSON.stringify(data) + "//");
+      res.write(JSON.stringify(data));
     }
   };
 
@@ -289,14 +287,15 @@ export async function sendNewsletterById(req: Request, res: Response): Promise<a
 export async function getNewsletterSendingProgressById(req: Request, res: Response): Promise<any> {
   let newsletterId = parseInt(req.params.newsletterId);
 
-  res.writeHead(200, {
-    "Content-Type": "text/plain",
-    "Transfer-Encoding": "chunked",
-  });
+  res.setHeader("Content-Type", "text/event-stream");
+  res.setHeader("Cache-Control", "no-cache");
+  res.setHeader("Connection", "keep-alive");
+
+  res.flushHeaders();
 
   const progressHandler = (data: NewsletterEventType) => {
     if (data.newsletterId == newsletterId && data.kind == "mail") {
-      res.write(JSON.stringify(data) + "//");
+      res.write(JSON.stringify(data));
     }
   };
 

src/controller/admin/club/protocolController.ts

@@ -260,9 +260,7 @@ export async function createProtocolPrintoutById(req: Request, res: Response): P
       agenda,
       decisions,
       presence: presence.filter((p) => !p.absent).map((p) => p.member),
-      absent: presence.filter((p) => p.absent).map((p) => ({ ...p.member, excused: p.excused })),
-      excused_absent: presence.filter((p) => p.absent && p.excused).map((p) => p.member),
-      unexcused_absent: presence.filter((p) => p.absent && !p.excused).map((p) => p.member),
+      absent: presence.filter((p) => p.absent).map((p) => p.member),
       votings,
     },
   });
@@ -391,7 +389,6 @@ export async function synchronizeProtocolPrecenseById(req: Request, res: Respons
     members: presence.map((p) => ({
       memberId: p.memberId,
       absent: p.absent,
-      excused: p.excused,
     })),
     protocolId,
   };

src/controller/admin/settings/newsletterConfigController.ts

@@ -2,7 +2,7 @@ import { Request, Response } from "express";
 import NewsletterConfigService from "../../../service/settings/newsletterConfigService";
 import NewsletterConfigFactory from "../../../factory/admin/settings/newsletterConfig";
 import NewsletterConfigCommandHandler from "../../../command/settings/newsletterConfig/newsletterConfigCommandHandler";
-import { SetNewsletterConfigCommand } from "../../../command/settings/newsletterConfig/newsletterConfigCommand";
+import { DeleteNewsletterConfigCommand, SetNewsletterConfigCommand } from "../../../command/settings/newsletterConfig/newsletterConfigCommand";
 
 /**
  * @description get all newsletterConfigs
@@ -47,3 +47,20 @@ export async function setNewsletterConfig(req: Request, res: Response): Promise<
 
   res.send(id);
 }
+
+/**
+ * @description delete award
+ * @param req {Request} Express req object
+ * @param res {Response} Express res object
+ * @returns {Promise<*>}
+ */
+export async function deleteNewsletterConfig(req: Request, res: Response): Promise<any> {
+  const comTypeId = parseInt(req.params.comTypeId);
+
+  let deleteNewsletterConfig: DeleteNewsletterConfigCommand = {
+    comTypeId: comTypeId,
+  };
+  await NewsletterConfigCommandHandler.delete(deleteNewsletterConfig);
+
+  res.sendStatus(204);
+}

src/controller/authController.ts

@@ -8,6 +8,9 @@ import UserService from "../service/user/userService";
 import speakeasy from "speakeasy";
 import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException";
 import RefreshService from "../service/refreshService";
+import UserPermissionService from "../service/user/userPermissionService";
+import PermissionHelper from "../helpers/permissionHelper";
+import RolePermissionService from "../service/user/rolePermissionService";
 
 /**
  * @description Check authentication status by token
@@ -36,7 +39,6 @@ export async function login(req: Request, res: Response): Promise<any> {
 
   let refreshCommand: CreateRefreshCommand = {
     userId: id,
-    isFromPwa: req.isPWA,
   };
   let refreshToken = await RefreshCommandHandler.create(refreshCommand);
 
@@ -81,7 +83,6 @@ export async function refresh(req: Request, res: Response): Promise<any> {
 
   let refreshCommand: CreateRefreshCommand = {
     userId: tokenUserId,
-    isFromPwa: req.isPWA,
   };
   let refreshToken = await RefreshCommandHandler.create(refreshCommand);
 

src/data-source.ts

@@ -67,7 +67,6 @@ import { ProtocolAbsent1736072179716 } from "./migrations/1736072179716-protocol
 import { Memberlist1736079005086 } from "./migrations/1736079005086-memberlist";
 import { ExtendViewValues1736084198860 } from "./migrations/1736084198860-extendViewValues";
 import { FinishInternalIdTransfer1736505324488 } from "./migrations/1736505324488-finishInternalIdTransfer";
-import { ProtocolPresenceExcuse1737287798828 } from "./migrations/1737287798828-protocolPresenceExcuse";
 
 const dataSource = new DataSource({
   type: DB_TYPE as any,
@@ -145,7 +144,6 @@ const dataSource = new DataSource({
     Memberlist1736079005086,
     ExtendViewValues1736084198860,
     FinishInternalIdTransfer1736505324488,
-    ProtocolPresenceExcuse1737287798828,
   ],
   migrationsRun: true,
   migrationsTransactionMode: "each",

src/entity/club/member/communication.ts

@@ -40,17 +40,17 @@ export class communication {
   @Column()
   typeId: number;
 
-  @ManyToOne(() => member, (member) => member.awards, {
-    nullable: false,
-    onDelete: "CASCADE",
-    onUpdate: "RESTRICT",
-  })
-  member: member;
-
   @ManyToOne(() => communicationType, (communicationType) => communicationType.communications, {
     nullable: false,
     onDelete: "RESTRICT",
     onUpdate: "RESTRICT",
   })
   type: communicationType;
+
+  @ManyToOne(() => member, (member) => member.awards, {
+    nullable: false,
+    onDelete: "CASCADE",
+    onUpdate: "RESTRICT",
+  })
+  member: member;
 }

src/entity/club/protocol/protocolPresence.ts

@@ -13,9 +13,6 @@ export class protocolPresence {
   @Column({ type: "boolean", default: false })
   absent: boolean;
 
-  @Column({ type: "boolean", default: true })
-  excused: boolean;
-
   @ManyToOne(() => member, {
     nullable: false,
     onDelete: "CASCADE",

src/entity/club/protocol/protocolPrintout.ts

@@ -9,7 +9,7 @@ export class protocolPrintout {
   @Column({ type: "varchar", length: 255 })
   title: string;
 
-  @Column({ type: "int", default: "1" })
+  @Column({ type: "int" })
   iteration: number;
 
   @Column({ type: "varchar", length: 255 })

src/env.defaults.ts

@@ -13,7 +13,6 @@ export const SERVER_PORT = Number(process.env.SERVER_PORT ?? 5000);
 export const JWT_SECRET = process.env.JWT_SECRET ?? "my_jwt_secret_string_ilughfnadiuhgq§$IUZGFVRweiouarbt1oub3h5q4a";
 export const JWT_EXPIRATION = process.env.JWT_EXPIRATION ?? "15m";
 export const REFRESH_EXPIRATION = process.env.REFRESH_EXPIRATION ?? "1d";
-export const PWA_REFRESH_EXPIRATION = process.env.PWA_REFRESH_EXPIRATION ?? "5d";
 
 export const MAIL_USERNAME = process.env.MAIL_USERNAME ?? "";
 export const MAIL_PASSWORD = process.env.MAIL_PASSWORD ?? "";
@@ -36,7 +35,6 @@ export function configCheck() {
   if (JWT_SECRET == "" || typeof JWT_SECRET != "string") throw new Error("set valid value to JWT_SECRET");
   checkMS(JWT_EXPIRATION, "JWT_EXPIRATION");
   checkMS(REFRESH_EXPIRATION, "REFRESH_EXPIRATION");
-  checkMS(PWA_REFRESH_EXPIRATION, "PWA_REFRESH_EXPIRATION");
 
   if (MAIL_USERNAME == "" || typeof MAIL_USERNAME != "string") throw new Error("set valid value to MAIL_USERNAME");
   if (MAIL_PASSWORD == "" || typeof MAIL_PASSWORD != "string") throw new Error("set valid value to MAIL_PASSWORD");
@@ -44,6 +42,7 @@ export function configCheck() {
   if (typeof MAIL_PORT != "number") throw new Error("set valid numeric value to MAIL_PORT");
   if (MAIL_SECURE != "true" && MAIL_SECURE != "false") throw new Error("set 'true' or 'false' to MAIL_SECURE");
 
+  console.log(CLUB_WEBSITE);
   if (
     CLUB_WEBSITE != "" &&
     !/^(http(s):\/\/.)[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)$/.test(CLUB_WEBSITE)

src/factory/admin/club/protocol/protocolPresence.ts

@@ -12,7 +12,6 @@ export default abstract class ProtocolPresenceFactory {
     return {
       memberId: record.member.id,
       absent: record.absent,
-      excused: record.excused,
       protocolId: record.protocolId,
     };
   }

src/helpers/newsletterHelper.ts

@@ -33,21 +33,12 @@ export abstract class NewsletterHelper {
   private static formatJobEmit(
     event: "progress" | "complete",
     kind: "pdf" | "mail",
-    factor: "success" | "failed" | "info",
     newsletterId: number,
     total: number,
     iteration: number,
     msg: string
   ) {
-    this.jobStatus.emit<NewsletterEventType>(event, {
-      kind,
-      newsletterId,
-      factor,
-      total,
-      iteration,
-      msg,
-      date: new Date(),
-    });
+    this.jobStatus.emit<NewsletterEventType>(event, { kind, newsletterId, total, iteration, msg, date: new Date() });
   }
 
   public static buildData(
@@ -141,7 +132,9 @@ export abstract class NewsletterHelper {
       }
     }
 
-    let members = await MemberService.getAll({ noLimit: true });
+    console.log(queryMemberIds);
+
+    let members = await MemberService.getAll(0, 1000);
 
     return members[0].filter((m) => queryMemberIds.includes(m.id));
   }
@@ -178,9 +171,18 @@ export abstract class NewsletterHelper {
         allowedForMail.includes(m.sendNewsletter?.type?.id)
     );
 
-    this.formatJobEmit("progress", "mail", "info", newsletterId, mailRecipients.length, 0, "starting sending");
+    this.formatJobEmit("progress", "mail", newsletterId, mailRecipients.length, 0, "starting sending");
 
     for (const [index, rec] of mailRecipients.entries()) {
+      this.formatJobEmit(
+        "progress",
+        "mail",
+        newsletterId,
+        mailRecipients.length,
+        index,
+        `start sending to ${rec.sendNewsletter.email}`
+      );
+
       let data = this.buildData(newsletter, dates, rec);
 
       const { body } = await TemplateHelper.renderFileForModule({
@@ -195,10 +197,9 @@ export abstract class NewsletterHelper {
           this.formatJobEmit(
             "progress",
             "mail",
-            "success",
             newsletterId,
             mailRecipients.length,
-            index + 1,
+            index,
             `successfully sent to ${rec.sendNewsletter.email}`
           );
         })
@@ -206,19 +207,18 @@ export abstract class NewsletterHelper {
           this.formatJobEmit(
             "progress",
             "mail",
-            "failed",
             newsletterId,
             mailRecipients.length,
-            index + 1,
+            index,
             `failed to send to ${rec.sendNewsletter.email}`
           );
+          console.log("mail send", err);
         });
     }
 
     this.formatJobEmit(
       "complete",
       "mail",
-      "info",
       newsletterId,
       mailRecipients.length,
       mailRecipients.length,
@@ -249,12 +249,21 @@ export abstract class NewsletterHelper {
       (m) => !notAllowedForPdf.includes(m.sendNewsletter?.type?.id) || m.sendNewsletter == null
     );
 
-    this.formatJobEmit("progress", "pdf", "info", newsletterId, pdfRecipients.length + 1, 0, "starting sending");
+    this.formatJobEmit("progress", "pdf", newsletterId, pdfRecipients.length, 0, "starting sending");
 
     for (const [index, rec] of [
       ...pdfRecipients,
       { id: 0, firstname: "Alle Mitglieder", lastname: CLUB_NAME } as member,
     ].entries()) {
+      this.formatJobEmit(
+        "progress",
+        "pdf",
+        newsletterId,
+        pdfRecipients.length,
+        index,
+        `start print for ${rec.lastname}, ${rec.firstname}`
+      );
+
       let data = this.buildData(newsletter, dates, rec, printWithAdress.includes(rec.sendNewsletter?.type?.id));
 
       await PdfExport.renderFile({
@@ -268,10 +277,9 @@ export abstract class NewsletterHelper {
           this.formatJobEmit(
             "progress",
             "pdf",
-            "success",
             newsletterId,
-            pdfRecipients.length + 1,
-            index + 1,
+            pdfRecipients.length,
+            index,
             `successfully printed for ${rec.lastname}, ${rec.firstname}`
           );
         })
@@ -279,15 +287,24 @@ export abstract class NewsletterHelper {
           this.formatJobEmit(
             "progress",
             "pdf",
-            "failed",
             newsletterId,
-            pdfRecipients.length + 1,
-            index + 1,
+            pdfRecipients.length,
+            index,
             `failed print for ${rec.lastname}, ${rec.firstname}`
           );
+          console.log("pdf print", err);
         });
     }
 
+    this.formatJobEmit(
+      "progress",
+      "pdf",
+      newsletterId,
+      pdfRecipients.length,
+      pdfRecipients.length,
+      "starting pdf combine"
+    );
+
     await PdfExport.sqashToSingleFile(
       `newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`,
       "allPdfsTogether",
@@ -297,10 +314,9 @@ export abstract class NewsletterHelper {
         this.formatJobEmit(
           "progress",
           "pdf",
-          "success",
           newsletterId,
-          pdfRecipients.length + 1,
-          pdfRecipients.length + 1,
+          pdfRecipients.length,
+          pdfRecipients.length,
           "sucessfully combined pdf"
         );
       })
@@ -308,21 +324,20 @@ export abstract class NewsletterHelper {
         this.formatJobEmit(
           "progress",
           "pdf",
-          "failed",
           newsletterId,
-          pdfRecipients.length + 1,
-          pdfRecipients.length + 1,
+          pdfRecipients.length,
+          pdfRecipients.length,
           "failed combining pdf"
         );
+        console.log("pdf squash", err);
       });
 
     this.formatJobEmit(
       "complete",
       "pdf",
-      "info",
       newsletterId,
-      pdfRecipients.length + 1,
-      pdfRecipients.length + 1,
+      pdfRecipients.length,
+      pdfRecipients.length,
       `completed printing process`
     );
   }

src/index.ts

@@ -12,7 +12,6 @@ declare global {
       username: string;
       isOwner: boolean;
       permissions: PermissionObject;
-      isPWA: boolean;
     }
   }
 }

src/middleware/detectPWA.ts

@@ -1,11 +0,0 @@
-import { Request, Response } from "express";
-
-export default async function detectPWA(req: Request, res: Response, next: Function) {
-  const userAgent = req.headers["user-agent"] || "";
-  if ((userAgent.includes("Mobile") && userAgent.includes("Standalone")) || req.headers["x-pwa-client"] === "true") {
-    req.isPWA = true;
-  } else {
-    req.isPWA = false;
-  }
-  next();
-}

src/migrations/1735822722235-internalId.ts

@@ -19,6 +19,7 @@ export class InternalId1735822722235 implements MigrationInterface {
     );
 
     // let memberships = await queryRunner.manager.getRepository(membership).find();
+    // console.log(memberships);
     // let internalIds = memberships.reduce<{ [key: number]: Array<string> }>((acc, cur) => {
     //   let memberId = cur.memberId;
     //   let setIds = acc[memberId] ?? [];
@@ -29,6 +30,7 @@ export class InternalId1735822722235 implements MigrationInterface {
     //   return acc;
     // }, {});
 
+    // console.log(internalIds);
     // for (const [id, value] of Object.entries(internalIds)) {
     //   const ids = value.filter((v) => v != null).join(", ");
     //   if (ids) {

src/migrations/1737287798828-protocolPresenceExcuse.ts

@@ -1,21 +0,0 @@
-import { MigrationInterface, QueryRunner, TableColumn } from "typeorm";
-
-export class ProtocolPresenceExcuse1737287798828 implements MigrationInterface {
-  name = "ProtocolPresenceExcuse1737287798828";
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.addColumn(
-      "protocol_presence",
-      new TableColumn({
-        name: "excused",
-        type: "tinyint",
-        default: "1",
-        isNullable: false,
-      })
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.dropColumn("protocol_presence", "excused");
-  }
-}

src/routes/admin/settings/newsletterConfig.ts

@@ -1,5 +1,6 @@
 import express, { Request, Response } from "express";
 import {
+  deleteNewsletterConfig,
   getAllNewsletterConfigs,
   getNewsletterConfigById,
   setNewsletterConfig,
@@ -24,4 +25,12 @@ router.put(
   }
 );
 
+router.delete(
+  "/:comTypeId",
+  PermissionHelper.passCheckMiddleware("create", "settings", "newsletter_config"),
+  async (req: Request, res: Response) => {
+    await deleteNewsletterConfig(req, res);
+  }
+);
+
 export default router;

src/routes/index.ts

@@ -13,7 +13,6 @@ import reset from "./reset";
 import auth from "./auth";
 import admin from "./admin/index";
 import user from "./user";
-import detectPWA from "../middleware/detectPWA";
 
 export default (app: Express) => {
   app.set("query parser", "extended");
@@ -26,7 +25,6 @@ export default (app: Express) => {
   app.use(cors());
   app.options("*", cors());
 
-  app.use(detectPWA);
   app.use("/api/public", publicAvailable);
   app.use("/api/setup", allowSetup, setup);
   app.use("/api/reset", reset);

src/service/club/calendarService.ts

@@ -12,7 +12,6 @@ export default abstract class CalendarService {
       .getRepository(calendar)
       .createQueryBuilder("calendar")
       .leftJoinAndSelect("calendar.type", "type")
-      .orderBy("starttime", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/club/member/communicationService.ts

@@ -16,7 +16,6 @@ export default abstract class CommunicationService {
       .leftJoinAndSelect("communication.member", "member")
       .leftJoinAndSelect("member.sendNewsletter", "sendNewsletter")
       .where("communication.memberId = :memberId", { memberId: memberId })
-      .orderBy("communicationType.type", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/club/member/memberAwardService.ts

@@ -14,7 +14,6 @@ export default abstract class MemberAwardService {
       .createQueryBuilder("memberAwards")
       .leftJoinAndSelect("memberAwards.award", "award")
       .where("memberAwards.memberId = :memberId", { memberId: memberId })
-      .orderBy("award.award", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/club/member/memberExecutivePositionService.ts

@@ -14,8 +14,6 @@ export default abstract class MemberExecutivePositionService {
       .createQueryBuilder("memberExecutivePositions")
       .leftJoinAndSelect("memberExecutivePositions.executivePosition", "executivePosition")
       .where("memberExecutivePositions.memberId = :memberId", { memberId: memberId })
-      .orderBy("executivePosition.position", "ASC")
-      .addOrderBy("memberExecutivePositions.start", "DESC")
       .getMany()
       .then((res) => {
         return res;

src/service/club/member/memberQualificationService.ts

@@ -14,7 +14,6 @@ export default abstract class MemberQualificationService {
       .createQueryBuilder("memberQualifications")
       .leftJoinAndSelect("memberQualifications.qualification", "qualification")
       .where("memberQualifications.memberId = :memberId", { memberId: memberId })
-      .orderBy("qualification.qualification", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/club/member/memberService.ts

@@ -8,19 +8,7 @@ export default abstract class MemberService {
    * @description get all members
    * @returns {Promise<[Array<member>, number]>}
    */
-  static async getAll({
-    offset = 0,
-    count = 25,
-    search = "",
-    noLimit = false,
-    ids = [],
-  }: {
-    offset?: number;
-    count?: number;
-    search?: string;
-    noLimit?: boolean;
-    ids?: Array<number>;
-  }): Promise<[Array<member>, number]> {
+  static async getAll(offset: number = 0, count: number = 25, search: string = ""): Promise<[Array<member>, number]> {
     let query = dataSource
       .getRepository(member)
       .createQueryBuilder("member")
@@ -66,15 +54,9 @@ export default abstract class MemberService {
       });
     }
 
-    if (ids.length != 0) {
-      query = query.where({ id: ids });
-    }
-
-    if (!noLimit) {
-      query = query.offset(offset).limit(count);
-    }
-
     return await query
+      .offset(offset)
+      .limit(count)
       .orderBy("member.lastname")
       .addOrderBy("member.firstname")
       .addOrderBy("member.nameaffix")

src/service/settings/awardService.ts

@@ -12,7 +12,6 @@ export default abstract class AwardService {
     return await dataSource
       .getRepository(award)
       .createQueryBuilder("award")
-      .orderBy("award", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/settings/calendarTypeService.ts

@@ -11,7 +11,6 @@ export default abstract class CalendarTypeService {
     return await dataSource
       .getRepository(calendarType)
       .createQueryBuilder("calendarType")
-      .orderBy("type", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/settings/communicationTypeService.ts

@@ -11,7 +11,6 @@ export default abstract class CommunicationTypeService {
     return await dataSource
       .getRepository(communicationType)
       .createQueryBuilder("communicationType")
-      .orderBy("type", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/settings/executivePositionService.ts

@@ -12,7 +12,6 @@ export default abstract class ExecutivePositionService {
     return await dataSource
       .getRepository(executivePosition)
       .createQueryBuilder("executivePosition")
-      .orderBy("position", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/settings/membershipStatusService.ts

@@ -12,7 +12,6 @@ export default abstract class MembershipStatusService {
     return await dataSource
       .getRepository(membershipStatus)
       .createQueryBuilder("membershipStatus")
-      .orderBy("status", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/settings/newsletterConfigService.ts

@@ -13,7 +13,6 @@ export default abstract class NewsletterConfigService {
       .getRepository(newsletterConfig)
       .createQueryBuilder("newsletterConfig")
       .leftJoinAndSelect("newsletterConfig.comType", "comType")
-      .orderBy("comType.type", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/settings/qualification.ts

@@ -13,7 +13,6 @@ export default abstract class QualificationService {
     return await dataSource
       .getRepository(qualification)
       .createQueryBuilder("qualification")
-      .orderBy("qualification", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/settings/queryStoreService.ts

@@ -11,7 +11,6 @@ export default abstract class QueryStoreService {
     return await dataSource
       .getRepository(query)
       .createQueryBuilder("queryStore")
-      .orderBy("title", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/settings/templateService.ts

@@ -12,7 +12,6 @@ export default abstract class TemplateService {
     return await dataSource
       .getRepository(template)
       .createQueryBuilder("template")
-      .orderBy("template", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/settings/templateUsageService.ts

@@ -14,7 +14,6 @@ export default abstract class TemplateUsageService {
       .leftJoinAndSelect("templateUsage.header", "headerTemplate")
       .leftJoinAndSelect("templateUsage.body", "bodyTemplate")
       .leftJoinAndSelect("templateUsage.footer", "footerTemplate")
-      .orderBy("scope", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/user/roleService.ts

@@ -12,7 +12,6 @@ export default abstract class RoleService {
       .getRepository(role)
       .createQueryBuilder("role")
       .leftJoinAndSelect("role.permissions", "role_permissions")
-      .orderBy("role", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/service/user/userService.ts

@@ -15,8 +15,6 @@ export default abstract class UserService {
       .leftJoinAndSelect("user.roles", "roles")
       .leftJoinAndSelect("user.permissions", "permissions")
       .leftJoinAndSelect("roles.permissions", "role_permissions")
-      .orderBy("firstname", "ASC")
-      .addOrderBy("lastname", "ASC")
       .getMany()
       .then((res) => {
         return res;

src/templates/protocol.body.template.html

@@ -14,19 +14,9 @@
     <br />
     <br />
     <h2>Anwesenheit ({{presence.length}})</h2>
-    <p>
-      {{#each presence}}{{this.firstname}} {{this.lastname}}{{#unless @last}}, {{/unless}}{{/each}}{{#unless
-      presence.length}}---{{/unless}}
-    </p>
+    <p>{{#each presence}} {{this.firstname}} {{this.lastname}}{{#unless @last}}, {{/unless}} {{/each}}</p>
     <h2>Abwesenheit ({{absent.length}})</h2>
-    <p>
-      entschuldigt: {{#each excused_absent}}{{this.firstname}} {{this.lastname}}{{#unless @last}},
-      {{/unless}}{{/each}}{{#unless excused_absent.length}}---{{/unless}}
-    </p>
-    <p>
-      unentschuldigt: {{#each unexcused_absent}}{{this.firstname}} {{this.lastname}}{{#unless @last}},
-      {{/unless}}{{/each}}{{#unless unexcused_absent.length}}---{{/unless}}
-    </p>
+    <p>{{#each absent}} {{this.firstname}} {{this.lastname}}{{#unless @last}}, {{/unless}} {{/each}}</p>
     <br />
     <h2>Agenda</h2>
     {{#each agenda}}

src/viewmodel/admin/club/protocol/protocolPresence.models.ts

@@ -3,6 +3,5 @@ import { MemberViewModel } from "../member/member.models";
 export interface ProtocolPresenceViewModel {
   memberId: number;
   absent: boolean;
-  excused: boolean;
   protocolId: number;
 }