src/command/communicationCommand.ts

@@ -3,7 +3,6 @@ export interface CreateCommunicationCommand {
   isSMSAlarming: boolean;
   mobile: string;
   email: string;
-  postalCode: string;
   city: string;
   street: string;
   streetNumber: number;
@@ -18,7 +17,6 @@ export interface UpdateCommunicationCommand {
   isSMSAlarming: boolean;
   mobile: string;
   email: string;
-  postalCode: string;
   city: string;
   street: string;
   streetNumber: number;

src/command/communicationCommandHandler.ts

@@ -25,13 +25,20 @@ export default abstract class CommunicationCommandHandler {
         isSMSAlarming: createCommunication.isSMSAlarming,
         mobile: createCommunication.mobile,
         email: createCommunication.email,
-        postalCode: createCommunication.postalCode,
         city: createCommunication.city,
         street: createCommunication.street,
         streetNumber: createCommunication.streetNumber,
         streetNumberAddition: createCommunication.streetNumberAddition,
-        memberId: createCommunication.memberId,
+        member: await dataSource
-        typeId: createCommunication.typeId,
+          .getRepository(user)
+          .createQueryBuilder("user")
+          .where("id = :id", { id: createCommunication.memberId })
+          .getOneOrFail(),
+        type: await dataSource
+          .getRepository(communicationType)
+          .createQueryBuilder("communication")
+          .where("id = :id", { id: createCommunication.typeId })
+          .getOneOrFail(),
       })
       .execute()
       .then((result) => {
@@ -56,7 +63,6 @@ export default abstract class CommunicationCommandHandler {
         isSMSAlarming: updateCommunication.isSMSAlarming,
         mobile: updateCommunication.mobile,
         email: updateCommunication.email,
-        postalCode: updateCommunication.postalCode,
         city: updateCommunication.city,
         street: updateCommunication.street,
         streetNumber: updateCommunication.streetNumber,
@@ -76,13 +82,13 @@ export default abstract class CommunicationCommandHandler {
    * @param DeleteCommunicationCommand
    * @returns {Promise<void>}
    */
-  static async delete(deleteCommunication: DeleteCommunicationCommand): Promise<void> {
+  static async delete(deletCommunication: DeleteCommunicationCommand): Promise<void> {
     return await dataSource
       .createQueryBuilder()
       .delete()
       .from(communication)
-      .where("id = :id", { id: deleteCommunication.id })
+      .where("id = :id", { id: deletCommunication.id })
-      .andWhere("memberId = :memberId", { memberId: deleteCommunication.memberId })
+      .andWhere("memberId = :memberId", { memberId: deletCommunication.memberId })
       .execute()
       .then(() => {})
       .catch((err) => {

src/command/memberAwardCommandHandler.ts

@@ -20,8 +20,16 @@ export default abstract class MemberAwardCommandHandler {
         given: createMemberAward.given,
         note: createMemberAward.note,
         date: createMemberAward.date,
-        memberId: createMemberAward.memberId,
+        member: await dataSource
-        awardId: createMemberAward.awardId,
+          .getRepository(member)
+          .createQueryBuilder("member")
+          .where("id = :id", { id: createMemberAward.memberId })
+          .getOneOrFail(),
+        award: await dataSource
+          .getRepository(award)
+          .createQueryBuilder("award")
+          .where("id = :id", { id: createMemberAward.awardId })
+          .getOneOrFail(),
       })
       .execute()
       .then((result) => {
@@ -45,7 +53,11 @@ export default abstract class MemberAwardCommandHandler {
         given: updateMemberAward.given,
         note: updateMemberAward.note,
         date: updateMemberAward.date,
-        award: updateMemberAward.awardId,
+        award: await dataSource
+          .getRepository(award)
+          .createQueryBuilder("award")
+          .where("id = :id", { id: updateMemberAward.awardId })
+          .getOneOrFail(),
       })
       .where("id = :id", { id: updateMemberAward.id })
       .andWhere("memberId = :memberId", { memberId: updateMemberAward.memberId })

src/command/memberExecutivePositionCommandHandler.ts

@@ -24,8 +24,16 @@ export default abstract class MemberExecutivePositionCommandHandler {
         note: createMemberExecutivePosition.note,
         start: createMemberExecutivePosition.start,
         end: createMemberExecutivePosition.end,
-        memberId: createMemberExecutivePosition.memberId,
+        member: await dataSource
-        executivePositionId: createMemberExecutivePosition.executivePositionId,
+          .getRepository(member)
+          .createQueryBuilder("member")
+          .where("id = :id", { id: createMemberExecutivePosition.memberId })
+          .getOneOrFail(),
+        executivePosition: await dataSource
+          .getRepository(executivePosition)
+          .createQueryBuilder("executivePosition")
+          .where("id = :id", { id: createMemberExecutivePosition.executivePositionId })
+          .getOneOrFail(),
       })
       .execute()
       .then((result) => {
@@ -49,7 +57,11 @@ export default abstract class MemberExecutivePositionCommandHandler {
         note: updateMemberExecutivePosition.note,
         start: updateMemberExecutivePosition.start,
         end: updateMemberExecutivePosition.end,
-        executivePositionId: updateMemberExecutivePosition.executivePositionId,
+        executivePosition: await dataSource
+          .getRepository(executivePosition)
+          .createQueryBuilder("executivePosition")
+          .where("id = :id", { id: updateMemberExecutivePosition.executivePositionId })
+          .getOneOrFail(),
       })
       .where("id = :id", { id: updateMemberExecutivePosition.id })
       .andWhere("memberId = :memberId", { memberId: updateMemberExecutivePosition.memberId })

src/command/memberQualificationCommandHandler.ts

@@ -23,8 +23,16 @@ export default abstract class MemberQualificationCommandHandler {
       .values({
         note: createMemberQualification.note,
         start: createMemberQualification.start,
-        memberId: createMemberQualification.memberId,
+        member: await dataSource
-        qualificationId: createMemberQualification.qualificationId,
+          .getRepository(member)
+          .createQueryBuilder("member")
+          .where("id = :id", { id: createMemberQualification.memberId })
+          .getOneOrFail(),
+        qualification: await dataSource
+          .getRepository(qualification)
+          .createQueryBuilder("qualification")
+          .where("id = :id", { id: createMemberQualification.qualificationId })
+          .getOneOrFail(),
       })
       .execute()
       .then((result) => {
@@ -49,7 +57,11 @@ export default abstract class MemberQualificationCommandHandler {
         start: updateMemberQualification.start,
         end: updateMemberQualification.end,
         terminationReason: updateMemberQualification.terminationReason,
-        qualificationId: updateMemberQualification.qualificationId,
+        qualification: await dataSource
+          .getRepository(qualification)
+          .createQueryBuilder("qualification")
+          .where("id = :id", { id: updateMemberQualification.qualificationId })
+          .getOneOrFail(),
       })
       .where("id = :id", { id: updateMemberQualification.id })
       .andWhere("memberId = :memberId", { memberId: updateMemberQualification.memberId })

src/command/membershipCommandHandler.ts

@@ -21,8 +21,16 @@ export default abstract class MembershipCommandHandler {
           .into(membership)
           .values({
             start: createMembership.start,
-            memberId: createMembership.memberId,
+            member: await dataSource
-            statusId: createMembership.statusId,
+              .getRepository(member)
+              .createQueryBuilder("member")
+              .where("id = :id", { id: createMembership.memberId })
+              .getOneOrFail(),
+            status: await dataSource
+              .getRepository(membershipStatus)
+              .createQueryBuilder("membershipStatus")
+              .where("id = :id", { id: createMembership.statusId })
+              .getOneOrFail(),
           })
           .execute()
           .then((result) => {
@@ -62,7 +70,11 @@ export default abstract class MembershipCommandHandler {
         start: updateMembership.start,
         end: updateMembership.end,
         terminationReason: updateMembership.terminationReason,
-        statusId: updateMembership.statusId,
+        status: await dataSource
+          .getRepository(membershipStatus)
+          .createQueryBuilder("membershipStatus")
+          .where("id = :id", { id: updateMembership.statusId })
+          .getOneOrFail(),
       })
       .where("id = :id", { id: updateMembership.id })
       .andWhere("memberId = :memberId", { memberId: updateMembership.memberId })

src/controller/admin/memberController.ts

@@ -351,7 +351,6 @@ export async function addCommunicationToMember(req: Request, res: Response): Pro
   const isSMSAlarming = req.body.isSMSAlarming;
   const mobile = req.body.mobile;
   const email = req.body.email;
-  const postalCode = req.body.postalCode;
   const city = req.body.city;
   const street = req.body.street;
   const streetNumber = req.body.streetNumber;
@@ -364,7 +363,6 @@ export async function addCommunicationToMember(req: Request, res: Response): Pro
     isSMSAlarming,
     mobile,
     email,
-    postalCode,
     city,
     street,
     streetNumber,
@@ -537,11 +535,11 @@ export async function updateCommunicationOfMember(req: Request, res: Response):
   const isSMSAlarming = req.body.isSMSAlarming;
   const mobile = req.body.mobile;
   const email = req.body.email;
-  const postalCode = req.body.postalCode;
   const city = req.body.city;
   const street = req.body.street;
   const streetNumber = req.body.streetNumber;
   const streetNumberAddition = req.body.streetNumberAddition;
+  const typeId = req.body.typeId;
   const isNewsletterMain = req.body.isNewsletterMain;
 
   let updateCommunication: UpdateCommunicationCommand = {
@@ -550,7 +548,6 @@ export async function updateCommunicationOfMember(req: Request, res: Response):
     isSMSAlarming,
     mobile,
     email,
-    postalCode,
     city,
     street,
     streetNumber,

src/data-source.ts

@@ -63,7 +63,6 @@ import { newsletterConfig } from "./entity/newsletterConfig";
 import { NewsletterConfig1735207446910 } from "./migrations/1735207446910-newsletterConfig";
 import { TemplateMargins1735733514043 } from "./migrations/1735733514043-templateMargins";
 import { InternalId1735822722235 } from "./migrations/1735822722235-internalId";
-import { PostalCode1735927918979 } from "./migrations/1735927918979-postalCode";
 
 const dataSource = new DataSource({
   type: DB_TYPE as any,
@@ -137,7 +136,6 @@ const dataSource = new DataSource({
     NewsletterConfig1735207446910,
     TemplateMargins1735733514043,
     InternalId1735822722235,
-    PostalCode1735927918979,
   ],
   migrationsRun: true,
   migrationsTransactionMode: "each",

src/entity/communication.ts

@@ -1,4 +1,4 @@
-import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
+import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
 import { communicationType } from "./communicationType";
 
@@ -19,9 +19,6 @@ export class communication {
   @Column({ type: "varchar", length: 255, nullable: true })
   email: string;
 
-  @Column({ type: "varchar", length: 255, nullable: true })
-  postalCode: string;
-
   @Column({ type: "varchar", length: 255, nullable: true })
   city: string;
 
@@ -34,12 +31,6 @@ export class communication {
   @Column({ type: "varchar", length: 255, nullable: true })
   streetNumberAddition: string;
 
-  @Column()
-  memberId: number;
-
-  @Column()
-  typeId: number;
-
   @ManyToOne(() => communicationType, (communicationType) => communicationType.communications, {
     nullable: false,
     onDelete: "RESTRICT",

src/factory/admin/communication.ts

@@ -14,7 +14,6 @@ export default abstract class CommunicationFactory {
       preferred: record.preferred,
       mobile: record.mobile,
       email: record.email,
-      postalCode: record.postalCode,
       city: record.city,
       street: record.street,
       streetNumber: record.streetNumber,

src/migrations/1735927918979-postalCode.ts

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

src/type/fieldTypes.ts

@@ -1,16 +1,8 @@
-export type CommunicationFieldType =
+export type CommunicationFieldType = "mobile" | "email" | "city" | "street" | "streetNumber" | "streetNumberAddition";
-  | "mobile"
-  | "email"
-  | "postalCode"
-  | "city"
-  | "street"
-  | "streetNumber"
-  | "streetNumberAddition";
 
 export const communicationFieldTypes: Array<CommunicationFieldType> = [
   "mobile",
   "email",
-  "postalCode",
   "city",
   "street",
   "streetNumber",

src/viewmodel/admin/communication.models.ts

@@ -5,7 +5,6 @@ export interface CommunicationViewModel {
   preferred: boolean;
   mobile: string;
   email: string;
-  postalCode: string;
   city: string;
   street: string;
   streetNumber: number;