src/controller/admin/club/memberController.ts

@@ -90,19 +90,6 @@ export async function getMemberById(req: Request, res: Response): Promise<any> {
   res.json(MemberFactory.mapToSingle(member));
 }
 
-/**
- * @description get member statistics by id
- * @param req {Request} Express req object
- * @param res {Response} Express res object
- * @returns {Promise<*>}
- */
-export async function getMemberStatisticsById(req: Request, res: Response): Promise<any> {
-  const memberId = parseInt(req.params.id);
-  let member = await MemberService.getStatisticsById(memberId);
-
-  res.json(MemberFactory.mapToMemberStatistic(member));
-}
-
 /**
  * @description get memberships by member
  * @param req {Request} Express req object
@@ -116,19 +103,6 @@ export async function getMembershipsByMember(req: Request, res: Response): Promi
   res.json(MembershipFactory.mapToBase(memberships));
 }
 
-/**
- * @description get member statistics by id
- * @param req {Request} Express req object
- * @param res {Response} Express res object
- * @returns {Promise<*>}
- */
-export async function getMembershipStatisticsById(req: Request, res: Response): Promise<any> {
-  const memberId = parseInt(req.params.memberId);
-  let member = await MembershipService.getStatisticsById(memberId);
-
-  res.json(MembershipFactory.mapToBaseStatistics(member));
-}
-
 /**
  * @description get membership by member and record
  * @param req {Request} Express req object

src/factory/admin/club/member/member.ts

@@ -1,6 +1,5 @@
 import { member } from "../../../../entity/club/member/member";
-import { MemberStatisticsViewModel, MemberViewModel } from "../../../../viewmodel/admin/club/member/member.models";
+import { MemberViewModel } from "../../../../viewmodel/admin/club/member/member.models";
-import { memberView } from "../../../../views/memberView";
 import CommunicationFactory from "./communication";
 import MembershipFactory from "./membership";
 
@@ -41,23 +40,4 @@ export default abstract class MemberFactory {
   public static mapToBase(records: Array<member>): Array<MemberViewModel> {
     return records.map((r) => this.mapToSingle(r));
   }
-
-  /**
-   * @description map view record to MemberMembershipStatisticsViewModel
-   * @param {memberView} record
-   * @returns {MemberStatisticsViewModel}
-   */
-  public static mapToMemberStatistic(record: memberView): MemberStatisticsViewModel {
-    return {
-      id: record.id,
-      salutation: record.salutation,
-      firstname: record.firstname,
-      lastname: record.lastname,
-      nameaffix: record.nameaffix,
-      birthdate: record.birthdate,
-      todayAge: record.todayAge,
-      ageThisYear: record.ageThisYear,
-      exactAge: record.exactAge,
-    };
-  }
 }

src/factory/admin/club/member/membership.ts

@@ -1,9 +1,5 @@
 import { membership } from "../../../../entity/club/member/membership";
-import {
+import { MembershipViewModel } from "../../../../viewmodel/admin/club/member/membership.models";
-  MembershipStatisticsViewModel,
-  MembershipViewModel,
-} from "../../../../viewmodel/admin/club/member/membership.models";
-import { membershipView } from "../../../../views/membershipsView";
 
 export default abstract class MembershipFactory {
   /**
@@ -30,33 +26,4 @@ export default abstract class MembershipFactory {
   public static mapToBase(records: Array<membership>): Array<MembershipViewModel> {
     return records.map((r) => this.mapToSingle(r));
   }
-
-  /**
-   * @description map view record to MembershipStatisticsViewModel
-   * @param {membershipView} record
-   * @returns {MembershipStatisticsViewModel}
-   */
-  public static mapToSingleStatistic(record: membershipView): MembershipStatisticsViewModel {
-    return {
-      durationInDays: record.durationInDays,
-      durationInYears: record.durationInYears,
-      status: record.status,
-      statusId: record.statusId,
-      memberId: record.memberId,
-      memberSalutation: record.memberSalutation,
-      memberFirstname: record.memberFirstname,
-      memberLastname: record.memberLastname,
-      memberNameaffix: record.memberNameaffix,
-      memberBirthdate: record.memberBirthdate,
-    };
-  }
-
-  /**
-   * @description map records to MembershipStatisticsViewModel
-   * @param {Array<membershipView>} records
-   * @returns {Array<MembershipStatisticsViewModel>}
-   */
-  public static mapToBaseStatistics(records: Array<membershipView>): Array<MembershipStatisticsViewModel> {
-    return records.map((r) => this.mapToSingleStatistic(r));
-  }
 }

src/routes/admin/club/member.ts

@@ -1,38 +1,36 @@
 import express, { Request, Response } from "express";
 import {
-  addAwardToMember,
+    addAwardToMember,
-  addCommunicationToMember,
+    addCommunicationToMember,
-  addExecutivePositionToMember,
+    addExecutivePositionToMember,
-  addMembershipToMember,
+    addMembershipToMember,
-  addQualificationToMember,
+    addQualificationToMember,
-  createMember,
+    createMember,
-  createMemberPrintoutList,
+    createMemberPrintoutList,
-  deleteAwardOfMember,
+    deleteAwardOfMember,
-  deleteCommunicationOfMember,
+    deleteCommunicationOfMember,
-  deleteExecutivePositionOfMember,
+    deleteExecutivePositionOfMember,
-  deleteMemberById,
+    deleteMemberById,
-  deleteMembershipOfMember,
+    deleteMembershipOfMember,
-  deleteQualificationOfMember,
+    deleteQualificationOfMember,
-  getAllMembers,
+    getAllMembers,
-  getAwardByMemberAndRecord,
+    getAwardByMemberAndRecord,
-  getAwardsByMember,
+    getAwardsByMember,
-  getCommunicationByMemberAndRecord,
+    getCommunicationByMemberAndRecord,
-  getCommunicationsByMember,
+    getCommunicationsByMember,
-  getExecutivePositionByMemberAndRecord,
+    getExecutivePositionByMemberAndRecord,
-  getExecutivePositionsByMember,
+    getExecutivePositionsByMember,
-  getMemberById,
+    getMemberById,
-  getMembershipByMemberAndRecord,
+    getMembershipByMemberAndRecord,
-  getMembershipsByMember,
+    getMembershipsByMember,
-  getMembershipStatisticsById,
+    getQualificationByMemberAndRecord,
-  getMemberStatisticsById,
+    getQualificationsByMember,
-  getQualificationByMemberAndRecord,
+    updateAwardOfMember,
-  getQualificationsByMember,
+    updateCommunicationOfMember,
-  updateAwardOfMember,
+    updateExecutivePositionOfMember,
-  updateCommunicationOfMember,
+    updateMemberById,
-  updateExecutivePositionOfMember,
+    updateMembershipOfMember,
-  updateMemberById,
+    updateQualificationOfMember,
-  updateMembershipOfMember,
-  updateQualificationOfMember,
 } from "../../../controller/admin/club/memberController";
 import PermissionHelper from "../../../helpers/permissionHelper";
 
@@ -46,22 +44,14 @@ router.get("/:id", async (req: Request, res: Response) => {
   await getMemberById(req, res);
 });
 
-router.get("/:id/statistics", async (req: Request, res: Response) => {
-  await getMemberStatisticsById(req, res);
-});
-
 router.get("/print/namelist", async (req: Request, res: Response) => {
-  await createMemberPrintoutList(req, res);
+    await createMemberPrintoutList(req, res);
 });
 
 router.get("/:memberId/memberships", async (req: Request, res: Response) => {
   await getMembershipsByMember(req, res);
 });
 
-router.get("/:memberId/memberships/statistics", async (req: Request, res: Response) => {
-  await getMembershipStatisticsById(req, res);
-});
-
 router.get("/:memberId/membership/:id", async (req: Request, res: Response) => {
   await getMembershipByMemberAndRecord(req, res);
 });

src/service/club/member/memberService.ts

@@ -2,7 +2,6 @@ import { dataSource } from "../../../data-source";
 import { member } from "../../../entity/club/member/member";
 import { membership } from "../../../entity/club/member/membership";
 import InternalException from "../../../exceptions/internalException";
-import { memberView } from "../../../views/memberView";
 
 export default abstract class MemberService {
   /**
@@ -133,25 +132,6 @@ export default abstract class MemberService {
       });
   }
 
-  /**
-   * @description get member statistics by id
-   * @param {number} id
-   * @returns {Promise<memberView>}
-   */
-  static async getStatisticsById(id: number): Promise<memberView> {
-    return await dataSource
-      .getRepository(memberView)
-      .createQueryBuilder("memberView")
-      .where("memberView.id = :id", { id: id })
-      .getOneOrFail()
-      .then((res) => {
-        return res;
-      })
-      .catch((err) => {
-        throw new InternalException("memberView not found by id", err);
-      });
-  }
-
   /**
    * @description get members where membership is setz
    * @returns {Promise<member>}

src/service/club/member/membershipService.ts

@@ -1,7 +1,6 @@
 import { dataSource } from "../../../data-source";
 import { membership } from "../../../entity/club/member/membership";
 import InternalException from "../../../exceptions/internalException";
-import { membershipView } from "../../../views/membershipsView";
 
 export default abstract class MembershipService {
   /**
@@ -46,23 +45,4 @@ export default abstract class MembershipService {
         throw new InternalException("member membership not found by id", err);
       });
   }
-
-  /**
-   * @description get membership statistics by memberId
-   * @param {number} memberId
-   * @returns {Promise<Array<membershipView>>}
-   */
-  static async getStatisticsById(memberId: number): Promise<Array<membershipView>> {
-    return await dataSource
-      .getRepository(membershipView)
-      .createQueryBuilder("membershipView")
-      .where("membershipView.memberId = :memberId", { memberId: memberId })
-      .getMany()
-      .then((res) => {
-        return res;
-      })
-      .catch((err) => {
-        throw new InternalException("membershipView not found by id", err);
-      });
-  }
 }

src/viewmodel/admin/club/member/member.models.ts

@@ -16,15 +16,3 @@ export interface MemberViewModel {
   smsAlarming?: Array<CommunicationViewModel>;
   preferredCommunication?: Array<CommunicationViewModel>;
 }
-
-export interface MemberStatisticsViewModel {
-  id: number;
-  salutation: Salutation;
-  firstname: string;
-  lastname: string;
-  nameaffix: string;
-  birthdate: Date;
-  todayAge: number;
-  ageThisYear: number;
-  exactAge: string;
-}

src/viewmodel/admin/club/member/membership.models.ts

@@ -1,5 +1,3 @@
-import { Salutation } from "../../../../enums/salutation";
-
 export interface MembershipViewModel {
   id: number;
   start: Date;
@@ -8,16 +6,3 @@ export interface MembershipViewModel {
   status: string;
   statusId: number;
 }
-
-export interface MembershipStatisticsViewModel {
-  durationInDays: number;
-  durationInYears: string;
-  status: string;
-  statusId: number;
-  memberId: number;
-  memberSalutation: Salutation;
-  memberFirstname: string;
-  memberLastname: string;
-  memberNameaffix: string;
-  memberBirthdate: Date;
-}

src/views/memberView.ts

@@ -43,5 +43,5 @@ export class memberView {
   ageThisYear: number;
 
   @ViewColumn()
-  exactAge: string;
+  exactAge: Date;
 }

src/views/membershipsView.ts

@@ -30,7 +30,7 @@ export class membershipView {
   durationInDays: number;
 
   @ViewColumn()
-  durationInYears: string;
+  durationInYears: Date;
 
   @ViewColumn()
   status: string;