src/controller/admin/club/memberController.ts

@@ -227,14 +227,14 @@ export async function getCommunicationByMemberAndRecord(req: Request, res: Respo
  * @returns {Promise<*>}
  */
 export async function createMemberPrintoutList(req: Request, res: Response): Promise<any> {
-  let members = await MemberService.getByRunningMembership();
+  let members = await MemberService.getByRunningMembership()
 
   let pdf = await PdfExport.renderFile({
     title: "Mitgliederliste",
     template: "member.list",
     saveToDisk: false,
     data: {
-      member: members,
+      member: members
     },
   });
 
@@ -596,7 +596,7 @@ export async function updateCommunicationOfMember(req: Request, res: Response):
       communicationId: recordId,
     };
     await MemberCommandHandler.updateNewsletter(updateNewsletter);
-  } else if (currentUserNewsletterMain.sendNewsletter?.id == recordId) {
+  } else if (currentUserNewsletterMain.sendNewsletter.id == recordId) {
     await MemberCommandHandler.unsetNewsletter(memberId);
   }
 

src/data-source.ts

@@ -66,7 +66,6 @@ import { PostalCode1735927918979 } from "./migrations/1735927918979-postalCode";
 import { ProtocolAbsent1736072179716 } from "./migrations/1736072179716-protocolAbsent";
 import { Memberlist1736079005086 } from "./migrations/1736079005086-memberlist";
 import { ExtendViewValues1736084198860 } from "./migrations/1736084198860-extendViewValues";
-import { FinishInternalIdTransfer1736505324488 } from "./migrations/1736505324488-finishInternalIdTransfer";
 
 const dataSource = new DataSource({
   type: DB_TYPE as any,
@@ -143,7 +142,6 @@ const dataSource = new DataSource({
     ProtocolAbsent1736072179716,
     Memberlist1736079005086,
     ExtendViewValues1736084198860,
-    FinishInternalIdTransfer1736505324488,
   ],
   migrationsRun: true,
   migrationsTransactionMode: "each",

src/entity/club/member/membership.ts

@@ -7,6 +7,12 @@ export class membership {
   @PrimaryColumn({ generated: "increment", type: "int" })
   id: number;
 
+  /**
+   * @deprecated
+   */
+  @Column({ type: "varchar", length: 255, unique: true, nullable: true })
+  internalId?: string;
+
   @Column({ type: "date" })
   start: Date;
 

src/middleware/errorHandler.ts

@@ -1,7 +1,6 @@
 import { Request, Response } from "express";
 import { ExceptionBase } from "../exceptions/exceptionsBaseType";
 import CustomRequestException from "../exceptions/customRequestException";
-import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException";
 
 export default function errorHandler(err: ExceptionBase | Error, req: Request, res: Response, next: Function) {
   let status = 500;
@@ -12,11 +11,7 @@ export default function errorHandler(err: ExceptionBase | Error, req: Request, r
     msg = err.message;
   }
 
-  if (err instanceof CustomRequestException) {
-    console.log("Custom Handler", status, msg);
-  } else {
-    console.log("Error Handler", err);
-  }
+  console.log("Handler", err);
 
   res.status(status).send(msg);
 }

src/migrations/1735822722235-internalId.ts

@@ -18,27 +18,27 @@ export class InternalId1735822722235 implements MigrationInterface {
       })
     );
 
-    // let memberships = await queryRunner.manager.getRepository(membership).find();
-    // console.log(memberships);
-    // let internalIds = memberships.reduce<{ [key: number]: Array<string> }>((acc, cur) => {
-    //   let memberId = cur.memberId;
-    //   let setIds = acc[memberId] ?? [];
-    //   if (cur?.internalId) {
-    //     setIds.push(cur.internalId);
-    //   }
-    //   acc[memberId] = setIds;
-    //   return acc;
-    // }, {});
+    let memberships = await queryRunner.manager.getRepository(membership).find();
+    console.log(memberships);
+    let internalIds = memberships.reduce<{ [key: number]: Array<string> }>((acc, cur) => {
+      let memberId = cur.memberId;
+      let setIds = acc[memberId] ?? [];
+      if (cur?.internalId) {
+        setIds.push(cur.internalId);
+      }
+      acc[memberId] = setIds;
+      return acc;
+    }, {});
 
-    // console.log(internalIds);
-    // for (const [id, value] of Object.entries(internalIds)) {
-    //   const ids = value.filter((v) => v != null).join(", ");
-    //   if (ids) {
-    //     let m = await queryRunner.manager.getRepository(member).findOneByOrFail({ id: parseInt(id) });
-    //     m.internalId = ids;
-    //     await queryRunner.manager.getRepository(member).save(m);
-    //   }
-    // }
+    console.log(internalIds);
+    for (const [id, value] of Object.entries(internalIds)) {
+      const ids = value.filter((v) => v != null).join(", ");
+      if (ids) {
+        let m = await queryRunner.manager.getRepository(member).findOneByOrFail({ id: parseInt(id) });
+        m.internalId = ids;
+        await queryRunner.manager.getRepository(member).save(m);
+      }
+    }
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {

src/migrations/1736505324488-finishInternalIdTransfer.ts

@@ -1,23 +0,0 @@
-import { MigrationInterface, QueryRunner, TableColumn } from "typeorm";
-
-export class FinishInternalIdTransfer1736505324488 implements MigrationInterface {
-  name = "FinishInternalIdTransfer1736505324488";
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.dropColumn("membership", "internalId");
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.addColumn(
-      "membership",
-      new TableColumn({
-        name: "internalId",
-        type: "varchar",
-        length: "255",
-        default: null,
-        isNullable: true,
-        isUnique: true,
-      })
-    );
-  }
-}

src/service/club/member/memberService.ts

@@ -124,9 +124,6 @@ export default abstract class MemberService {
         .createQueryBuilder("member")
         .leftJoinAndSelect("member.memberships", "membership")
         .where("membership.end IS NULL")
-      .orderBy("member.lastname")
-      .addOrderBy("member.firstname")
-      .addOrderBy("member.nameaffix")
         .getMany()
         .then((res) => {
           return res;