72 changed files with 2012 additions and 2966 deletions
--- a/4
+++ b/4
@ -1,4 +1,4 @@
-FROM node:22-alpine AS build
+FROM node:18-alpine AS build

 RUN apk add --no-cache \
  chromium \
@ -20,7 +20,7 @@ COPY . /app

 RUN npm run build

-FROM node:22-alpine AS prod
+FROM node:18-alpine AS prod

 RUN apk add --no-cache \
  chromium \
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "ff-admin-server",
-  "version": "1.4.2",
+  "version": "1.3.5",
  "description": "Feuerwehr/Verein Mitgliederverwaltung Server",
  "main": "dist/index.js",
  "scripts": {
@ -26,7 +26,7 @@
  "dependencies": {
    "cors": "^2.8.5",
    "dotenv": "^16.4.5",
-    "express": "^5.1.0",
+    "express": "^5.0.0-beta.3",
    "express-rate-limit": "^7.5.0",
    "express-validator": "^7.2.1",
    "handlebars": "^4.7.8",
@ -41,10 +41,10 @@
    "multer": "^1.4.5-lts.1",
    "mysql": "^2.18.1",
    "node-schedule": "^2.1.1",
-    "nodemailer": "^6.10.1",
+    "nodemailer": "^6.9.14",
    "pdf-lib": "^1.17.1",
    "pg": "^8.13.1",
-    "puppeteer": "^24.6.1",
+    "puppeteer": "^23.11.1",
    "qrcode": "^1.5.4",
    "reflect-metadata": "^0.2.2",
    "rss-parser": "^3.13.0",
@ -52,26 +52,25 @@
    "speakeasy": "^2.0.0",
    "sqlite3": "^5.1.7",
    "typeorm": "^0.3.20",
-    "uuid": "^11.1.0"
+    "uuid": "^10.0.0"
  },
  "devDependencies": {
    "@types/cors": "^2.8.14",
-    "@types/express": "^5.0.1",
+    "@types/express": "^4.17.17",
    "@types/ip": "^1.1.3",
    "@types/jsonwebtoken": "^9.0.6",
    "@types/lodash.uniqby": "^4.7.9",
    "@types/morgan": "^1.9.9",
-    "@types/ms": "^2.1.0",
+    "@types/ms": "^0.7.34",
    "@types/multer": "^1.4.12",
    "@types/mysql": "^2.15.21",
-    "@types/node": "^22.14.1",
+    "@types/node": "^16.18.41",
    "@types/node-schedule": "^2.1.6",
    "@types/nodemailer": "^6.4.14",
-    "@types/pg": "~8.11.12",
    "@types/qrcode": "~1.5.5",
    "@types/speakeasy": "^2.0.10",
-    "@types/uuid": "^10.0.0",
-    "ts-node": "10.9.2",
-    "typescript": "^5.8.3"
+    "@types/uuid": "^9.0.2",
+    "ts-node": "10.7.0",
+    "typescript": "^4.5.2"
  }
 }
--- a/src/command/club/member/communicationCommandHandler.ts
+++ b/src/command/club/member/communicationCommandHandler.ts
@ -18,17 +18,6 @@ export default abstract class CommunicationCommandHandler {
    let insertId = -1;
    return await dataSource
      .transaction(async (manager) => {
-        if (createCommunication.isSendNewsletter) {
-          await manager
-            .createQueryBuilder()
-            .update(communication)
-            .set({
-              isSendNewsletter: false,
-            })
-            .where("memberId = :memberId", { memberId: createCommunication.memberId })
-            .execute();
-        }
-
        await manager
          .createQueryBuilder()
          .insert()
@ -51,6 +40,16 @@ export default abstract class CommunicationCommandHandler {
          .then((result) => {
            insertId = result.identifiers[0].id;
          });
+
+        await manager
+          .createQueryBuilder()
+          .update(communication)
+          .set({
+            isSendNewsletter: false,
+          })
+          .where("memberId = :memberId", { memberId: createCommunication.memberId })
+          .andWhere("id <> :id", { id: insertId })
+          .execute();
      })
      .then(() => {
        return insertId;
@ -68,17 +67,6 @@ export default abstract class CommunicationCommandHandler {
  static async update(updateCommunication: UpdateCommunicationCommand): Promise<void> {
    return await dataSource
      .transaction(async (manager) => {
-        if (updateCommunication.isSendNewsletter) {
-          await manager
-            .createQueryBuilder()
-            .update(communication)
-            .set({
-              isSendNewsletter: false,
-            })
-            .where("memberId = :memberId", { memberId: updateCommunication.memberId })
-            .execute();
-        }
-
        await manager
          .createQueryBuilder()
          .update(communication)
@ -97,6 +85,16 @@ export default abstract class CommunicationCommandHandler {
          .where("id = :id", { id: updateCommunication.id })
          .andWhere("memberId = :memberId", { memberId: updateCommunication.memberId })
          .execute();
+
+        await manager
+          .createQueryBuilder()
+          .update(communication)
+          .set({
+            isSendNewsletter: false,
+          })
+          .where("memberId = :memberId", { memberId: updateCommunication.memberId })
+          .andWhere("id <> :id", { id: updateCommunication.id })
+          .execute();
      })
      .then(() => {})
      .catch((err) => {
--- a/src/command/club/newsletter/newsletterCommand.ts
+++ b/src/command/club/newsletter/newsletterCommand.ts
@ -9,7 +9,7 @@ export interface SynchronizeNewsletterCommand {
  newsletterTitle: string;
  newsletterText: string;
  newsletterSignatur: string;
-  recipientsByQueryId?: string;
+  recipientsByQueryId?: number;
 }

 export interface SendNewsletterCommand {
--- a/src/command/club/protocol/protocolAgendaCommand.ts
+++ b/src/command/club/protocol/protocolAgendaCommand.ts
@ -1,7 +1,6 @@
 export interface SynchronizeProtocolAgendaCommand {
-  id: number;
+  id?: number;
  topic: string;
  context: string;
-  sort: number;
  protocolId: number;
 }
--- a/src/command/club/protocol/protocolAgendaCommandHandler.ts
+++ b/src/command/club/protocol/protocolAgendaCommandHandler.ts
@ -2,7 +2,6 @@ import { dataSource } from "../../../data-source";
 import { protocolAgenda } from "../../../entity/club/protocol/protocolAgenda";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
-import ProtocolAgendaService from "../../../service/club/protocol/protocolAgendaService";
 import { SynchronizeProtocolAgendaCommand } from "./protocolAgendaCommand";

 export default abstract class ProtocolAgendaCommandHandler {
@ -12,7 +11,6 @@ export default abstract class ProtocolAgendaCommandHandler {
   * @returns {Promise<number>}
   */
  static async create(protocolId: number): Promise<number> {
-    let count = await ProtocolAgendaService.getInstanceCount(protocolId);
    return await dataSource
      .createQueryBuilder()
      .insert()
@ -20,7 +18,6 @@ export default abstract class ProtocolAgendaCommandHandler {
      .values({
        topic: "",
        context: "",
-        sort: count,
        protocolId,
      })
      .execute()
@ -39,16 +36,13 @@ export default abstract class ProtocolAgendaCommandHandler {
   */
  static async sync(syncProtocolAgenda: Array<SynchronizeProtocolAgendaCommand>): Promise<void> {
    return await dataSource
-      .transaction(async (transactionalEntityManager) => {
-        for (const agenda of syncProtocolAgenda) {
-          await transactionalEntityManager
-            .createQueryBuilder()
-            .update(protocolAgenda)
-            .set(agenda)
-            .where({ id: agenda.id })
-            .execute();
-        }
-      })
+      .createQueryBuilder()
+      .insert()
+      .into(protocolAgenda)
+      .values(syncProtocolAgenda)
+      .orUpdate(["topic", "context"], ["id"])
+      .execute()
+      .then(() => {})
      .catch((err) => {
        throw new DatabaseActionException("SYNC", "protocolAgenda", err);
      });
--- a/src/command/club/protocol/protocolDecisionCommand.ts
+++ b/src/command/club/protocol/protocolDecisionCommand.ts
@ -1,7 +1,6 @@
 export interface SynchronizeProtocolDecisionCommand {
-  id: number;
+  id?: number;
  topic: string;
  context: string;
-  sort: number;
  protocolId: number;
 }
--- a/src/command/club/protocol/protocolDecisionCommandHandler.ts
+++ b/src/command/club/protocol/protocolDecisionCommandHandler.ts
@ -2,7 +2,6 @@ import { dataSource } from "../../../data-source";
 import { protocolDecision } from "../../../entity/club/protocol/protocolDecision";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
-import ProtocolDecisionService from "../../../service/club/protocol/protocolDecisionService";
 import { SynchronizeProtocolDecisionCommand } from "./protocolDecisionCommand";

 export default abstract class ProtocolDecisionCommandHandler {
@ -12,7 +11,6 @@ export default abstract class ProtocolDecisionCommandHandler {
   * @returns {Promise<number>}
   */
  static async create(protocolId: number): Promise<number> {
-    let count = await ProtocolDecisionService.getInstanceCount(protocolId);
    return await dataSource
      .createQueryBuilder()
      .insert()
@ -20,7 +18,6 @@ export default abstract class ProtocolDecisionCommandHandler {
      .values({
        topic: "",
        context: "",
-        sort: count,
        protocolId,
      })
      .execute()
@ -38,16 +35,12 @@ export default abstract class ProtocolDecisionCommandHandler {
   */
  static async sync(syncProtocolDecisions: Array<SynchronizeProtocolDecisionCommand>): Promise<void> {
    return await dataSource
-      .transaction(async (transactionalEntityManager) => {
-        for (const decision of syncProtocolDecisions) {
-          await transactionalEntityManager
-            .createQueryBuilder()
-            .update(protocolDecision)
-            .set(decision)
-            .where({ id: decision.id })
-            .execute();
-        }
-      })
+      .createQueryBuilder()
+      .insert()
+      .into(protocolDecision)
+      .values(syncProtocolDecisions)
+      .orUpdate(["topic", "context"], ["id"])
+      .execute()
      .then(() => {})
      .catch((err) => {
        throw new DatabaseActionException("SYNC", "protocolDecision", err);
--- a/src/command/club/protocol/protocolVotingCommand.ts
+++ b/src/command/club/protocol/protocolVotingCommand.ts
@ -5,6 +5,5 @@ export interface SynchronizeProtocolVotingCommand {
  favour: number;
  abstain: number;
  against: number;
-  sort: number;
  protocolId: number;
 }
--- a/src/command/club/protocol/protocolVotingCommandHandler.ts
+++ b/src/command/club/protocol/protocolVotingCommandHandler.ts
@ -2,7 +2,6 @@ import { dataSource } from "../../../data-source";
 import { protocolVoting } from "../../../entity/club/protocol/protocolVoting";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
-import ProtocolVotingService from "../../../service/club/protocol/protocolVotingService";
 import { SynchronizeProtocolVotingCommand } from "./protocolVotingCommand";

 export default abstract class ProtocolVotingCommandHandler {
@ -12,7 +11,6 @@ export default abstract class ProtocolVotingCommandHandler {
   * @returns {Promise<number>}
   */
  static async create(protocolId: number): Promise<number> {
-    let count = await ProtocolVotingService.getInstanceCount(protocolId);
    return await dataSource
      .createQueryBuilder()
      .insert()
@ -20,7 +18,6 @@ export default abstract class ProtocolVotingCommandHandler {
      .values({
        topic: "",
        context: "",
-        sort: count,
        protocolId,
      })
      .execute()
@ -38,16 +35,12 @@ export default abstract class ProtocolVotingCommandHandler {
   */
  static async sync(syncProtocolVotings: Array<SynchronizeProtocolVotingCommand>): Promise<void> {
    return await dataSource
-      .transaction(async (transactionalEntityManager) => {
-        for (const voting of syncProtocolVotings) {
-          await transactionalEntityManager
-            .createQueryBuilder()
-            .update(protocolVoting)
-            .set(voting)
-            .where({ id: voting.id })
-            .execute();
-        }
-      })
+      .createQueryBuilder()
+      .insert()
+      .into(protocolVoting)
+      .values(syncProtocolVotings)
+      .orUpdate(["topic", "context", "favour", "abstain", "against"], ["id"])
+      .execute()
      .then(() => {})
      .catch((err) => {
        throw new DatabaseActionException("SYNC", "protocolVoting", err);
--- a/src/command/configuration/newsletterConfig/newsletterConfigCommandHandler.ts
+++ b/src/command/configuration/newsletterConfig/newsletterConfigCommandHandler.ts
@ -19,7 +19,7 @@ export default abstract class NewsletterConfigCommandHandler {
        comTypeId: setNewsletterConfig.comTypeId,
        config: setNewsletterConfig.config,
      })
-      .orUpdate(["config"], ["comTypeId"])
+      .orUpdate(["config"], "comTypeId")
      .execute()
      .then((result) => {})
      .catch((err) => {
--- a/src/command/configuration/queryStore/queryStoreCommand.ts
+++ b/src/command/configuration/queryStore/queryStoreCommand.ts
@ -6,10 +6,10 @@ export interface CreateQueryStoreCommand {
 }

 export interface UpdateQueryStoreCommand {
-  id: string;
+  id: number;
  query: string | DynamicQueryStructure;
 }

 export interface DeleteQueryStoreCommand {
-  id: string;
+  id: number;
 }
--- a/src/controller/admin/club/listprintController.ts
+++ b/src/controller/admin/club/listprintController.ts
@ -1,60 +0,0 @@
-import { Request, Response } from "express";
-import { PdfExport } from "../../../helpers/pdfExport";
-import DynamicQueryBuilder from "../../../helpers/dynamicQueryBuilder";
-import QueryStoreService from "../../../service/configuration/queryStoreService";
-import InternalException from "../../../exceptions/internalException";
-
-/**
- * @description print list by query and template
- * @param req {Request} Express req object
- * @param res {Response} Express res object
- * @returns {Promise<*>}
- */
-export async function printListByQueryAndTemplate(req: Request, res: Response): Promise<any> {
-  const title = req.body.title;
-  const queryStore = req.body.queryStore;
-  const headerId = req.body.headerId ?? null;
-  const bodyId = req.body.bodyId ?? null;
-  const footerId = req.body.footerId ?? null;
-  const headerHeight = req.body.headerHeight ?? null;
-  const footerHeight = req.body.footerHeight ?? null;
-
-  let query = queryStore;
-  if (queryStore != "member" && queryStore != "memberByRunningMembership") {
-    query = (await QueryStoreService.getById(queryStore)).query;
-  }
-
-  let data = await DynamicQueryBuilder.executeQuery({
-    query: query.startsWith("{") ? JSON.parse(query) : query,
-    noLimit: true,
-  });
-
-  if (data.stats == "error") {
-    throw new InternalException("Failed executing Query");
-  }
-
-  let pdf = await PdfExport.renderFile({
-    title: title,
-    template: "listprint",
-    saveToDisk: false,
-    data: {
-      today: new Date(),
-      list: data.rows,
-    },
-    customTemplate: {
-      headerId,
-      footerId,
-      bodyId,
-      headerHeight,
-      footerHeight,
-    },
-  });
-
-  let pdfbuffer = Buffer.from(pdf);
-
-  res.setHeader("Content-Type", "application/pdf");
-  res.setHeader("Content-Length", pdfbuffer.byteLength);
-  res.setHeader("Content-Disposition", "inline; filename=preview.pdf");
-
-  res.send(pdfbuffer);
-}
--- a/src/controller/admin/club/memberController.ts
+++ b/src/controller/admin/club/memberController.ts
@ -118,45 +118,6 @@ export async function getMemberStatisticsById(req: Request, res: Response): Prom
  res.json(MemberFactory.mapToMemberStatistic(member));
 }

-/**
- * @description get member printout by id
- * @param req {Request} Express req object
- * @param res {Response} Express res object
- * @returns {Promise<*>}
- */
-export async function getMemberPrintoutById(req: Request, res: Response): Promise<any> {
-  const memberId = req.params.id;
-  let member = await MemberService.getById(memberId);
-  let memberships = await MembershipService.getAll(memberId);
-  let awards = await MemberAwardService.getAll(memberId);
-  let qualifications = await MemberQualificationService.getAll(memberId);
-  let positions = await MemberExecutivePositionService.getAll(memberId);
-  let communications = await CommunicationService.getAll(memberId);
-
-  let pdf = await PdfExport.renderFile({
-    title: "Mitglieder-Ausdruck",
-    template: "member",
-    saveToDisk: false,
-    data: {
-      today: new Date(),
-      member,
-      memberships,
-      awards,
-      qualifications,
-      positions,
-      communications,
-    },
-  });
-
-  let pdfbuffer = Buffer.from(pdf);
-
-  res.setHeader("Content-Type", "application/pdf");
-  res.setHeader("Content-Length", pdfbuffer.byteLength);
-  res.setHeader("Content-Disposition", "inline; filename=preview.pdf");
-
-  res.send(pdfbuffer);
-}
-
 /**
 * @description get memberships by member
 * @param req {Request} Express req object
@ -305,6 +266,33 @@ export async function getCommunicationByMemberAndRecord(req: Request, res: Respo
  res.json(CommunicationFactory.mapToSingle(communication));
 }

+/**
+ * @description create member printout list
+ * @param req {Request} Express req object
+ * @param res {Response} Express res object
+ * @returns {Promise<*>}
+ */
+export async function createMemberPrintoutList(req: Request, res: Response): Promise<any> {
+  let members = await MemberService.getByRunningMembership();
+
+  let pdf = await PdfExport.renderFile({
+    title: "Mitgliederliste",
+    template: "member.list",
+    saveToDisk: false,
+    data: {
+      member: members,
+    },
+  });
+
+  let pdfbuffer = Buffer.from(pdf);
+
+  res.setHeader("Content-Type", "application/pdf");
+  res.setHeader("Content-Length", pdfbuffer.byteLength);
+  res.setHeader("Content-Disposition", "inline; filename=preview.pdf");
+
+  res.send(pdfbuffer);
+}
+
 /**
 * @description create member
 * @param req {Request} Express req object
--- a/src/controller/admin/club/newsletterController.ts
+++ b/src/controller/admin/club/newsletterController.ts
@ -94,7 +94,7 @@ export async function getNewsletterPrintoutsById(req: Request, res: Response): P
  let newsletter = await NewsletterService.getById(newsletterId);

  let filesInFolder = FileSystemHelper.getFilesInDirectory(
-    `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`
+    `newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`
  );

  res.json(filesInFolder);
@ -114,7 +114,7 @@ export async function getNewsletterPrintoutByIdAndPrint(req: Request, res: Respo

  let filepath = FileSystemHelper.formatPath(
    "newsletter",
-    `${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`,
+    `${newsletter.id}_${newsletter.title.replace(" ", "")}`,
    filename
  );

@ -164,34 +164,6 @@ export async function createNewsletterPrintoutPreviewById(req: Request, res: Res
  res.send(pdfbuffer);
 }

-/**
- * @description get all members receiving a newsletter printout by id
- * @param req {Request} Express req object
- * @param res {Response} Express res object
- * @returns {Promise<*>}
- */
-export async function getNewsletterPrintReceiversById(req: Request, res: Response): Promise<any> {
-  let newsletterId = parseInt(req.params.newsletterId);
-
-  let recipients = await NewsletterHelper.getPrintRecipients(newsletterId);
-
-  res.json(recipients);
-}
-
-/**
- * @description get all members receiving a newsletter mail by id
- * @param req {Request} Express req object
- * @param res {Response} Express res object
- * @returns {Promise<*>}
- */
-export async function getNewsletterMailReceiversById(req: Request, res: Response): Promise<any> {
-  let newsletterId = parseInt(req.params.newsletterId);
-
-  let recipients = await NewsletterHelper.getMailRecipients(newsletterId);
-
-  res.json(recipients);
-}
-
 /**
 * @description create newsletter
 * @param req {Request} Express req object
@ -356,7 +328,7 @@ export async function synchronizeNewsletterById(req: Request, res: Response): Pr
  let newsletterTitle = req.body.newsletterTitle;
  let newsletterText = req.body.newsletterText;
  let newsletterSignatur = req.body.newsletterSignatur;
-  let recipientsByQueryId = req.body.recipientsByQueryId || null;
+  let recipientsByQueryId = req.body.recipientsByQueryId ?? null;

  let syncNewsletter: SynchronizeNewsletterCommand = {
    id,
--- a/src/controller/admin/club/protocolController.ts
+++ b/src/controller/admin/club/protocolController.ts
@ -235,7 +235,7 @@ export async function createProtocolPrintoutById(req: Request, res: Response): P
    year: "numeric",
  })}`;

-  let filename = `${new Date().toISOString().split("T")[0]}_${iteration + 1}_Protokoll_${protocol.title.replaceAll(
+  let filename = `${new Date().toISOString().split("T")[0]}_${iteration + 1}_Protokoll_${protocol.title.replace(
    /[^a-zA-Z0-9]/g,
    ""
  )}`;
@ -257,13 +257,13 @@ export async function createProtocolPrintoutById(req: Request, res: Response): P
      }),
      start: protocol.starttime,
      end: protocol.endtime,
-      agenda: agenda.sort((a, b) => a.sort - b.sort),
-      decisions: decisions.sort((a, b) => a.sort - b.sort),
+      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),
-      votings: votings.sort((a, b) => a.sort - b.sort),
+      votings,
    },
  });

@ -317,10 +317,9 @@ export async function synchronizeProtocolAgendaById(req: Request, res: Response)

  let syncAgenda: Array<SynchronizeProtocolAgendaCommand> = agenda.map(
    (a: ProtocolAgendaViewModel): SynchronizeProtocolAgendaCommand => ({
-      id: a.id,
+      id: a.id ?? null,
      topic: a.topic,
      context: a.context,
-      sort: a.sort,
      protocolId,
    })
  );
@ -341,10 +340,9 @@ export async function synchronizeProtocolDecisonsById(req: Request, res: Respons

  let syncDecision: Array<SynchronizeProtocolDecisionCommand> = decisions.map(
    (d: ProtocolDecisionViewModel): SynchronizeProtocolDecisionCommand => ({
-      id: d.id,
+      id: d.id ?? null,
      topic: d.topic,
      context: d.context,
-      sort: d.sort,
      protocolId,
    })
  );
@ -364,14 +362,13 @@ export async function synchronizeProtocolVotingsById(req: Request, res: Response
  let votings = req.body.votings as Array<ProtocolVotingViewModel>;

  let syncVoting: Array<SynchronizeProtocolVotingCommand> = votings.map(
-    (v: ProtocolVotingViewModel): SynchronizeProtocolVotingCommand => ({
-      id: v.id,
-      topic: v.topic,
-      context: v.context,
-      favour: v.favour,
-      abstain: v.abstain,
-      against: v.abstain,
-      sort: v.sort,
+    (d: ProtocolVotingViewModel): SynchronizeProtocolVotingCommand => ({
+      id: d.id ?? null,
+      topic: d.topic,
+      context: d.context,
+      favour: d.favour,
+      abstain: d.abstain,
+      against: d.abstain,
      protocolId,
    })
  );
--- a/src/controller/admin/club/queryBuilderController.ts
+++ b/src/controller/admin/club/queryBuilderController.ts
@ -1,7 +1,6 @@
 import { Request, Response } from "express";
 import DynamicQueryBuilder from "../../../helpers/dynamicQueryBuilder";
 import { dataSource } from "../../../data-source";
-import QueryStoreService from "../../../service/configuration/queryStoreService";

 /**
 * @description get all table metas
@ -44,23 +43,3 @@ export async function executeQuery(req: Request, res: Response): Promise<any> {

  res.json(result);
 }
-
-/**
- * @description execute Query by StoreId
- * @param req {Request} Express req object
- * @param res {Response} Express res object
- * @returns {Promise<*>}
- */
-export async function executeQueryByStoreId(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 noLimit = req.query.noLimit === "true";
-  const storeId = req.params.storeId;
-
-  let queryStore = await QueryStoreService.getById(storeId);
-  let query = queryStore.query.startsWith("{") ? JSON.parse(queryStore.query) : queryStore.query;
-
-  let result = await DynamicQueryBuilder.executeQuery({ query, offset, count, noLimit });
-
-  res.json(result);
-}
--- a/src/controller/admin/configuration/queryStoreController.ts
+++ b/src/controller/admin/configuration/queryStoreController.ts
@ -27,7 +27,7 @@ export async function getAllQueryStores(req: Request, res: Response): Promise<an
 * @returns {Promise<*>}
 */
 export async function getQueryStoreById(req: Request, res: Response): Promise<any> {
-  const id = req.params.id;
+  const id = parseInt(req.params.id);

  let queryStore = await QueryStoreService.getById(id);

@ -61,7 +61,7 @@ export async function createQueryStore(req: Request, res: Response): Promise<any
 * @returns {Promise<*>}
 */
 export async function updateQueryStore(req: Request, res: Response): Promise<any> {
-  const id = req.params.id;
+  const id = parseInt(req.params.id);
  const query = req.body.query;

  let updateQueryStore: UpdateQueryStoreCommand = {
@ -81,7 +81,7 @@ export async function updateQueryStore(req: Request, res: Response): Promise<any
 * @returns {Promise<*>}
 */
 export async function deleteQueryStore(req: Request, res: Response): Promise<any> {
-  const id = req.params.id;
+  const id = parseInt(req.params.id);

  let deleteQueryStore: DeleteQueryStoreCommand = {
    id: id,
--- a/src/data-source.ts
+++ b/src/data-source.ts
@ -47,10 +47,6 @@ import { salutation } from "./entity/configuration/salutation";

 import { BackupAndResetDatabase1738166124200 } from "./migrations/1738166124200-BackupAndResetDatabase";
 import { CreateSchema1738166167472 } from "./migrations/1738166167472-CreateSchema";
-import { TemplatesAndProtocolSort1742549956787 } from "./migrations/1742549956787-templatesAndProtocolSort";
-import { QueryToUUID1742922178643 } from "./migrations/1742922178643-queryToUUID";
-import { NewsletterColumnType1744351418751 } from "./migrations/1744351418751-newsletterColumnType";
-import { QueryUpdatedAt1744795756230 } from "./migrations/1744795756230-QueryUpdatedAt";

 const dataSource = new DataSource({
  type: DB_TYPE as any,
@ -104,14 +100,7 @@ const dataSource = new DataSource({
    webapi,
    webapiPermission,
  ],
-  migrations: [
-    BackupAndResetDatabase1738166124200,
-    CreateSchema1738166167472,
-    TemplatesAndProtocolSort1742549956787,
-    QueryToUUID1742922178643,
-    NewsletterColumnType1744351418751,
-    QueryUpdatedAt1744795756230,
-  ],
+  migrations: [BackupAndResetDatabase1738166124200, CreateSchema1738166167472],
  migrationsRun: true,
  migrationsTransactionMode: "each",
  subscribers: [],
--- a/src/demodata/member.data.ts
+++ b/src/demodata/member.data.ts
@ -1,138 +0,0 @@
-import { communication } from "../entity/club/member/communication";
-import { member } from "../entity/club/member/member";
-import { memberAwards } from "../entity/club/member/memberAwards";
-import { memberExecutivePositions } from "../entity/club/member/memberExecutivePositions";
-import { memberQualifications } from "../entity/club/member/memberQualifications";
-import { membership } from "../entity/club/member/membership";
-
-export const memberDemoData: {
-  member: Partial<member>;
-  today: string;
-  memberships: Array<Partial<membership>>;
-  awards: Array<Partial<memberAwards>>;
-  qualifications: Array<Partial<memberQualifications>>;
-  positions: Array<Partial<memberExecutivePositions>>;
-  communications: Array<Partial<communication>>;
-} = {
-  today: "Montag, 17.03.2025",
-  member: {
-    id: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
-    firstname: "Julian",
-    lastname: "Krauser",
-    nameaffix: "",
-    //@ts-ignore
-    birthdate: "2003-09-20",
-    internalId: "1312",
-    salutationId: 47,
-    salutation: { id: 47, salutation: "Herr", members: [] },
-    firstMembershipEntry: {
-      id: 8681,
-      //@ts-ignore
-      start: "2017-11-13",
-      end: null,
-      terminationReason: null,
-      memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
-      statusId: 34,
-      status: { id: 34, status: "aktiv", memberships: [] },
-      //@ts-ignore
-      member: {},
-    },
-    lastMembershipEntry: {
-      id: 8681,
-      //@ts-ignore
-      start: "2017-11-13",
-      end: null,
-      terminationReason: null,
-      memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
-      statusId: 34,
-      status: { id: 34, status: "aktiv", memberships: [] },
-      //@ts-ignore
-      member: {},
-    },
-    preferredCommunication: [
-      {
-        id: 7031,
-        preferred: true,
-        isSMSAlarming: false,
-        isSendNewsletter: true,
-        mobile: "",
-        email: "julian.krauser@jk-effects.com",
-        postalCode: "",
-        city: "",
-        street: "",
-        streetNumber: 0,
-        streetNumberAddition: "",
-        memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
-        typeId: 46,
-        type: { id: 46, type: "Email", useColumns: ["email"], communications: [] },
-        // @ts-ignore
-        member: {},
-      },
-    ],
-    smsAlarming: [],
-    sendNewsletter: {
-      id: 7031,
-      preferred: true,
-      isSMSAlarming: false,
-      isSendNewsletter: true,
-      mobile: "",
-      email: "julian.krauser@jk-effects.com                             ",
-      postalCode: "",
-      city: "",
-      street: "",
-      streetNumber: 0,
-      streetNumberAddition: "",
-      memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
-      typeId: 46,
-      type: { id: 46, type: "Email", useColumns: ["email"], communications: [] },
-      // @ts-ignore
-      member: {},
-    },
-  },
-  memberships: [
-    {
-      id: 8681,
-      //@ts-ignore
-      start: "2017-11-13",
-      end: null,
-      terminationReason: null,
-      memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
-      statusId: 34,
-      status: { id: 34, status: "aktiv", memberships: [] },
-    },
-  ],
-  awards: [],
-  qualifications: [],
-  positions: [
-    {
-      id: 696,
-      note: "",
-      //@ts-ignore
-      start: "2025-01-06",
-      end: null,
-      memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
-      executivePositionId: 192,
-      executivePosition: { id: 192, position: "Schriftführer", members: [] },
-    },
-  ],
-  communications: [
-    {
-      id: 7031,
-      preferred: true,
-      isSMSAlarming: false,
-      isSendNewsletter: true,
-      mobile: "",
-      email: "julian.krauser@jk-effects.com",
-      postalCode: "",
-      city: "",
-      street: "",
-      streetNumber: 0,
-      streetNumberAddition: "",
-      memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
-      typeId: 46,
-      //@ts-ignore
-      member: {},
-      type: { id: 46, type: "Email", useColumns: ["email"], communications: [] },
-    },
-  ],
-};
--- a/src/demodata/member.list.data.ts
+++ b/src/demodata/member.list.data.ts
@ -0,0 +1,13 @@
+import { member } from "../entity/club/member/member";
+import { protocolAgenda } from "../entity/club/protocol/protocolAgenda";
+import { protocolDecision } from "../entity/club/protocol/protocolDecision";
+import { protocolVoting } from "../entity/club/protocol/protocolVoting";
+
+export const memberlistDemoData: { member: Array<Partial<member>> } = {
+  member: [
+    {
+      firstname: "Julian",
+      lastname: "Krauser",
+    },
+  ]
+}
--- a/src/entity/club/newsletter/newsletter.ts
+++ b/src/entity/club/newsletter/newsletter.ts
@ -1,5 +1,6 @@
 import { Column, Entity, ManyToOne, OneToMany, PrimaryColumn } from "typeorm";
 import { newsletterDates } from "./newsletterDates";
+import { member } from "../member/member";
 import { newsletterRecipients } from "./newsletterRecipients";
 import { query } from "../../configuration/query";

@ -14,20 +15,20 @@ export class newsletter {
  @Column({ type: "varchar", length: 255, default: "" })
  description: string;

-  @Column({ type: "text", default: "" })
+  @Column({ type: "varchar", length: 255, default: "" })
  newsletterTitle: string;

  @Column({ type: "text", default: "" })
  newsletterText: string;

-  @Column({ type: "text", default: "" })
+  @Column({ type: "varchar", length: 255, default: "" })
  newsletterSignatur: string;

  @Column({ type: "boolean", default: false })
  isSent: boolean;

-  @Column({ nullable: true })
-  recipientsByQueryId?: string;
+  @Column({ type: "int", nullable: true })
+  recipientsByQueryId?: number;

  @OneToMany(() => newsletterDates, (dates) => dates.newsletter, { cascade: ["insert"] })
  dates: newsletterDates[];
--- a/src/entity/club/protocol/protocolAgenda.ts
+++ b/src/entity/club/protocol/protocolAgenda.ts
@ -12,9 +12,6 @@ export class protocolAgenda {
  @Column({ type: "text", default: "" })
  context: string;

-  @Column({ type: "int", default: 0 })
-  sort: number;
-
  @Column()
  protocolId: number;

--- a/src/entity/club/protocol/protocolDecision.ts
+++ b/src/entity/club/protocol/protocolDecision.ts
@ -12,9 +12,6 @@ export class protocolDecision {
  @Column({ type: "text", default: "" })
  context: string;

-  @Column({ type: "int", default: 0 })
-  sort: number;
-
  @Column()
  protocolId: number;

--- a/src/entity/club/protocol/protocolVoting.ts
+++ b/src/entity/club/protocol/protocolVoting.ts
@ -21,9 +21,6 @@ export class protocolVoting {
  @Column({ type: "int", default: 0 })
  against: number;

-  @Column({ type: "int", default: 0 })
-  sort: number;
-
  @Column()
  protocolId: number;

--- a/src/entity/configuration/query.ts
+++ b/src/entity/configuration/query.ts
@ -1,16 +1,13 @@
-import { Column, Entity, PrimaryColumn, UpdateDateColumn } from "typeorm";
+import { Column, Entity, PrimaryColumn } from "typeorm";

@Entity()
 export class query {
-  @PrimaryColumn({ generated: "uuid", type: "varchar" })
-  id: string;
+  @PrimaryColumn({ generated: "increment", type: "int" })
+  id: number;

  @Column({ type: "varchar", length: 255, unique: true })
  title: string;

  @Column({ type: "text", default: "" })
  query: string;
-
-  @UpdateDateColumn()
-  updatedAt: Date;
 }
--- a/src/env.defaults.ts
+++ b/src/env.defaults.ts
@ -12,9 +12,9 @@ export const DB_PASSWORD = process.env.DB_PASSWORD ?? "";
 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") as ms.StringValue;
-export const REFRESH_EXPIRATION = (process.env.REFRESH_EXPIRATION ?? "1d") as ms.StringValue;
-export const PWA_REFRESH_EXPIRATION = (process.env.PWA_REFRESH_EXPIRATION ?? "5d") as ms.StringValue;
+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 ?? "";
@ -30,10 +30,10 @@ export const BACKUP_COPIES = Number(process.env.BACKUP_COPIES ?? "7");
 export const BACKUP_AUTO_RESTORE = process.env.BACKUP_AUTO_RESTORE ?? "true";

 export const USE_SECURITY_STRICT_LIMIT = process.env.USE_SECURITY_STRICT_LIMIT ?? "true";
-export const SECURITY_STRICT_LIMIT_WINDOW = (process.env.SECURITY_STRICT_LIMIT_WINDOW ?? "15m") as ms.StringValue;
+export const SECURITY_STRICT_LIMIT_WINDOW = process.env.SECURITY_STRICT_LIMIT_WINDOW ?? "15m";
 export const SECURITY_STRICT_LIMIT_REQUEST_COUNT = Number(process.env.SECURITY_STRICT_LIMIT_REQUEST_COUNT ?? "15");
 export const USE_SECURITY_LIMIT = process.env.USE_SECURITY_LIMIT ?? "true";
-export const SECURITY_LIMIT_WINDOW = (process.env.SECURITY_LIMIT_WINDOW ?? "1m") as ms.StringValue;
+export const SECURITY_LIMIT_WINDOW = process.env.SECURITY_LIMIT_WINDOW ?? "1m";
 export const SECURITY_LIMIT_REQUEST_COUNT = Number(process.env.SECURITY_LIMIT_REQUEST_COUNT ?? "500");

 export const TRUST_PROXY = ((): Array<string> | string | boolean | number | null => {
@ -104,7 +104,7 @@ export function configCheck() {
  }
 }

-function checkMS(input: ms.StringValue, origin: string) {
+function checkMS(input: string, origin: string) {
  try {
    const result = ms(input);
    if (result === undefined) {
--- a/src/factory/admin/club/protocol/protocolAgenda.ts
+++ b/src/factory/admin/club/protocol/protocolAgenda.ts
@ -12,7 +12,6 @@ export default abstract class ProtocolAgendaFactory {
      id: record.id,
      topic: record.topic,
      context: record.context,
-      sort: record.sort,
      protocolId: record.protocolId,
    };
  }
--- a/src/factory/admin/club/protocol/protocolDecision.ts
+++ b/src/factory/admin/club/protocol/protocolDecision.ts
@ -12,7 +12,6 @@ export default abstract class ProtocolDecisionFactory {
      id: record.id,
      topic: record.topic,
      context: record.context,
-      sort: record.sort,
      protocolId: record.protocolId,
    };
  }
--- a/src/factory/admin/club/protocol/protocolVoting.ts
+++ b/src/factory/admin/club/protocol/protocolVoting.ts
@ -15,7 +15,6 @@ export default abstract class ProtocolVotingFactory {
      favour: record.favour,
      abstain: record.abstain,
      against: record.against,
-      sort: record.sort,
      protocolId: record.protocolId,
    };
  }
--- a/src/factory/admin/configuration/queryStore.ts
+++ b/src/factory/admin/configuration/queryStore.ts
@ -12,7 +12,6 @@ export default abstract class QueryStoreFactory {
      id: record.id,
      title: record.title,
      query: record.query.startsWith("{") ? JSON.parse(record.query) : record.query,
-      updatedAt: record.updatedAt,
    };
  }

--- a/src/handlebars.config.ts
+++ b/src/handlebars.config.ts
@ -1,32 +0,0 @@
-import Handlebars from "handlebars";
-
-Handlebars.registerHelper("date", function (aString) {
-  return new Date(aString).toLocaleDateString("de-DE", {
-    day: "2-digit",
-    month: "2-digit",
-    year: "numeric",
-  });
-});
-
-Handlebars.registerHelper("longdate", function (aString) {
-  return new Date(aString).toLocaleDateString("de-DE", {
-    weekday: "long",
-    day: "2-digit",
-    month: "2-digit",
-    year: "numeric",
-  });
-});
-
-Handlebars.registerHelper("datetime", function (aString) {
-  return new Date(aString).toLocaleDateString("de-DE", {
-    day: "2-digit",
-    month: "2-digit",
-    year: "numeric",
-    hour: "2-digit",
-    minute: "2-digit",
-  });
-});
-
-Handlebars.registerHelper("json", function (context) {
-  return JSON.stringify(context);
-});
--- a/src/helpers/backupHelper.ts
+++ b/src/helpers/backupHelper.ts
@ -6,7 +6,6 @@ import InternalException from "../exceptions/internalException";
 import UserService from "../service/management/userService";
 import { BACKUP_COPIES, BACKUP_INTERVAL } from "../env.defaults";
 import DatabaseActionException from "../exceptions/databaseActionException";
-import { availableTemplates } from "../type/templateTypes";

 export type BackupSection =
  | "member"
@ -213,7 +212,7 @@ export default abstract class BackupHelper {
      case "calendar":
        return await this.getCalendar();
      case "query":
-        return await this.getQueryStore(collectIds);
+        return await this.getQueryStore();
      case "template":
        return await this.getTemplate();
      case "user":
@ -301,8 +300,8 @@ export default abstract class BackupHelper {
      .leftJoin("protocol.printouts", "printouts")
      .leftJoin("protocol.votings", "votings")
      .select(["protocol.title", "protocol.date", "protocol.starttime", "protocol.endtime", "protocol.summary"])
-      .addSelect(["agendas.topic", "agendas.context", "agendas.sort"])
-      .addSelect(["decisions.topic", "decisions.context", "decisions.sort"])
+      .addSelect(["agendas.topic", "agendas.context"])
+      .addSelect(["decisions.topic", "decisions.context"])
      .addSelect(["presences.absent", "presences.excused"])
      .addSelect([
        ...(collectIds ? ["member.id"] : []),
@ -313,14 +312,7 @@ export default abstract class BackupHelper {
        "member.internalId",
      ])
      .addSelect(["printouts.title", "printouts.iteration", "printouts.filename", "printouts.createdAt"])
-      .addSelect([
-        "votings.topic",
-        "votings.context",
-        "votings.favour",
-        "votings.abstain",
-        "votings.against",
-        "votings.sort",
-      ])
+      .addSelect(["votings.topic", "votings.context", "votings.favour", "votings.abstain", "votings.against"])
      .getMany();
  }
  private static async getNewsletter(collectIds: boolean): Promise<Array<any>> {
@ -349,12 +341,7 @@ export default abstract class BackupHelper {
        "member.birthdate",
        "member.internalId",
      ])
-      .addSelect([
-        ...(collectIds ? ["recipientsByQuery.id"] : []),
-        "recipientsByQuery.title",
-        "recipientsByQuery.query",
-        "recipientsByQuery.updatedAt",
-      ])
+      .addSelect(["recipientsByQuery.title", "recipientsByQuery.query"])
      .getMany()
      .then((res: any) =>
        res.map((n: any) => ({
@ -399,8 +386,8 @@ export default abstract class BackupHelper {
        .getMany(),
    };
  }
-  private static async getQueryStore(collectIds: boolean): Promise<Array<any>> {
-    return await dataSource.getRepository("query").find({ select: { id: collectIds, title: true, query: true } });
+  private static async getQueryStore(): Promise<Array<any>> {
+    return await dataSource.getRepository("query").find({ select: { title: true, query: true } });
  }
  private static async getTemplate(): Promise<{ [key: string]: Array<any> }> {
    return {
@ -749,31 +736,12 @@ export default abstract class BackupHelper {
      .values(data?.["template"] ?? [])
      .orIgnore()
      .execute();
-
-    let templates = await this.transactionManager.getRepository("template").find();
-    let dataWithMappedId = (data?.["template_usage"] ?? [])
-      .filter((d) => availableTemplates.includes(d.scope))
-      .map((d) => ({
-        ...d,
-        headerHeightId: templates.find((template) => template.template == d.headerHeight)?.id ?? null,
-        footerHeightId: templates.find((template) => template.template == d.footerHeight)?.id ?? null,
-        headerId: templates.find((template) => template.template == d.header?.template)?.id ?? null,
-        bodyId: templates.find((template) => template.template == d.body?.template)?.id ?? null,
-        footerId: templates.find((template) => template.template == d.footer?.template)?.id ?? null,
-      }));
-    availableTemplates.forEach((at) => {
-      if (!dataWithMappedId.some((d) => d.scope == at)) {
-        dataWithMappedId.push({
-          scope: at,
-        });
-      }
-    });
    await this.transactionManager
      .createQueryBuilder()
      .insert()
      .into("template_usage")
-      .values(dataWithMappedId)
-      .orIgnore()
+      .values(data?.["template_usage"] ?? [])
+      .orUpdate(["headerId", "bodyId", "footerId", "headerHeight", "footerHeight"], ["scope"])
      .execute();
  }
  private static async setUser(data: { [key: string]: Array<any> }): Promise<void> {
--- a/src/helpers/calendarHelper.ts
+++ b/src/helpers/calendarHelper.ts
@ -50,7 +50,7 @@ export abstract class CalendarHelper {
        alarms: [
          {
            action: "display",
-            summary: "Erinnerung",
+            description: "Erinnerung",
            trigger: {
              minutes: 30,
              before: true,
--- a/src/helpers/demoDataHelper.ts
+++ b/src/helpers/demoDataHelper.ts
@ -1,17 +1,17 @@
 import { newsletterDemoData } from "../demodata/newsletter.data";
 import { protocolDemoData } from "../demodata/protocol.data";
 import { PermissionModule } from "../type/permissionTypes";
-import { memberDemoData } from "../demodata/member.data";
+import {memberlistDemoData} from "../demodata/member.list.data";

 export abstract class DemoDataHelper {
-  static getData(scope: `${PermissionModule}` | `${PermissionModule}.${string}`) {
+  static getData(scope: `${PermissionModule}`|`${PermissionModule}.${string}`) {
    switch (scope) {
      case "protocol":
        return protocolDemoData;
      case "newsletter":
        return newsletterDemoData;
-      case "member":
-        return memberDemoData;
+      case "member.list":
+        return memberlistDemoData;
      default:
        return {};
    }
--- a/src/helpers/dynamicQueryBuilder.ts
+++ b/src/helpers/dynamicQueryBuilder.ts
@ -2,7 +2,6 @@ import { Brackets, DataSource, NotBrackets, ObjectLiteral, SelectQueryBuilder, W
 import { dataSource } from "../data-source";
 import { ConditionStructure, DynamicQueryStructure, FieldType, QueryResult } from "../type/dynamicQueries";
 import { TableMeta } from "../type/tableMeta";
-import { StringHelper } from "./stringHelper";

 export default abstract class DynamicQueryBuilder {
  public static allowedTables: Array<string> = [
@ -63,18 +62,11 @@ export default abstract class DynamicQueryBuilder {
    count?: number;
    noLimit?: boolean;
  }): SelectQueryBuilder<ObjectLiteral> {
-    let affix = queryObj.id ?? StringHelper.random(10);
-    let query = dataSource.getRepository(queryObj.table).createQueryBuilder(`${affix}_${queryObj.table}`);
+    let affix = Math.random().toString(36).substring(2);
+    let query = dataSource.getRepository(queryObj.table).createQueryBuilder(`${queryObj.table}_${affix}`);

    this.buildDynamicQuery(query, queryObj, affix);

-    if (queryObj.orderBy) {
-      queryObj.orderBy.forEach((order) => {
-        // compatability layer for none id (old) queries
-        if (order.id) query.addOrderBy(`${order.id}_${order.table}.${order.column}`, order.order);
-      });
-    }
-
    if (!noLimit) {
      query.offset(offset);
      query.limit(count);
@ -86,10 +78,10 @@ export default abstract class DynamicQueryBuilder {
  private static buildDynamicQuery(
    query: SelectQueryBuilder<ObjectLiteral>,
    queryObject: DynamicQueryStructure,
-    affix: string = "", // table id
+    affix: string = "",
    depth: number = 0
  ): void {
-    const alias = `${affix}_${queryObject.table}`;
+    const alias = queryObject.table + "_" + affix;
    let firstSelect = true;
    let selects: Array<string> = [];

@ -116,21 +108,18 @@ export default abstract class DynamicQueryBuilder {

    if (queryObject.join) {
      for (const join of queryObject.join) {
-        let subaffix = join.id ?? StringHelper.random(10);
-        if (join.type == undefined) join.type = "defined";
-        if (join.type == "defined") {
-          query.innerJoin(`${alias}.${join.foreignColumn}`, `${subaffix}_${join.table}`);
-        } else {
-          let condition = join.condition
-            .replaceAll(`${join.table}.`, `${subaffix}_${join.table}.`)
-            .replaceAll(`${queryObject.table}.`, `${alias}.`);
-
-          query.innerJoin(join.table, `${subaffix}_${join.table}`, condition);
-        }
+        let subaffix = Math.random().toString(36).substring(2);
+        query.leftJoin(`${alias}.${join.foreignColumn}`, join.table + "_" + subaffix);

        this.buildDynamicQuery(query, join, subaffix, depth + 1);
      }
    }
+
+    if (queryObject.orderBy) {
+      queryObject.orderBy.forEach((order) => {
+        query.addOrderBy(`${alias}.${order.column}`, order.order);
+      });
+    }
  }

  public static applyWhere(
@ -177,7 +166,7 @@ export default abstract class DynamicQueryBuilder {
    condition: ConditionStructure & { structureType: "condition" },
    alias: string
  ): { query: string; parameters: Record<string, unknown> } {
-    const parameterKey = `${condition.column}_${Math.random().toString(36).substring(2)}`;
+    const parameterKey = `${alias}_${condition.column}_${Math.random().toString(36).substring(2)}`;
    let query = `${alias}.${condition.column}`;
    let parameters: Record<string, unknown> = {};

@ -325,13 +314,6 @@ export default abstract class DynamicQueryBuilder {
        count: number;
      }
  > {
-    if (query == "member") {
-      query = memberQuery;
-    }
-    if (query == "memberByRunningMembership") {
-      query = memberByRunningMembershipQuery;
-    }
-
    if (typeof query == "string") {
      const upperQuery = query.trim().toUpperCase();
      if (!upperQuery.startsWith("SELECT") || /INSERT|UPDATE|DELETE|ALTER|DROP|CREATE|TRUNCATE/.test(upperQuery)) {
@ -348,7 +330,7 @@ export default abstract class DynamicQueryBuilder {

        return await dataSource
          .transaction(async (manager) => {
-            data = await manager.query(query.toString());
+            data = await manager.query(query);

            throw new Error("AllwaysRollbackQuery");
          })
@ -390,7 +372,6 @@ export default abstract class DynamicQueryBuilder {
          count: noLimit ? total : count,
        };
      } catch (error) {
-        console.log(error);
        return {
          stats: "error",
          sql: error.sql,
@ -401,33 +382,3 @@ export default abstract class DynamicQueryBuilder {
    }
  }
 }
-
-const memberQuery: DynamicQueryStructure = {
-  id: "memberId",
-  select: "*",
-  table: "member",
-  orderBy: [
-    { id: "memberId", depth: 0, table: "member", column: "lastname", order: "ASC" },
-    { id: "memberId", depth: 0, table: "member", column: "firstname", order: "ASC" },
-  ],
-};
-
-const memberByRunningMembershipQuery: DynamicQueryStructure = {
-  id: "memberId",
-  select: "*",
-  table: "member",
-  join: [
-    {
-      id: "membershipId",
-      select: "*",
-      table: "membership",
-      where: [{ structureType: "condition", concat: "_", operation: "null", column: "end", value: "" }],
-      foreignColumn: "memberships",
-      type: "defined",
-    },
-  ],
-  orderBy: [
-    { id: "memberId", depth: 0, table: "member", column: "lastname", order: "ASC" },
-    { id: "memberId", depth: 0, table: "member", column: "firstname", order: "ASC" },
-  ],
-};
--- a/src/helpers/jwtHelper.ts
+++ b/src/helpers/jwtHelper.ts
@ -58,10 +58,7 @@ export abstract class JWTHelper {
    let rolePermissions =
      userRoles.length != 0 ? await RolePermissionService.getByRoles(userRoles.map((e) => e.id)) : [];
    let rolePermissionStrings = rolePermissions.map((e) => e.permission);
-    let permissionObject = PermissionHelper.convertToObject(
-      [...userPermissionStrings, ...rolePermissionStrings],
-      isOwner
-    );
+    let permissionObject = PermissionHelper.convertToObject([...userPermissionStrings, ...rolePermissionStrings]);

    let jwtData: JWTToken = {
      userId: id,
--- a/src/helpers/newsletterHelper.ts
+++ b/src/helpers/newsletterHelper.ts
@ -1,3 +1,4 @@
+import Mail from "nodemailer/lib/mailer";
 import { member } from "../entity/club/member/member";
 import { newsletter } from "../entity/club/newsletter/newsletter";
 import { newsletterDates } from "../entity/club/newsletter/newsletterDates";
@ -61,41 +62,39 @@ export abstract class NewsletterHelper {
      newsletterTitle: newsletter.newsletterTitle,
      newsletterText: newsletter.newsletterText,
      newsletterSignatur: newsletter.newsletterSignatur,
-      dates: dates
-        .map((d) => ({
-          title: d.diffTitle || d.calendar.title,
-          content: d.diffDescription || d.calendar.content,
-          starttime: d.calendar.starttime,
-          formattedStarttime: new Date(d.calendar.starttime).toLocaleDateString("de-DE", {
-            weekday: "long",
-            day: "2-digit",
-            month: "long",
-          }),
-          formattedFullStarttime: new Date(d.calendar.starttime).toLocaleDateString("de-DE", {
-            weekday: "long",
-            day: "2-digit",
-            month: "long",
-            year: "numeric",
-            hour: "2-digit",
-            minute: "2-digit",
-          }),
-          endtime: d.calendar.endtime,
-          formattedEndtime: new Date(d.calendar.endtime).toLocaleDateString("de-DE", {
-            weekday: "long",
-            day: "2-digit",
-            month: "long",
-          }),
-          formattedFullEndtime: new Date(d.calendar.endtime).toLocaleDateString("de-DE", {
-            weekday: "long",
-            day: "2-digit",
-            month: "long",
-            year: "numeric",
-            hour: "2-digit",
-            minute: "2-digit",
-          }),
-          location: d.calendar.location,
-        }))
-        .sort((a, b) => a.starttime.getTime() - b.starttime.getTime()),
+      dates: dates.map((d) => ({
+        title: d.diffTitle ?? d.calendar.title,
+        content: d.diffDescription ?? d.calendar.content,
+        starttime: d.calendar.starttime,
+        formattedStarttime: new Date(d.calendar.starttime).toLocaleDateString("de-DE", {
+          weekday: "long",
+          day: "2-digit",
+          month: "long",
+        }),
+        formattedFullStarttime: new Date(d.calendar.starttime).toLocaleDateString("de-DE", {
+          weekday: "long",
+          day: "2-digit",
+          month: "long",
+          year: "numeric",
+          hour: "2-digit",
+          minute: "2-digit",
+        }),
+        endtime: d.calendar.endtime,
+        formattedEndtime: new Date(d.calendar.endtime).toLocaleDateString("de-DE", {
+          weekday: "long",
+          day: "2-digit",
+          month: "long",
+        }),
+        formattedFullEndtime: new Date(d.calendar.endtime).toLocaleDateString("de-DE", {
+          weekday: "long",
+          day: "2-digit",
+          month: "long",
+          year: "numeric",
+          hour: "2-digit",
+          minute: "2-digit",
+        }),
+        location: d.calendar.location,
+      })),
      ...(recipient
        ? {
            recipient: {
@ -105,9 +104,9 @@ export abstract class NewsletterHelper {
              nameaffix: recipient.nameaffix,
              ...(showAdress
                ? {
-                    street: recipient.sendNewsletter.street || "",
-                    streetNumber: recipient.sendNewsletter.streetNumber || "",
-                    streetNumberAdd: recipient.sendNewsletter.streetNumberAddition || "",
+                    street: recipient.sendNewsletter.street ?? "",
+                    streetNumber: recipient.sendNewsletter.streetNumber ?? "",
+                    streetNumberAdd: recipient.sendNewsletter.streetNumberAddition ?? "",
                  }
                : {}),
            },
@ -141,19 +140,33 @@ export abstract class NewsletterHelper {
      }
    }

-    if (queryMemberIds.length == 0) {
-      return [];
-    } else {
-      let members = await MemberService.getAll({ noLimit: true, ids: queryMemberIds });
-      return members[0];
-    }
+    let members = await MemberService.getAll({ noLimit: true, ids: queryMemberIds });
+
+    return members[0];
  }

-  public static async getMailRecipients(newsletterId: number) {
+  public static getICSFilePath(newsletter: newsletter) {
+    return FileSystemHelper.formatPath(
+      "newsletter",
+      `${newsletter.id}_${newsletter.title.replace(" ", "")}`,
+      `events.ics`
+    );
+  }
+
+  public static saveIcsToFile(newsletter: newsletter, ics: string) {
+    FileSystemHelper.writeFile(`newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`, "events.ics", ics);
+  }
+
+  public static async sendMails(newsletterId: number) {
    let newsletter = await NewsletterService.getById(newsletterId);
+    let dates = await NewsletterDatesService.getAll(newsletterId);
    let recipients = await NewsletterRecipientsService.getAll(newsletterId);
    let config = await NewsletterConfigService.getAll();

+    const { value, error } = CalendarHelper.buildICS(dates.map((r) => r.calendar));
+    if (error) throw new InternalException("Failed Building ICS form Mail", error);
+    this.saveIcsToFile(newsletter, value);
+
    let allowedForMail = config.filter((c) => c.config == NewsletterConfigType.mail).map((c) => c.comTypeId);

    const members = await this.transformRecipientsToMembers(newsletter, recipients);
@ -164,58 +177,6 @@ export abstract class NewsletterHelper {
        allowedForMail.includes(m.sendNewsletter?.type?.id)
    );

-    return mailRecipients;
-  }
-
-  public static async getPrintRecipients(newsletterId: number) {
-    let newsletter = await NewsletterService.getById(newsletterId);
-    let recipients = await NewsletterRecipientsService.getAll(newsletterId);
-    let config = await NewsletterConfigService.getAll();
-
-    let notAllowedForPdf = config.filter((c) => c.config == NewsletterConfigType.mail).map((c) => c.comTypeId);
-
-    const members = await this.transformRecipientsToMembers(newsletter, recipients);
-    const pdfRecipients = members.filter(
-      (m) => !notAllowedForPdf.includes(m.sendNewsletter?.type?.id) || m.sendNewsletter == null
-    );
-
-    pdfRecipients.unshift({
-      id: "0",
-      firstname: "Alle Mitglieder",
-      lastname: CLUB_NAME,
-      nameaffix: "",
-      salutation: { salutation: "" },
-    } as member);
-
-    return pdfRecipients;
-  }
-
-  public static getICSFilePath(newsletter: newsletter) {
-    return FileSystemHelper.formatPath(
-      "newsletter",
-      `${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`,
-      `events.ics`
-    );
-  }
-
-  public static saveIcsToFile(newsletter: newsletter, ics: string) {
-    FileSystemHelper.writeFile(
-      `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`,
-      "events.ics",
-      ics
-    );
-  }
-
-  public static async sendMails(newsletterId: number) {
-    let newsletter = await NewsletterService.getById(newsletterId);
-    let dates = await NewsletterDatesService.getAll(newsletterId);
-
-    const { value, error } = CalendarHelper.buildICS(dates.map((r) => r.calendar));
-    if (error) throw new InternalException("Failed Building ICS form Mail", error);
-    this.saveIcsToFile(newsletter, value);
-
-    const mailRecipients = await this.getMailRecipients(newsletterId);
-
    this.formatJobEmit("progress", "mail", "info", newsletterId, mailRecipients.length, 0, "starting sending");

    for (const [index, rec] of mailRecipients.entries()) {
@ -267,10 +228,11 @@ export abstract class NewsletterHelper {
  public static async printPdfs(newsletterId: number) {
    let newsletter = await NewsletterService.getById(newsletterId);
    let dates = await NewsletterDatesService.getAll(newsletterId);
+    let recipients = await NewsletterRecipientsService.getAll(newsletterId);
    let config = await NewsletterConfigService.getAll();

    FileSystemHelper.clearDirectoryByFiletype(
-      `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`,
+      `newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`,
      ".pdf"
    );

@ -278,20 +240,33 @@ export abstract class NewsletterHelper {
    if (error) throw new InternalException("Failed Building ICS form Pdf", error);
    this.saveIcsToFile(newsletter, value);

+    let notAllowedForPdf = config.filter((c) => c.config == NewsletterConfigType.mail).map((c) => c.comTypeId);
    let printWithAdress = config.filter((c) => c.config == NewsletterConfigType.pdf).map((c) => c.comTypeId);

-    const pdfRecipients = await this.getPrintRecipients(newsletterId);
+    const members = await this.transformRecipientsToMembers(newsletter, recipients);
+    const pdfRecipients = members.filter(
+      (m) => !notAllowedForPdf.includes(m.sendNewsletter?.type?.id) || m.sendNewsletter == null
+    );

-    this.formatJobEmit("progress", "pdf", "info", newsletterId, pdfRecipients.length, 0, "starting printing");
+    this.formatJobEmit("progress", "pdf", "info", newsletterId, pdfRecipients.length + 1, 0, "starting sending");

-    for (const [index, rec] of pdfRecipients.entries()) {
+    for (const [index, rec] of [
+      ...pdfRecipients,
+      {
+        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));

      await PdfExport.renderFile({
        template: "newsletter",
        title: `Newsletter von ${CLUB_NAME}`,
-        filename: `${rec.lastname}_${rec.firstname}_${rec.id}`.replaceAll(" ", "-"),
-        folder: `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`,
+        filename: `${rec.lastname}_${rec.firstname}_${rec.id}`,
+        folder: `newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`,
        data: data,
      })
        .then(() => {
@ -319,9 +294,9 @@ export abstract class NewsletterHelper {
    }

    await PdfExport.sqashToSingleFile(
-      `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`,
+      `newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`,
      "allPdfsTogether",
-      `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`
+      `newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`
    )
      .then(() => {
        this.formatJobEmit(
--- a/src/helpers/pdfExport.ts
+++ b/src/helpers/pdfExport.ts
@ -1,47 +1,10 @@
-import puppeteer, { Browser } from "puppeteer";
+import puppeteer from "puppeteer";
 import { TemplateHelper } from "./templateHelper";
 import { PermissionModule } from "../type/permissionTypes";
 import { FileSystemHelper } from "./fileSystemHelper";
 import { PDFDocument } from "pdf-lib";
-import { StringHelper } from "./stringHelper";

 export abstract class PdfExport {
-  private static browserInstance: undefined | Browser = undefined;
-  private static timeout: undefined | NodeJS.Timeout = undefined;
-  private static printing = new Map<string, string>();
-
-  private static async renderTemplate(
-    template: `${PermissionModule}` | `${PermissionModule}.${string}`,
-    title: string,
-    data: any,
-    customTemplate?: {
-      headerId?: number;
-      footerId?: number;
-      bodyId?: string | number;
-      headerHeight: number;
-      footerHeight: number;
-    }
-  ): Promise<{ header: string; footer: string; body: string; headerMargin?: number; footerMargin?: number }> {
-    if (!customTemplate) {
-      return await TemplateHelper.renderFileForModule({
-        module: template,
-        headerData: data,
-        bodyData: data,
-        footerData: data,
-        title: title,
-      });
-    } else {
-      return await TemplateHelper.renderFileForCustom({
-        module: template,
-        customTemplate,
-        headerData: data,
-        bodyData: data,
-        footerData: data,
-        title: title,
-      });
-    }
-  }
-
  static async renderFile({
    template,
    title = "pdf-export FF Admin",
@ -49,7 +12,6 @@ export abstract class PdfExport {
    data = {},
    saveToDisk = true,
    folder = "",
-    customTemplate = undefined,
  }: {
    template: `${PermissionModule}` | `${PermissionModule}.${string}`;
    title?: string;
@ -57,33 +19,22 @@ export abstract class PdfExport {
    data?: any;
    saveToDisk?: boolean;
    folder?: string;
-    customTemplate?: {
-      headerId?: number;
-      footerId?: number;
-      bodyId?: string | number;
-      headerHeight: number;
-      footerHeight: number;
-    };
  }) {
-    try {
-      clearTimeout(this.timeout);
-    } catch (err) {}
-    let id = StringHelper.random(32);
-    this.printing.set(id, "printing");
-
    if (folder != "") FileSystemHelper.createFolder(folder);

-    const renderedTemplate = await this.renderTemplate(template, title, data, customTemplate);
-    let { header, footer, body, headerMargin, footerMargin } = renderedTemplate;
+    const { header, footer, body, headerMargin, footerMargin } = await TemplateHelper.renderFileForModule({
+      module: template,
+      headerData: data,
+      bodyData: data,
+      footerData: data,
+      title: title,
+    });

-    if (!this.browserInstance || !this.browserInstance.connected) {
-      this.browserInstance = await puppeteer.launch({
-        headless: true,
-        args: ["--no-sandbox", "--disable-gpu", "--disable-setuid-sandbox"],
-      });
-    }
-
-    const page = await this.browserInstance.newPage();
+    const browser = await puppeteer.launch({
+      headless: true,
+      args: ["--no-sandbox", "--disable-gpu", "--disable-setuid-sandbox"],
+    });
+    const page = await browser.newPage();
    await page.setContent(body, { waitUntil: "domcontentloaded" });

    const exportPath = FileSystemHelper.formatPath(folder, `${filename}.pdf`);
@ -103,16 +54,7 @@ export abstract class PdfExport {
      footerTemplate: footer,
    });

-    await page.close();
-
-    this.printing.delete(id);
-
-    if (this.printing.size == 0) {
-      this.timeout = setTimeout(() => {
-        this.browserInstance.close();
-        this.browserInstance = undefined;
-      }, 5000);
-    }
+    await browser.close();

    return pdf;
  }
--- a/src/helpers/permissionHelper.ts
+++ b/src/helpers/permissionHelper.ts
@ -4,11 +4,9 @@ import {
  permissionModules,
  PermissionObject,
  PermissionSection,
-  permissionSections,
  PermissionString,
  PermissionType,
  permissionTypes,
-  sectionsAndModules,
 } from "../type/permissionTypes";
 import ForbiddenRequestException from "../exceptions/forbiddenRequestException";

@ -19,8 +17,8 @@ export default class PermissionHelper {
    section: PermissionSection,
    module?: PermissionModule
  ) {
-    if (type == "admin") return permissions?.admin ?? permissions?.adminByOwner ?? false;
-    if (permissions?.admin || permissions?.adminByOwner) return true;
+    if (type == "admin") return permissions?.admin ?? false;
+    if (permissions?.admin) return true;
    if (
      (!module &&
        permissions[section] != undefined &&
@ -52,8 +50,8 @@ export default class PermissionHelper {
    type: PermissionType | "admin",
    section: PermissionSection
  ): boolean {
-    if (type == "admin") return permissions?.admin ?? permissions?.adminByOwner ?? false;
-    if (permissions?.admin || permissions?.adminByOwner) return true;
+    if (type == "admin") return permissions?.admin ?? false;
+    if (permissions?.admin) return true;
    if (
      permissions[section]?.all == "*" ||
      permissions[section]?.all?.includes(type) ||
@ -75,11 +73,6 @@ export default class PermissionHelper {
    }, false);
  }

-  static canValue(permissions: PermissionObject, key: string, emptyIfAdmin: boolean = false): string {
-    if (emptyIfAdmin && (permissions.admin || permissions.adminByOwner)) return "";
-    return permissions?.additional?.[key] ?? "";
-  }
-
  static passCheckMiddleware(
    requiredPermissions: PermissionType | "admin",
    section: PermissionSection,
@ -166,28 +159,14 @@ export default class PermissionHelper {
    };
  }

-  static convertToObject(permissions: Array<PermissionString>, isOwner: boolean = false): PermissionObject {
-    let isAdmin = permissions.includes("*");
-
-    let additional: { [key: string]: string } = {};
-    let additionalPermissions = permissions.map((e) => e.split(".")).filter((e) => e[0] == "additional") as Array<
-      ["additional", string, string]
-    >;
-    for (let split of additionalPermissions) {
-      let module = sectionsAndModules.additional.find((a) => a.key == split[1]);
-      if (!isAdmin || (isAdmin && !module.emptyIfAdmin)) additional[split[1]] = split[2];
-    }
-
-    if (isAdmin) {
+  static convertToObject(permissions: Array<PermissionString>): PermissionObject {
+    if (permissions.includes("*")) {
      return {
        admin: true,
-        adminByOwner: isOwner,
-        ...(Object.keys(additional).length > 0 && { additional }),
      };
    }
-
    let output: PermissionObject = {};
-    let splitPermissions = permissions.map((e) => e.split(".")).filter((e) => e[0] != "additional") as Array<
+    let splitPermissions = permissions.map((e) => e.split(".")) as Array<
      [PermissionSection, PermissionModule | PermissionType | "*", PermissionType | "*"]
    >;
    for (let split of splitPermissions) {
@ -229,31 +208,15 @@ export default class PermissionHelper {
        }
      }
    }
-
-    return {
-      adminByOwner: isOwner,
-      ...output,
-      ...(Object.keys(additional).length > 0 && { additional }),
-    };
+    return output;
  }

  static convertToStringArray(permissions: PermissionObject): Array<PermissionString> {
-    let isAdmin = permissions?.admin;
-
-    let additional: Array<PermissionString> = [];
-    let additionalPermissions = Object.entries(permissions?.additional ?? {});
-    for (let add of additionalPermissions) {
-      additional.push(`additional.${add[0]}.${add[1]}`);
+    if (permissions?.admin) {
+      return ["*"];
    }
-
-    if (isAdmin) {
-      return ["*", ...additional];
-    }
-
    let output: Array<PermissionString> = [];
-    let sections = Object.keys(permissions).filter((m: PermissionSection) =>
-      permissionSections.includes(m)
-    ) as Array<PermissionSection>;
+    let sections = Object.keys(permissions) as Array<PermissionSection>;
    for (let section of sections) {
      if (permissions[section].all) {
        let types = permissions[section].all;
@ -279,8 +242,7 @@ export default class PermissionHelper {
        }
      }
    }
-
-    return [...output, ...additional];
+    return output;
  }

  static getWhatToAdd(before: Array<PermissionString>, after: Array<PermissionString>): Array<PermissionString> {
--- a/src/helpers/templateHelper.ts
+++ b/src/helpers/templateHelper.ts
@ -3,19 +3,10 @@ import { PermissionModule } from "../type/permissionTypes";
 import TemplateUsageService from "../service/configuration/templateUsageService";
 import Handlebars, { template } from "handlebars";
 import { FileSystemHelper } from "./fileSystemHelper";
-import { TemplateFormat } from "../type/templateTypes";

 export abstract class TemplateHelper {
  static getTemplateFromFile(template: string) {
-    let tmpFile;
-    try {
-      tmpFile = FileSystemHelper.readTemplateFile(`/src/templates/${template}.template.html`);
-    } catch (err) {
-      tmpFile = FileSystemHelper.readTemplateFile(
-        `/src/templates/${template.split(".")[template.split(".").length - 1]}.template.html`
-      );
-    }
-    return tmpFile;
+    return FileSystemHelper.readTemplateFile(`/src/templates/${template}.template.html`);
  }

  static async getTemplateFromStore(templateId: number): Promise<string> {
@ -29,9 +20,9 @@ export abstract class TemplateHelper {
  }

  static normalizeTemplate(template: string): string {
-    template = template.replaceAll(/<listend>.*?<\/listend>/g, "{{/each}}");
-    template = template.replaceAll(/<liststart\b[^>]*>(WDH Start: )?/g, "{{#each ");
-    template = template.replaceAll(/<\/liststart>/g, "}}");
+    template = template.replace(/<listend>.*?<\/listend>/g, "{{/each}}");
+    template = template.replace(/<liststart\b[^>]*>(WDH Start: )?/g, "{{#each ");
+    template = template.replace(/<\/liststart>/g, "}}");

    return template;
  }
@ -43,7 +34,7 @@ export abstract class TemplateHelper {
    bodyData = {},
    footerData = {},
  }: {
-    module: TemplateFormat;
+    module: `${PermissionModule}` | `${PermissionModule}.${string}`;
    title?: string;
    headerData?: any;
    bodyData?: any;
@ -65,14 +56,14 @@ export abstract class TemplateHelper {
    } else {
      footer = this.getTemplateFromFile(module + ".footer");
    }
-    footer = this.applyDataToTemplate(footer, { title, ...footerData });
+    footer = this.applyDataToTemplate(footer, footerData);

    if (moduleTemplate.bodyId) {
      body = await this.getTemplateFromStore(moduleTemplate.bodyId);
    } else {
      body = this.getTemplateFromFile(module + ".body");
    }
-    body = this.applyDataToTemplate(body, { title, ...bodyData });
+    body = this.applyDataToTemplate(body, bodyData);

    return {
      header,
@ -82,57 +73,4 @@ export abstract class TemplateHelper {
      footerMargin: moduleTemplate.footerHeight,
    };
  }
-
-  static async renderFileForCustom({
-    module,
-    title = "pdf-export FF Admin",
-    headerData = {},
-    bodyData = {},
-    footerData = {},
-    customTemplate,
-  }: {
-    module: TemplateFormat;
-    title?: string;
-    headerData?: any;
-    bodyData?: any;
-    footerData?: any;
-    customTemplate: {
-      headerId?: number;
-      footerId?: number;
-      bodyId?: string | number;
-      headerHeight: number;
-      footerHeight: number;
-    };
-  }): Promise<{ header: string; body: string; footer: string; headerMargin?: number; footerMargin?: number }> {
-    let header = `<h1 style="font-size:10px; text-align:center; width:100%;">${title}</h1>`;
-    let footer = "";
-    let body = "";
-
-    if (customTemplate.headerId) {
-      header = await this.getTemplateFromStore(customTemplate.headerId);
-      header = this.applyDataToTemplate(header, { title, ...headerData });
-    }
-
-    if (customTemplate.footerId) {
-      footer = await this.getTemplateFromStore(customTemplate.footerId);
-    } else {
-      footer = this.getTemplateFromFile(module + ".footer");
-    }
-    footer = this.applyDataToTemplate(footer, { title, ...footerData });
-
-    if (customTemplate.bodyId && typeof customTemplate.bodyId == "number") {
-      body = await this.getTemplateFromStore(customTemplate.bodyId);
-    } else {
-      body = this.getTemplateFromFile((customTemplate.bodyId || module) + ".body");
-    }
-    body = this.applyDataToTemplate(body, { title, ...bodyData });
-
-    return {
-      header,
-      footer,
-      body,
-      headerMargin: customTemplate.headerHeight,
-      footerMargin: customTemplate.footerHeight,
-    };
-  }
 }
--- a/src/index.ts
+++ b/src/index.ts
@ -1,5 +1,4 @@
 import "dotenv/config";
-import "./handlebars.config";
 import express from "express";

 import { BACKUP_AUTO_RESTORE, configCheck, SERVER_PORT } from "./env.defaults";
--- a/src/migrations/1738166167472-CreateSchema.ts
+++ b/src/migrations/1738166167472-CreateSchema.ts
@ -106,7 +106,7 @@ export class CreateSchema1738166167472 implements MigrationInterface {
      .insert()
      .into(templateUsage)
      .values([{ scope: "newsletter" }, { scope: "protocol" }, { scope: "member.list" }])
-      .orIgnore()
+      .orUpdate(["headerId", "bodyId", "footerId", "headerHeight", "footerHeight"], ["scope"])
      .execute();

    await queryRunner.createTable(protocol_table, true, true, true);
--- a/src/migrations/1742549956787-templatesAndProtocolSort.ts
+++ b/src/migrations/1742549956787-templatesAndProtocolSort.ts
@ -1,55 +0,0 @@
-import { MigrationInterface, QueryRunner, TableColumn } from "typeorm";
-import { templateUsage } from "../entity/configuration/templateUsage";
-import { getTypeByORM, getDefaultByORM } from "./ormHelper";
-
-export class TemplatesAndProtocolSort1742549956787 implements MigrationInterface {
-  name = "TemplatesAndProtocolSort1742549956787";
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.manager
-      .createQueryBuilder()
-      .insert()
-      .into(templateUsage)
-      .values([{ scope: "member" }])
-      .orIgnore()
-      .execute();
-
-    await queryRunner.manager
-      .createQueryBuilder()
-      .delete()
-      .from(templateUsage)
-      .where({ scope: "member.list" })
-      .execute();
-
-    await queryRunner.addColumn(
-      "protocol_agenda",
-      new TableColumn({ name: "sort", ...getTypeByORM("int"), default: getDefaultByORM("number", 0) })
-    );
-
-    await queryRunner.addColumn(
-      "protocol_decision",
-      new TableColumn({ name: "sort", ...getTypeByORM("int"), default: getDefaultByORM("number", 0) })
-    );
-
-    await queryRunner.addColumn(
-      "protocol_voting",
-      new TableColumn({ name: "sort", ...getTypeByORM("int"), default: getDefaultByORM("number", 0) })
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.dropColumn("protocol_agenda", "sort");
-    await queryRunner.dropColumn("protocol_decision", "sort");
-    await queryRunner.dropColumn("protocol_voting", "sort");
-
-    await queryRunner.manager
-      .createQueryBuilder()
-      .insert()
-      .into(templateUsage)
-      .values([{ scope: "member.list" }])
-      .orIgnore()
-      .execute();
-
-    await queryRunner.manager.createQueryBuilder().delete().from(templateUsage).where({ scope: "member" }).execute();
-  }
-}
--- a/src/migrations/1742922178643-queryToUUID.ts
+++ b/src/migrations/1742922178643-queryToUUID.ts
@ -1,94 +0,0 @@
-import { MigrationInterface, QueryRunner, TableColumn, TableForeignKey } from "typeorm";
-import { getTypeByORM, isIncrementPrimary, isUUIDPrimary } from "./ormHelper";
-import { query } from "../entity/configuration/query";
-
-export class QueryToUUID1742922178643 implements MigrationInterface {
-  name = "QueryToUUID1742922178643";
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    const table = await queryRunner.getTable("newsletter");
-    const foreignKey = table.foreignKeys.find((fk) => fk.columnNames.indexOf("recipientsByQueryId") !== -1);
-    await queryRunner.dropForeignKey("newsletter", foreignKey);
-
-    const entries = await queryRunner.manager.getRepository(query).find({ select: { title: true, query: true } });
-    await queryRunner.clearTable("query");
-
-    await queryRunner.dropColumn("newsletter", "recipientsByQueryId");
-    await queryRunner.dropColumn("query", "id");
-
-    await queryRunner.addColumn(
-      "query",
-      new TableColumn({
-        name: "id",
-        ...getTypeByORM("uuid"),
-        ...isUUIDPrimary,
-      })
-    );
-    await queryRunner.addColumn(
-      "newsletter",
-      new TableColumn({
-        name: "recipientsByQueryId",
-        ...getTypeByORM("uuid", true),
-      })
-    );
-
-    await queryRunner.manager.createQueryBuilder().insert().into("query").values(entries).execute();
-
-    await queryRunner.createForeignKey(
-      "newsletter",
-      new TableForeignKey({
-        columnNames: ["recipientsByQueryId"],
-        referencedColumnNames: ["id"],
-        referencedTableName: "query",
-        onDelete: "CASCADE",
-        onUpdate: "RESTRICT",
-      })
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    const table = await queryRunner.getTable("newsletter");
-    const foreignKey = table.foreignKeys.find((fk) => fk.columnNames.indexOf("recipientsByQueryId") !== -1);
-    await queryRunner.dropForeignKey("newsletter", foreignKey);
-
-    const entries = await queryRunner.manager.getRepository(query).find({ select: { title: true, query: true } });
-    await queryRunner.clearTable("query");
-
-    await queryRunner.dropColumn("newsletter", "recipientsByQueryId");
-    await queryRunner.dropColumn("query", "id");
-
-    await queryRunner.addColumn(
-      "query",
-      new TableColumn({
-        name: "id",
-        ...getTypeByORM("int"),
-        ...isIncrementPrimary,
-      })
-    );
-    await queryRunner.addColumn(
-      "newsletter",
-      new TableColumn({
-        name: "recipientsByQueryId",
-        ...getTypeByORM("int", true),
-      })
-    );
-
-    await queryRunner.manager
-      .createQueryBuilder()
-      .insert()
-      .into("query")
-      .values(entries.map((e, i) => ({ ...e, id: i + 1 })))
-      .execute();
-
-    await queryRunner.createForeignKey(
-      "newsletter",
-      new TableForeignKey({
-        columnNames: ["recipientsByQueryId"],
-        referencedColumnNames: ["id"],
-        referencedTableName: "query",
-        onDelete: "CASCADE",
-        onUpdate: "RESTRICT",
-      })
-    );
-  }
-}
--- a/src/migrations/1744351418751-newsletterColumnType.ts
+++ b/src/migrations/1744351418751-newsletterColumnType.ts
@ -1,43 +0,0 @@
-import { MigrationInterface, QueryRunner, TableColumn } from "typeorm";
-import { getDefaultByORM, getTypeByORM } from "./ormHelper";
-import { newsletter } from "../entity/club/newsletter/newsletter";
-
-export class NewsletterColumnType1744351418751 implements MigrationInterface {
-  name = "NewsletterColumnType1744351418751";
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    let newsletters = await queryRunner.manager.getRepository("newsletter").find();
-
-    await queryRunner.dropColumn("newsletter", "newsletterTitle");
-    await queryRunner.dropColumn("newsletter", "newsletterSignatur");
-
-    await queryRunner.addColumn(
-      "newsletter",
-      new TableColumn({ name: "newsletterTitle", ...getTypeByORM("text"), default: getDefaultByORM("string") })
-    );
-    await queryRunner.addColumn(
-      "newsletter",
-      new TableColumn({ name: "newsletterSignatur", ...getTypeByORM("text"), default: getDefaultByORM("string") })
-    );
-
-    await queryRunner.manager.getRepository("newsletter").save(newsletters);
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    let newsletters = await queryRunner.manager.getRepository("newsletter").find();
-
-    await queryRunner.dropColumn("newsletter", "newsletterTitle");
-    await queryRunner.dropColumn("newsletter", "newsletterSignatur");
-
-    await queryRunner.addColumn(
-      "newsletter",
-      new TableColumn({ name: "newsletterTitle", ...getTypeByORM("varchar"), default: getDefaultByORM("string") })
-    );
-    await queryRunner.addColumn(
-      "newsletter",
-      new TableColumn({ name: "newsletterSignatur", ...getTypeByORM("varchar"), default: getDefaultByORM("string") })
-    );
-
-    await queryRunner.manager.getRepository("newsletter").save(newsletters);
-  }
-}
--- a/src/migrations/1744795756230-QueryUpdatedAt.ts
+++ b/src/migrations/1744795756230-QueryUpdatedAt.ts
@ -1,22 +0,0 @@
-import { MigrationInterface, QueryRunner, TableColumn } from "typeorm";
-import { getTypeByORM, getDefaultByORM } from "./ormHelper";
-
-export class QueryUpdatedAt1744795756230 implements MigrationInterface {
-  name = "QueryUpdatedAt1744795756230";
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.addColumn(
-      "query",
-      new TableColumn({
-        name: "updatedAt",
-        ...getTypeByORM("datetime", false, 6),
-        default: getDefaultByORM("currentTimestamp", 6),
-        onUpdate: getDefaultByORM<string>("currentTimestamp", 6),
-      })
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.dropColumn("query", "updatedAt");
-  }
-}
--- a/src/routes/admin/club/listprint.ts
+++ b/src/routes/admin/club/listprint.ts
@ -1,10 +0,0 @@
-import express, { Request, Response } from "express";
-import { printListByQueryAndTemplate } from "../../../controller/admin/club/listprintController";
-
-var router = express.Router({ mergeParams: true });
-
-router.post("/", async (req: Request, res: Response) => {
-  await printListByQueryAndTemplate(req, res);
-});
-
-export default router;
--- a/src/routes/admin/club/member.ts
+++ b/src/routes/admin/club/member.ts
@ -6,6 +6,7 @@ import {
  addMembershipToMember,
  addQualificationToMember,
  createMember,
+  createMemberPrintoutList,
  deleteAwardOfMember,
  deleteCommunicationOfMember,
  deleteExecutivePositionOfMember,
@ -20,7 +21,6 @@ import {
  getExecutivePositionByMemberAndRecord,
  getExecutivePositionsByMember,
  getMemberById,
-  getMemberPrintoutById,
  getMembersByIds,
  getMembershipByMemberAndRecord,
  getMembershipsByMember,
@ -55,8 +55,8 @@ router.get("/:id/statistics", async (req: Request, res: Response) => {
  await getMemberStatisticsById(req, res);
 });

-router.get("/:id/print", async (req: Request, res: Response) => {
-  await getMemberPrintoutById(req, res);
+router.get("/print/namelist", async (req: Request, res: Response) => {
+  await createMemberPrintoutList(req, res);
 });

 router.get("/:memberId/memberships", async (req: Request, res: Response) => {
--- a/src/routes/admin/club/newsletter.ts
+++ b/src/routes/admin/club/newsletter.ts
@ -16,8 +16,6 @@ import {
  createNewsletterPrintoutPreviewById,
  getNewsletterPrintoutProgressById,
  getNewsletterSendingProgressById,
-  getNewsletterMailReceiversById,
-  getNewsletterPrintReceiversById,
 } from "../../../controller/admin/club/newsletterController";
 import PermissionHelper from "../../../helpers/permissionHelper";

@ -59,14 +57,6 @@ router.get("/:newsletterId/sendprogress", async (req: Request, res: Response) =>
  await getNewsletterSendingProgressById(req, res);
 });

-router.get("/:newsletterId/printrecipients", async (req: Request, res: Response) => {
-  await getNewsletterPrintReceiversById(req, res);
-});
-
-router.get("/:newsletterId/mailrecipients", async (req: Request, res: Response) => {
-  await getNewsletterMailReceiversById(req, res);
-});
-
 router.post(
  "/",
  PermissionHelper.passCheckMiddleware("create", "club", "protocol"),
--- a/src/routes/admin/club/queryBuilder.ts
+++ b/src/routes/admin/club/queryBuilder.ts
@ -1,10 +1,5 @@
 import express, { Request, Response } from "express";
-import {
-  executeQuery,
-  executeQueryByStoreId,
-  getAllTableMeta,
-  getTableMetaByTablename,
-} from "../../../controller/admin/club/queryBuilderController";
+import { executeQuery, getAllTableMeta, getTableMetaByTablename } from "../../../controller/admin/club/queryBuilderController";

 var router = express.Router({ mergeParams: true });

@ -20,8 +15,4 @@ router.post("/query", async (req: Request, res: Response) => {
  await executeQuery(req, res);
 });

-router.post("/query/:storeId", async (req: Request, res: Response) => {
-  await executeQueryByStoreId(req, res);
-});
-
 export default router;
--- a/src/routes/admin/index.ts
+++ b/src/routes/admin/index.ts
@ -19,7 +19,6 @@ import protocol from "./club/protocol";
 import calendar from "./club/calendar";
 import queryBuilder from "./club/queryBuilder";
 import newsletter from "./club/newsletter";
-import listprint from "./club/listprint";

 import role from "./management/role";
 import user from "./management/user";
@ -85,14 +84,7 @@ router.use(
  ]),
  calendarType
 );
-router.use(
-  "/querystore",
-  PermissionHelper.passCheckSomeMiddleware([
-    { requiredPermissions: "read", section: "configuration", module: "query_store" },
-    { requiredPermissions: "read", section: "club", module: "listprint" },
-  ]),
-  queryStore
-);
+router.use("/querystore", PermissionHelper.passCheckMiddleware("read", "configuration", "query_store"), queryStore);
 router.use("/template", PermissionHelper.passCheckMiddleware("read", "configuration", "template"), template);
 router.use(
  "/templateusage",
@ -140,7 +132,6 @@ router.use(
  ]),
  newsletter
 );
-router.use("/listprint", PermissionHelper.passCheckMiddleware("read", "club", "listprint"), listprint);

 router.use("/role", PermissionHelper.passCheckMiddleware("read", "management", "role"), role);
 router.use(
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@ -68,7 +68,7 @@ export default (app: Express) => {
  }
  app.set("query parser", "extended");
  app.use(cors());
-  app.options("*splat", cors());
+  app.options("*", cors());
  app.use(helmet());
  app.use(morgan("short"));
  app.use(express.json());
--- a/src/service/club/member/memberService.ts
+++ b/src/service/club/member/memberService.ts
@ -1,4 +1,4 @@
-import { Brackets, Like, SelectQueryBuilder } from "typeorm";
+import { SelectQueryBuilder } from "typeorm";
 import { dataSource } from "../../../data-source";
 import { member } from "../../../entity/club/member/member";
 import { membership } from "../../../entity/club/member/membership";
@ -28,29 +28,19 @@ export default abstract class MemberService {
    let query = this.applyMemberBaseJoins();

    if (search != "") {
-      let searchBits = search.split(" ");
-
-      if (searchBits.length < 2) {
-        query = query.where(`member.firstname LIKE :searchQuery OR member.lastname LIKE :searchQuery`, {
-          searchQuery: `%${searchBits[0]}%`,
-        });
-      } else {
-        searchBits
-          .flatMap((v, i) => searchBits.slice(i + 1).map((w) => [v, w]))
-          .forEach((term) => {
-            query = query
-              .orWhere(
-                new Brackets((qb) =>
-                  qb.where({ firstname: Like(`%${term[0]}%`) }).andWhere({ lastname: Like(`%${term[1]}%`) })
-                )
-              )
-              .orWhere(
-                new Brackets((qb) =>
-                  qb.where({ firstname: Like(`%${term[1]}%`) }).andWhere({ lastname: Like(`%${term[0]}%`) })
-                )
-              );
+      search.split(" ").forEach((term, index) => {
+        const searchQuery = `%${term}%`;
+        const dynamic = "searchQuery" + Math.random().toString(36).substring(2);
+        if (index == 0) {
+          query = query.where(`member.firstname LIKE :${dynamic} OR member.lastname LIKE :${dynamic}`, {
+            [dynamic]: searchQuery,
          });
-      }
+        } else {
+          query = query.orWhere(`member.firstname LIKE :${dynamic} OR member.lastname LIKE :${dynamic}`, {
+            [dynamic]: searchQuery,
+          });
+        }
+      });
    }

    if (ids.length != 0) {
--- a/src/service/club/protocol/protocolAgendaService.ts
+++ b/src/service/club/protocol/protocolAgendaService.ts
@ -39,22 +39,4 @@ export default abstract class ProtocolAgendaService {
        throw new DatabaseActionException("SELECT", "protocolAgenda", err);
      });
  }
-
-  /**
-   * @description get count of exisiting protocolAgenda by protocolId
-   * @returns {Promise<number>}
-   */
-  static async getInstanceCount(protocolId: number): Promise<number> {
-    return await dataSource
-      .getRepository(protocolAgenda)
-      .createQueryBuilder("protocolAgenda")
-      .where({ protocolId })
-      .getCount()
-      .then((res) => {
-        return res;
-      })
-      .catch((err) => {
-        throw new DatabaseActionException("COUNT", "protocolAgenda", err);
-      });
-  }
 }
--- a/src/service/club/protocol/protocolDecisionService.ts
+++ b/src/service/club/protocol/protocolDecisionService.ts
@ -39,22 +39,4 @@ export default abstract class ProtocolDecisionService {
        throw new DatabaseActionException("SELECT", "protocolDecision", err);
      });
  }
-
-  /**
-   * @description get count of exisiting protocolDecision by protocolId
-   * @returns {Promise<number>}
-   */
-  static async getInstanceCount(protocolId: number): Promise<number> {
-    return await dataSource
-      .getRepository(protocolDecision)
-      .createQueryBuilder("protocolDecisions")
-      .where({ protocolId })
-      .getCount()
-      .then((res) => {
-        return res;
-      })
-      .catch((err) => {
-        throw new DatabaseActionException("COUNT", "protocolDecision", err);
-      });
-  }
 }
--- a/src/service/club/protocol/protocolVotingService.ts
+++ b/src/service/club/protocol/protocolVotingService.ts
@ -39,22 +39,4 @@ export default abstract class ProtocolVotingService {
        throw new DatabaseActionException("SELECT", "protocolVoting", err);
      });
  }
-
-  /**
-   * @description get count of exisiting protocolVoting by protocolId
-   * @returns {Promise<number>}
-   */
-  static async getInstanceCount(protocolId: number): Promise<number> {
-    return await dataSource
-      .getRepository(protocolVoting)
-      .createQueryBuilder("protocolVotings")
-      .where({ protocolId })
-      .getCount()
-      .then((res) => {
-        return res;
-      })
-      .catch((err) => {
-        throw new DatabaseActionException("COUNT", "protocolVoting", err);
-      });
-  }
 }
--- a/src/service/configuration/queryStoreService.ts
+++ b/src/service/configuration/queryStoreService.ts
@ -26,7 +26,7 @@ export default abstract class QueryStoreService {
   * @description get queryStore by id
   * @returns {Promise<query>}
   */
-  static async getById(id: string): Promise<query> {
+  static async getById(id: number): Promise<query> {
    return await dataSource
      .getRepository(query)
      .createQueryBuilder("queryStore")
--- a/src/templates/listprint.body.template.html
+++ b/src/templates/listprint.body.template.html
@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Listen-Druck</title>
-  </head>
-  <body>
-    <h1>{{title}}</h1>
-    <p>Ausdruck Stand {{longdate today}}</p>
-    <br />
-
-    <table style="width: 100%">
-      {{#each list}}
-      <tr>
-        <td style="width: 100%; padding: 10px 5px">{{json this}}</td>
-      </tr>
-      {{/each}}
-    </table>
-  </body>
-  <style>
-    h2,
-    h3,
-    p,
-    span,
-    ul,
-    li {
-      padding: 0;
-      margin: 0;
-    }
-
-    h1,
-    h2 {
-      color: #990b00;
-    }
-
-    h2 {
-      margin-bottom: 5px;
-    }
-
-    table,
-    th,
-    td {
-      border: 1px solid black;
-      border-collapse: collapse;
-      text-align: start;
-    }
-  </style>
-</html>
--- a/src/templates/member.body.template.html
+++ b/src/templates/member.body.template.html
@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>Mitglied</title>
-  </head>
-  <body>
-    <h1>
-      {{member.salutation.salutation}} {{member.lastname}}, {{member.firstname}}{{#if member.nameaffix}} -
-      {{member.nameaffix}}{{/if}}
-    </h1>
-    <p>Mitglieds-Ausdruck Stand {{longdate today}}</p>
-    <br />
-
-    <p>geboren: {{date member.birthdate}}</p>
-    <p>eingetreten: {{date member.firstMembershipEntry.start}}</p>
-    {{#if member.lastMembershipEntry?.end}}
-    <p>ausgetreten: {{date member.lastMembershipEntry.end}}</p>
-    {{/if}} {{#if memberships.length}}
-    <br />
-    <h2>Mitgliedschaften</h2>
-    {{#each memberships}}
-    <div>
-      <h3>{{this.status.status}}: {{date this.start}} bis {{#if this.end}}{{date this.end}}{{else}}heute{{/if}}</h3>
-      {{#if this.terminationReason}}
-      <p>beendet, weil:{{this.terminationReason}}</p>
-      {{/if}}
-    </div>
-    <br />
-    {{/each}} {{/if}} {{#if positions.length}}
-    <br />
-    <h2>Vereinsämter</h2>
-    {{#each positions}}
-    <div>
-      <h3>
-        {{this.executivePosition.position}}: {{date this.start}} bis {{#if this.end}}{{date
-        this.end}}{{else}}heute{{/if}}
-      </h3>
-      {{#if this.note}}
-      <p>Notiz: {{this.note}}</p>
-      {{/if}}
-    </div>
-    <br />
-    {{/each}} {{/if}} {{#if awards.length}}
-    <br />
-    <h2>Auszeichnungen</h2>
-    {{#each awards}}
-    <div>
-      <h3>{{this.award.award}}: {{date this.date}}</h3>
-      {{#if this.given}}
-      <p>wurde vergeben</p>
-      {{else}}
-      <p>wurde verwehrt / zurückgewiesen</p>
-      {{/if}} {{#if this.note}}
-      <p>Notiz: {{this.note}}</p>
-      {{/if}}
-    </div>
-    <br />
-    {{/each}} {{/if}} {{#if qualifications.length}}
-    <br />
-    <h2>Qualifikationen</h2>
-    {{#each qualifications}}
-    <div>
-      <h3>{{this.qualification.qualification}}: {{date this.date}}</h3>
-      {{#if this.terminationReason}}
-      <p>beendet, weil:{{this.terminationReason}}</p>
-      {{/if}} {{#if this.note}}
-      <p>Notiz: {{this.note}}</p>
-      {{/if}}
-    </div>
-    <br />
-    {{/each}} {{/if}}
-  </body>
-  <style>
-    h2,
-    h3,
-    p,
-    span,
-    ul,
-    li {
-      padding: 0;
-      margin: 0;
-    }
-
-    h1,
-    h2 {
-      color: #990b00;
-    }
-
-    h2 {
-      margin-bottom: 5px;
-    }
-
-    table,
-    th,
-    td {
-      border: 1px solid black;
-      border-collapse: collapse;
-      text-align: start;
-    }
-  </style>
-</html>
--- a/src/templates/listprint.member.body.template.html
+++ b/src/templates/listprint.member.body.template.html
@ -6,16 +6,15 @@
  </head>
  <body>
    <h1>Mitgliederliste</h1>
-    <p>Ausdruck Stand {{longdate today}}</p>
    <br />

    <table style="width: 100%">
-      {{#each list}}
+      {{#each member}}
      <tr>
-        <td style="width: 35%; padding: 10px 5px">
+        <th style="width: 35%; padding: 10px 5px">
          {{this.lastname}} {{this.firstname}}{{#if this.nameaffix}} - {{this.nameaffix}}{{/if}}
-        </td>
-        <td style="width: 65%; padding: 10px 0"></td>
+        </th>
+        <th style="width: 65%; padding: 10px 0"></th>
      </tr>
      {{/each}}
    </table>
--- a/src/templates/member.list.footer.template.html
+++ b/src/templates/member.list.footer.template.html
--- a/src/templates/protocol.footer.template.html
+++ b/src/templates/protocol.footer.template.html
@ -0,0 +1,3 @@
+<div style="font-size: 10px; text-align: center; width: 100%; color: #888">
+  Seite <span class="pageNumber"></span> von <span class="totalPages"></span>
+</div>
--- a/src/type/dynamicQueries.ts
+++ b/src/type/dynamicQueries.ts
@ -1,10 +1,9 @@
 export interface DynamicQueryStructure {
-  id: string;
  select: string[] | "*";
  table: string;
  where?: Array<ConditionStructure>;
-  join?: Array<DynamicQueryStructure & JoinStructure>;
-  orderBy?: Array<OrderByStructure>; // only at top level
+  join?: Array<DynamicQueryStructure & { foreignColumn: string }>;
+  orderBy?: Array<OrderByStructure>;
 }

 export type ConditionStructure = (
@ -48,12 +47,7 @@ export type WhereOperation =
  | "timespanEq"; // Date before x years (YYYY-01-01 <bis> YYYY-12-31)
 // TODO: age between | age equals | age greater | age smaller

-export type JoinStructure = { foreignColumn: string; type: "defined" } | { condition: string; type: "custom" };
-
 export type OrderByStructure = {
-  id: string;
-  depth: number;
-  table: string;
  column: string;
  order: OrderByType;
 };
@ -65,7 +59,6 @@ export type QueryResult = {
 };

 export const exampleQuery: DynamicQueryStructure = {
-  id: "1234",
  select: ["firstname", "lastname"],
  table: "member",
  where: [
@ -99,25 +92,19 @@ export const exampleQuery: DynamicQueryStructure = {
  ],
  join: [
    {
-      id: "5678",
      select: "*",
      table: "communication",
      foreignColumn: "sendNewsletter",
-      type: "defined",
    },
    {
-      id: "91011",
      select: "*",
      table: "membership",
      foreignColumn: "memberships",
-      type: "defined",
      join: [
        {
-          id: "121314",
          select: "*",
          table: "membership_status",
          foreignColumn: "status",
-          type: "defined",
          where: [
            {
              structureType: "condition",
@ -133,16 +120,10 @@ export const exampleQuery: DynamicQueryStructure = {
  ],
  orderBy: [
    {
-      id: "1234",
-      depth: 0,
-      table: "member",
      column: "firstname",
      order: "ASC",
    },
    {
-      id: "1234",
-      depth: 0,
-      table: "member",
      column: "lastname",
      order: "ASC",
    },
--- a/src/type/permissionTypes.ts
+++ b/src/type/permissionTypes.ts
@ -6,7 +6,6 @@ export type PermissionModule =
  | "newsletter"
  | "newsletter_config"
  | "protocol"
-  | "listprint"
  | "qualification"
  | "award"
  | "executive_position"
@ -30,7 +29,6 @@ export type PermissionString =
  | `${PermissionSection}.${PermissionModule}.*` // für alle Berechtigungen in einem Modul
  | `${PermissionSection}.${PermissionType}` // für spezifische Berechtigungen in einem Abschnitt
  | `${PermissionSection}.*` // für alle Berechtigungen in einem Abschnitt
-  | `additional.${string}.${string}` // additional
  | "*"; // für Admin

 export type PermissionObject = {
@ -39,20 +37,10 @@ export type PermissionObject = {
  } & { all?: Array<PermissionType> | "*" };
 } & {
  admin?: boolean;
-  adminByOwner?: boolean;
-} & {
-  additional?: { [key: string]: string };
 };

 export type SectionsAndModulesObject = {
  [section in PermissionSection]: Array<PermissionModule>;
-} & {
-  additional?: Array<{
-    key: string;
-    name: string;
-    type: "number" | "string";
-    emptyIfAdmin: boolean;
-  }>;
 };

 export const permissionSections: Array<PermissionSection> = ["club", "configuration", "management"];
@ -62,7 +50,6 @@ export const permissionModules: Array<PermissionModule> = [
  "newsletter",
  "newsletter_config",
  "protocol",
-  "listprint",
  "qualification",
  "award",
  "executive_position",
@ -81,7 +68,7 @@ export const permissionModules: Array<PermissionModule> = [
 ];
 export const permissionTypes: Array<PermissionType> = ["read", "create", "update", "delete"];
 export const sectionsAndModules: SectionsAndModulesObject = {
-  club: ["member", "calendar", "newsletter", "protocol", "query", "listprint"],
+  club: ["member", "calendar", "newsletter", "protocol", "query"],
  configuration: [
    "qualification",
    "award",
@ -96,5 +83,4 @@ export const sectionsAndModules: SectionsAndModulesObject = {
    "newsletter_config",
  ],
  management: ["user", "role", "webapi", "backup"],
-  additional: [],
 };
--- a/src/type/templateTypes.ts
+++ b/src/type/templateTypes.ts
@ -1,11 +0,0 @@
-import { PermissionModule } from "./permissionTypes";
-
-export type TemplateFormat = `${PermissionModule}` | `${PermissionModule}.${string}`;
-
-export const availableTemplates: Array<TemplateFormat> = [
-  "member",
-  "listprint",
-  "listprint.member",
-  "newsletter",
-  "protocol",
-];
--- a/src/viewmodel/admin/club/newsletter/newsletter.models.ts
+++ b/src/viewmodel/admin/club/newsletter/newsletter.models.ts
@ -8,6 +8,6 @@ export interface NewsletterViewModel {
  newsletterText: string;
  newsletterSignatur: string;
  isSent: boolean;
-  recipientsByQueryId?: string;
+  recipientsByQueryId?: number;
  recipientsByQuery?: QueryStoreViewModel;
 }
--- a/src/viewmodel/admin/club/protocol/protocolAgenda.models.ts
+++ b/src/viewmodel/admin/club/protocol/protocolAgenda.models.ts
@ -2,6 +2,5 @@ export interface ProtocolAgendaViewModel {
  id: number;
  topic: string;
  context: string;
-  sort: number;
  protocolId: number;
 }
--- a/src/viewmodel/admin/club/protocol/protocolDecision.models.ts
+++ b/src/viewmodel/admin/club/protocol/protocolDecision.models.ts
@ -2,6 +2,5 @@ export interface ProtocolDecisionViewModel {
  id: number;
  topic: string;
  context: string;
-  sort: number;
  protocolId: number;
 }
--- a/src/viewmodel/admin/club/protocol/protocolVoting.models.ts
+++ b/src/viewmodel/admin/club/protocol/protocolVoting.models.ts
@ -5,6 +5,5 @@ export interface ProtocolVotingViewModel {
  favour: number;
  abstain: number;
  against: number;
-  sort: number;
  protocolId: number;
 }
--- a/src/viewmodel/admin/configuration/queryStore.models.ts
+++ b/src/viewmodel/admin/configuration/queryStore.models.ts
@ -1,8 +1,7 @@
 import { DynamicQueryStructure } from "../../../type/dynamicQueries";

 export interface QueryStoreViewModel {
-  id: string;
+  id: number;
  title: string;
  query: string | DynamicQueryStructure;
-  updatedAt: Date;
 }