From 0d8499b8281bded19eb8a5ab0b90e403815d773c Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Sun, 25 May 2025 07:01:13 +0200 Subject: [PATCH] model clean and consistent naming --- src/entity/unit/damageReport.ts | 22 +++++++++---------- src/entity/unit/equipment/equipment.ts | 14 ++++++------ src/entity/unit/equipment/equipmentType.ts | 8 +++---- src/entity/unit/inspection/inspection.ts | 14 ++++++------ src/entity/unit/inspection/inspectionPlan.ts | 12 +++++----- .../unit/inspection/inspectionPointResult.ts | 1 - .../inspection/inspectionVersionedPlan.ts | 6 +---- src/entity/unit/vehicle/vehicle.ts | 14 ++++++------ src/entity/unit/vehicle/vehicleType.ts | 8 +++---- src/entity/unit/wearable/wearable.ts | 16 +++++++------- src/entity/unit/wearable/wearableType.ts | 8 +++---- 11 files changed, 59 insertions(+), 64 deletions(-) diff --git a/src/entity/unit/damageReport.ts b/src/entity/unit/damageReport.ts index b8feefe..746a25f 100644 --- a/src/entity/unit/damageReport.ts +++ b/src/entity/unit/damageReport.ts @@ -1,15 +1,15 @@ import { Check, Column, CreateDateColumn, Entity, ManyToOne, PrimaryGeneratedColumn } from "typeorm"; -import { Equipment } from "./equipment/equipment"; -import { Wearable } from "./wearable/wearable"; -import { Vehicle } from "./vehicle/vehicle"; +import { equipment } from "./equipment/equipment"; +import { wearable } from "./wearable/wearable"; +import { vehicle } from "./vehicle/vehicle"; @Entity() -export class DamageReport { +export class damageReport { @PrimaryGeneratedColumn("uuid") id: string; @CreateDateColumn() - reported: Date; + reportedAt: Date; @Column({ type: "varchar", length: 255 }) status: string; @@ -29,24 +29,24 @@ export class DamageReport { @Column({ nullable: true }) wearableId: string; - @ManyToOne(() => Equipment, { + @ManyToOne(() => equipment, { nullable: true, onDelete: "CASCADE", onUpdate: "RESTRICT", }) - equipment: Equipment; + equipment: equipment; - @ManyToOne(() => Vehicle, { + @ManyToOne(() => vehicle, { nullable: true, onDelete: "CASCADE", onUpdate: "RESTRICT", }) - vehicle: Vehicle; + vehicle: vehicle; - @ManyToOne(() => Wearable, { + @ManyToOne(() => wearable, { nullable: true, onDelete: "CASCADE", onUpdate: "RESTRICT", }) - wearable: Wearable; + wearable: wearable; } diff --git a/src/entity/unit/equipment/equipment.ts b/src/entity/unit/equipment/equipment.ts index 9748cb1..252c035 100644 --- a/src/entity/unit/equipment/equipment.ts +++ b/src/entity/unit/equipment/equipment.ts @@ -1,10 +1,10 @@ import { Column, ColumnType, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm"; import { getTypeByORM } from "../../../migrations/ormHelper"; -import { EquipmentType } from "./equipmentType"; -import { DamageReport } from "../damageReport"; +import { equipmentType } from "./equipmentType"; +import { damageReport } from "../damageReport"; @Entity() -export class Equipment { +export class equipment { @PrimaryGeneratedColumn("uuid") id: string; @@ -26,13 +26,13 @@ export class Equipment { @Column() equipmentTypeId: string; - @ManyToOne(() => EquipmentType, { + @ManyToOne(() => equipmentType, { nullable: false, onDelete: "RESTRICT", onUpdate: "RESTRICT", }) - equipmentType: EquipmentType; + equipmentType: equipmentType; - @OneToMany(() => DamageReport, (d) => d.equipment, { cascade: ["insert"] }) - reports: DamageReport[]; + @OneToMany(() => damageReport, (d) => d.equipment, { cascade: ["insert"] }) + reports: damageReport[]; } diff --git a/src/entity/unit/equipment/equipmentType.ts b/src/entity/unit/equipment/equipmentType.ts index 1bd25bd..9aa6366 100644 --- a/src/entity/unit/equipment/equipmentType.ts +++ b/src/entity/unit/equipment/equipmentType.ts @@ -1,8 +1,8 @@ import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm"; -import { Equipment } from "./equipment"; +import { equipment } from "./equipment"; @Entity() -export class EquipmentType { +export class equipmentType { @PrimaryGeneratedColumn("uuid") id: string; @@ -12,8 +12,8 @@ export class EquipmentType { @Column({ type: "text", nullable: true }) description: string; - @OneToMany(() => Equipment, (e) => e.equipmentType, { cascade: ["insert"] }) - equipment: Equipment[]; + @OneToMany(() => equipment, (e) => e.equipmentType, { cascade: ["insert"] }) + equipment: equipment[]; inspectionPlans: Array; } diff --git a/src/entity/unit/inspection/inspection.ts b/src/entity/unit/inspection/inspection.ts index 1537492..825caee 100644 --- a/src/entity/unit/inspection/inspection.ts +++ b/src/entity/unit/inspection/inspection.ts @@ -2,8 +2,8 @@ import { Column, ColumnType, CreateDateColumn, Entity, ManyToOne, PrimaryGenerat import { inspectionPlan } from "./inspectionPlan"; import { inspectionVersionedPlan } from "./inspectionVersionedPlan"; import { getTypeByORM } from "../../../migrations/ormHelper"; -import { Vehicle } from "../vehicle/vehicle"; -import { Equipment } from "../equipment/equipment"; +import { vehicle } from "../vehicle/vehicle"; +import { equipment } from "../equipment/equipment"; @Entity() export class inspection { @@ -17,7 +17,7 @@ export class inspection { createdAt: Date; @Column({ type: getTypeByORM("date").type as ColumnType, nullable: true }) - finished?: Date; + finishedAt?: Date; @Column({ type: getTypeByORM("date").type as ColumnType, nullable: true }) nextInspection?: Date; @@ -28,9 +28,9 @@ export class inspection { @ManyToOne(() => inspectionVersionedPlan) inspectionVersionedPlan: inspectionVersionedPlan; - @ManyToOne(() => Equipment) - equipment: Equipment; + @ManyToOne(() => equipment) + equipment: equipment; - @ManyToOne(() => Vehicle) - vehicle: Vehicle; + @ManyToOne(() => vehicle) + vehicle: vehicle; } diff --git a/src/entity/unit/inspection/inspectionPlan.ts b/src/entity/unit/inspection/inspectionPlan.ts index 491a1a3..b2c4358 100644 --- a/src/entity/unit/inspection/inspectionPlan.ts +++ b/src/entity/unit/inspection/inspectionPlan.ts @@ -1,6 +1,6 @@ import { Column, CreateDateColumn, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm"; -import { Equipment } from "../equipment/equipment"; -import { Vehicle } from "../vehicle/vehicle"; +import { equipment } from "../equipment/equipment"; +import { vehicle } from "../vehicle/vehicle"; import { PlanTimeDefinition } from "../../../viewmodel/admin/unit/inspectionPlan/inspectionPlan.models"; import { inspectionVersionedPlan } from "./inspectionVersionedPlan"; @@ -27,11 +27,11 @@ export class inspectionPlan { @Column() vehicleId: string; - @ManyToOne(() => Equipment) - equipment: Equipment; + @ManyToOne(() => equipment) + equipment: equipment; - @ManyToOne(() => Vehicle) - vehicle: Vehicle; + @ManyToOne(() => vehicle) + vehicle: vehicle; @OneToMany(() => inspectionVersionedPlan, (ivp) => ivp.inspectionPlan, { cascade: ["insert"], diff --git a/src/entity/unit/inspection/inspectionPointResult.ts b/src/entity/unit/inspection/inspectionPointResult.ts index 2460516..018649b 100644 --- a/src/entity/unit/inspection/inspectionPointResult.ts +++ b/src/entity/unit/inspection/inspectionPointResult.ts @@ -1,7 +1,6 @@ import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from "typeorm"; import { inspection } from "./inspection"; import { inspectionPoint } from "./inspectionPoint"; -import { inspectionVersionedPlan } from "./inspectionVersionedPlan"; @Entity() export class inspectionPointResult { diff --git a/src/entity/unit/inspection/inspectionVersionedPlan.ts b/src/entity/unit/inspection/inspectionVersionedPlan.ts index 2e8195f..59d8d4a 100644 --- a/src/entity/unit/inspection/inspectionVersionedPlan.ts +++ b/src/entity/unit/inspection/inspectionVersionedPlan.ts @@ -1,9 +1,5 @@ import { Column, CreateDateColumn, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn, Unique } from "typeorm"; -import { Equipment } from "../equipment/equipment"; -import { Vehicle } from "../vehicle/vehicle"; -import { PlanTimeDefinition } from "../../../viewmodel/admin/unit/inspectionPlan/inspectionPlan.models"; import { inspectionPlan } from "./inspectionPlan"; -import { getTypeByORM } from "../../../migrations/ormHelper"; import { inspectionPoint } from "./inspectionPoint"; @Entity() @@ -16,7 +12,7 @@ export class inspectionVersionedPlan { version: number; @CreateDateColumn() - created: Date; + createdAt: Date; @Column() inspectionPlanId: string; diff --git a/src/entity/unit/vehicle/vehicle.ts b/src/entity/unit/vehicle/vehicle.ts index cff687e..a2cd129 100644 --- a/src/entity/unit/vehicle/vehicle.ts +++ b/src/entity/unit/vehicle/vehicle.ts @@ -1,10 +1,10 @@ import { Column, ColumnType, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm"; import { getTypeByORM } from "../../../migrations/ormHelper"; -import { VehicleType } from "./vehicleType"; -import { DamageReport } from "../damageReport"; +import { vehicleType } from "./vehicleType"; +import { damageReport } from "../damageReport"; @Entity() -export class Vehicle { +export class vehicle { @PrimaryGeneratedColumn("uuid") id: string; @@ -26,13 +26,13 @@ export class Vehicle { @Column() vehicleTypeId: string; - @ManyToOne(() => VehicleType, { + @ManyToOne(() => vehicleType, { nullable: false, onDelete: "RESTRICT", onUpdate: "RESTRICT", }) - vehicleType: VehicleType; + vehicleType: vehicleType; - @OneToMany(() => DamageReport, (d) => d.vehicle, { cascade: ["insert"] }) - reports: DamageReport[]; + @OneToMany(() => damageReport, (d) => d.vehicle, { cascade: ["insert"] }) + reports: damageReport[]; } diff --git a/src/entity/unit/vehicle/vehicleType.ts b/src/entity/unit/vehicle/vehicleType.ts index 7f43510..fba4177 100644 --- a/src/entity/unit/vehicle/vehicleType.ts +++ b/src/entity/unit/vehicle/vehicleType.ts @@ -1,8 +1,8 @@ import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm"; -import { Vehicle } from "./vehicle"; +import { vehicle } from "./vehicle"; @Entity() -export class VehicleType { +export class vehicleType { @PrimaryGeneratedColumn("uuid") id: string; @@ -12,8 +12,8 @@ export class VehicleType { @Column({ type: "text", nullable: true }) description: string; - @OneToMany(() => Vehicle, (e) => e.vehicleType, { cascade: ["insert"] }) - equipment: Vehicle[]; + @OneToMany(() => vehicle, (e) => e.vehicleType, { cascade: ["insert"] }) + vehicle: vehicle[]; inspectionPlans: Array; } diff --git a/src/entity/unit/wearable/wearable.ts b/src/entity/unit/wearable/wearable.ts index 439025b..509732d 100644 --- a/src/entity/unit/wearable/wearable.ts +++ b/src/entity/unit/wearable/wearable.ts @@ -1,11 +1,11 @@ import { Column, ColumnType, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm"; import { getTypeByORM } from "../../../migrations/ormHelper"; -import { WearableType } from "./wearableType"; -import { DamageReport } from "../damageReport"; +import { wearableType } from "./wearableType"; +import { damageReport } from "../damageReport"; import { member } from "../../club/member/member"; @Entity() -export class Wearable { +export class wearable { @PrimaryGeneratedColumn("uuid") id: string; @@ -25,17 +25,17 @@ export class Wearable { decommissioned?: Date; @Column() - equipmentTypeId: string; + wearableTypeId: string; @Column() wearerId: string; - @ManyToOne(() => WearableType, { + @ManyToOne(() => wearableType, { nullable: false, onDelete: "RESTRICT", onUpdate: "RESTRICT", }) - wearableType: WearableType; + wearableType: wearableType; @ManyToOne(() => member, { nullable: false, @@ -44,6 +44,6 @@ export class Wearable { }) wearer: member; - @OneToMany(() => DamageReport, (d) => d.wearable, { cascade: ["insert"] }) - reports: DamageReport[]; + @OneToMany(() => damageReport, (d) => d.wearable, { cascade: ["insert"] }) + reports: damageReport[]; } diff --git a/src/entity/unit/wearable/wearableType.ts b/src/entity/unit/wearable/wearableType.ts index f900b84..71e553e 100644 --- a/src/entity/unit/wearable/wearableType.ts +++ b/src/entity/unit/wearable/wearableType.ts @@ -1,8 +1,8 @@ import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm"; -import { Wearable } from "./wearable"; +import { wearable as wearable } from "./wearable"; @Entity() -export class WearableType { +export class wearableType { @PrimaryGeneratedColumn("uuid") id: string; @@ -12,6 +12,6 @@ export class WearableType { @Column({ type: "text", nullable: true }) description: string; - @OneToMany(() => Wearable, (e) => e.wearableType, { cascade: ["insert"] }) - equipment: Wearable[]; + @OneToMany(() => wearable, (e) => e.wearableType, { cascade: ["insert"] }) + wearable: wearable[]; }