src/command/club/member/membershipCommandHandler.ts

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

src/command/settings/award/awardCommandHandler.ts

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

src/command/settings/calendarType/calendarTypeCommandHandler.ts

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

src/command/settings/communicationType/communicationTypeCommandHandler.ts

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

src/command/settings/executivePosition/executivePositionCommandHandler.ts

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

src/command/settings/membershipStatus/membershipStatusCommandHandler.ts

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

src/command/settings/newsletterConfig/newsletterConfigCommand.ts

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

src/command/settings/newsletterConfig/newsletterConfigCommandHandler.ts

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

src/command/settings/qualification/qualificationCommandHandler.ts

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

src/command/settings/queryStore/queryStoreCommandHandler.ts

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

src/command/settings/template/templateCommandHandler.ts

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

src/controller/admin/settings/newsletterConfigController.ts

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

src/entity/club/member/communication.ts

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

src/entity/club/protocol/protocolPrintout.ts

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

src/routes/admin/settings/newsletterConfig.ts

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