enhance: provide count of used instances

src/entity/unit/equipment/equipmentType.ts

@@ -19,5 +19,6 @@ export class equipmentType {
   @OneToMany(() => inspectionPlan, (ip) => ip.equipmentType, { cascade: ["insert"] })
   inspectionPlans: inspectionPlan[];
 
-  equipmentCount: number;
+  equipmentCount?: number;
+  equipmentCountUsed?: number;
 }

src/entity/unit/vehicle/vehicleType.ts

@@ -19,5 +19,6 @@ export class vehicleType {
   @OneToMany(() => inspectionPlan, (ip) => ip.vehicleType, { cascade: ["insert"] })
   inspectionPlans: inspectionPlan[];
 
-  vehicleCount: number;
+  vehicleCount?: number;
+  vehicleCountUsed?: number;
 }

src/entity/unit/wearable/wearableType.ts

@@ -19,5 +19,6 @@ export class wearableType {
   @OneToMany(() => inspectionPlan, (ip) => ip.wearableType, { cascade: ["insert"] })
   inspectionPlans: inspectionPlan[];
 
-  wearableCount: number;
+  wearableCount?: number;
+  wearableCountUsed?: number;
 }

src/factory/admin/unit/equipment/equipmentType.ts

@@ -13,6 +13,7 @@ export default abstract class EquipmentTypeFactory {
       type: record.type,
       description: record.description,
       equipmentCount: record.equipmentCount,
+      equipmentCountUsed: record.equipmentCountUsed,
     };
   }
 

src/factory/admin/unit/vehicle/vehicleType.ts

@@ -13,6 +13,7 @@ export default abstract class VehicleTypeFactory {
       type: record.type,
       description: record.description,
       vehicleCount: record.vehicleCount,
+      vehicleCountUsed: record.vehicleCountUsed,
     };
   }
 

src/factory/admin/unit/wearable/wearableType.ts

@@ -13,6 +13,7 @@ export default abstract class WearableTypeFactory {
       type: record.type,
       description: record.description,
       wearableCount: record.wearableCount,
+      wearableCountUsed: record.wearableCountUsed,
     };
   }
 

src/service/unit/equipment/equipmentTypeService.ts

@@ -1,4 +1,4 @@
-import { Like, In } from "typeorm";
+import { Like, IsNull } from "typeorm";
 import { dataSource } from "../../../data-source";
 import { equipmentType } from "../../../entity/unit/equipment/equipmentType";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
@@ -22,7 +22,10 @@ export default abstract class EquipmentTypeService {
     let query = dataSource
       .getRepository(equipmentType)
       .createQueryBuilder("equipmentType")
-      .loadRelationCountAndMap("equipmentType.equipmentCount", "equipmentType.equipment");
+      .loadRelationCountAndMap("equipmentType.equipmentCount", "equipmentType.equipment", "count")
+      .loadRelationCountAndMap("equipmentType.equipmentCountUsed", "equipmentType.equipment", "countUsed", (qb) =>
+        qb.where({ decommissioned: IsNull() })
+      );
 
     if (search != "") {
       query = query.where({

src/service/unit/vehicle/vehicleTypeService.ts

@@ -1,4 +1,4 @@
-import { Like, In } from "typeorm";
+import { Like, In, IsNull } from "typeorm";
 import { dataSource } from "../../../data-source";
 import { vehicleType } from "../../../entity/unit/vehicle/vehicleType";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
@@ -22,7 +22,10 @@ export default abstract class VehicleTypeService {
     let query = dataSource
       .getRepository(vehicleType)
       .createQueryBuilder("vehicleType")
-      .loadRelationCountAndMap("vehicleType.vehicleCount", "vehicleType.vehicle");
+      .loadRelationCountAndMap("vehicleType.vehicleCount", "vehicleType.vehicle", "count")
+      .loadRelationCountAndMap("vehicleType.vehicleCountUsed", "vehicleType.vehicle", "countUsed", (qb) =>
+        qb.where({ decommissioned: IsNull() })
+      );
 
     if (search != "") {
       query = query.where({

src/service/unit/wearable/wearableTypeService.ts

@@ -1,4 +1,4 @@
-import { In, Like } from "typeorm";
+import { In, IsNull, Like } from "typeorm";
 import { dataSource } from "../../../data-source";
 import { wearableType } from "../../../entity/unit/wearable/wearableType";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
@@ -22,7 +22,10 @@ export default abstract class WearableTypeService {
     let query = dataSource
       .getRepository(wearableType)
       .createQueryBuilder("wearableType")
-      .loadRelationCountAndMap("wearableType.wearableCount", "wearableType.wearable");
+      .loadRelationCountAndMap("wearableType.wearableCount", "wearableType.wearable", "count")
+      .loadRelationCountAndMap("wearableType.wearableCountUsed", "wearableType.wearable", "countUsed", (qb) =>
+        qb.where({ decommissioned: IsNull() })
+      );
 
     if (search != "") {
       query = query.where({

src/viewmodel/admin/unit/equipment/equipmentType.models.ts

@@ -2,5 +2,6 @@ export interface EquipmentTypeViewModel {
   id: string;
   type: string;
   description: string;
-  equipmentCount: number;
+  equipmentCount?: number;
+  equipmentCountUsed?: number;
 }

src/viewmodel/admin/unit/vehicle/vehicleType.models.ts

@@ -2,5 +2,6 @@ export interface VehicleTypeViewModel {
   id: string;
   type: string;
   description: string;
-  vehicleCount: number;
+  vehicleCount?: number;
+  vehicleCountUsed?: number;
 }

src/viewmodel/admin/unit/wearable/wearableType.models.ts

@@ -2,5 +2,6 @@ export interface WearableTypeViewModel {
   id: string;
   type: string;
   description: string;
-  wearableCount: number;
+  wearableCount?: number;
+  wearableCountUsed?: number;
 }