From 8c81c8f336f22e7f97f9624fab14c38ba437230e Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Wed, 28 May 2025 17:06:45 +0200 Subject: [PATCH] db schema connects --- src/entity/unit/equipment/equipment.ts | 4 ++++ src/entity/unit/equipment/equipmentType.ts | 4 +++- src/entity/unit/inspection/inspection.ts | 12 ++++++++++++ src/entity/unit/inspection/inspectionPointResult.ts | 6 ++++++ src/entity/unit/vehicle/vehicle.ts | 4 ++++ src/entity/unit/vehicle/vehicleType.ts | 4 +++- src/entity/unit/wearable/wearable.ts | 1 + 7 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/entity/unit/equipment/equipment.ts b/src/entity/unit/equipment/equipment.ts index 22df384..d55ea0d 100644 --- a/src/entity/unit/equipment/equipment.ts +++ b/src/entity/unit/equipment/equipment.ts @@ -2,6 +2,7 @@ import { Column, ColumnType, Entity, ManyToOne, OneToMany, PrimaryGeneratedColum import { getTypeByORM } from "../../../migrations/ormHelper"; import { equipmentType } from "./equipmentType"; import { damageReport } from "../damageReport"; +import { inspection } from "../inspection/inspection"; @Entity() export class equipment { @@ -35,4 +36,7 @@ export class equipment { @OneToMany(() => damageReport, (d) => d.equipment, { cascade: ["insert"] }) reports: damageReport[]; + + @OneToMany(() => inspection, (i) => i.equipment) + inspections: inspection[]; } diff --git a/src/entity/unit/equipment/equipmentType.ts b/src/entity/unit/equipment/equipmentType.ts index d28fb72..3888ebe 100644 --- a/src/entity/unit/equipment/equipmentType.ts +++ b/src/entity/unit/equipment/equipmentType.ts @@ -1,5 +1,6 @@ import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm"; import { equipment } from "./equipment"; +import { inspectionPlan } from "../inspection/inspectionPlan"; @Entity() export class equipmentType { @@ -15,5 +16,6 @@ export class equipmentType { @OneToMany(() => equipment, (e) => e.equipmentType, { cascade: ["insert"] }) equipment: equipment[]; - inspectionPlans: Array; + @OneToMany(() => inspectionPlan, (ip) => ip.equipment) + inspectionPlans: inspectionPlan[]; } diff --git a/src/entity/unit/inspection/inspection.ts b/src/entity/unit/inspection/inspection.ts index 23460f6..27b85c1 100644 --- a/src/entity/unit/inspection/inspection.ts +++ b/src/entity/unit/inspection/inspection.ts @@ -22,6 +22,18 @@ export class inspection { @Column({ type: getTypeByORM("date").type as ColumnType, nullable: true, default: null }) nextInspection?: Date; + @Column() + inspectionPlanId: string; + + @Column() + inspectionVersionedPlanId: string; + + @Column() + equipmentId: string; + + @Column() + vehicleId: string; + @ManyToOne(() => inspectionPlan, { nullable: false, onDelete: "RESTRICT", diff --git a/src/entity/unit/inspection/inspectionPointResult.ts b/src/entity/unit/inspection/inspectionPointResult.ts index 4b44146..5b3501d 100644 --- a/src/entity/unit/inspection/inspectionPointResult.ts +++ b/src/entity/unit/inspection/inspectionPointResult.ts @@ -10,6 +10,12 @@ export class inspectionPointResult { @Column({ type: "text" }) value: string; + @Column() + inspectionId: string; + + @Column() + inspectionPointId: string; + @ManyToOne(() => inspection, { nullable: false, onDelete: "CASCADE", diff --git a/src/entity/unit/vehicle/vehicle.ts b/src/entity/unit/vehicle/vehicle.ts index 0c30847..dc4a8d6 100644 --- a/src/entity/unit/vehicle/vehicle.ts +++ b/src/entity/unit/vehicle/vehicle.ts @@ -2,6 +2,7 @@ import { Column, ColumnType, Entity, ManyToOne, OneToMany, PrimaryGeneratedColum import { getTypeByORM } from "../../../migrations/ormHelper"; import { vehicleType } from "./vehicleType"; import { damageReport } from "../damageReport"; +import { inspection } from "../inspection/inspection"; @Entity() export class vehicle { @@ -35,4 +36,7 @@ export class vehicle { @OneToMany(() => damageReport, (d) => d.vehicle, { cascade: ["insert"] }) reports: damageReport[]; + + @OneToMany(() => inspection, (i) => i.vehicle) + inspections: inspection[]; } diff --git a/src/entity/unit/vehicle/vehicleType.ts b/src/entity/unit/vehicle/vehicleType.ts index 5773709..d58b478 100644 --- a/src/entity/unit/vehicle/vehicleType.ts +++ b/src/entity/unit/vehicle/vehicleType.ts @@ -1,5 +1,6 @@ import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm"; import { vehicle } from "./vehicle"; +import { inspectionPlan } from "../inspection/inspectionPlan"; @Entity() export class vehicleType { @@ -15,5 +16,6 @@ export class vehicleType { @OneToMany(() => vehicle, (e) => e.vehicleType, { cascade: ["insert"] }) vehicle: vehicle[]; - inspectionPlans: Array; + @OneToMany(() => inspectionPlan, (ip) => ip.vehicle) + inspectionPlans: inspectionPlan[]; } diff --git a/src/entity/unit/wearable/wearable.ts b/src/entity/unit/wearable/wearable.ts index 75a64b7..f532cb0 100644 --- a/src/entity/unit/wearable/wearable.ts +++ b/src/entity/unit/wearable/wearable.ts @@ -3,6 +3,7 @@ import { getTypeByORM } from "../../../migrations/ormHelper"; import { wearableType } from "./wearableType"; import { damageReport } from "../damageReport"; import { member } from "../../club/member/member"; +import { inspection } from "../inspection/inspection"; @Entity() export class wearable {