diff --git a/src/entity/unit/inspection/inspection.ts b/src/entity/unit/inspection/inspection.ts index 00faf98..1bcbde4 100644 --- a/src/entity/unit/inspection/inspection.ts +++ b/src/entity/unit/inspection/inspection.ts @@ -29,10 +29,10 @@ export class inspection { @Column() inspectionVersionedPlanId: string; - @Column() + @Column({ nullable: true, default: null }) equipmentId?: string; - @Column() + @Column({ nullable: true, default: null }) vehicleId?: string; @ManyToOne(() => inspectionPlan, { diff --git a/src/entity/unit/inspection/inspectionPlan.ts b/src/entity/unit/inspection/inspectionPlan.ts index b2a43eb..1e9b2e3 100644 --- a/src/entity/unit/inspection/inspectionPlan.ts +++ b/src/entity/unit/inspection/inspectionPlan.ts @@ -21,10 +21,10 @@ export class inspectionPlan { @CreateDateColumn() createdAt: Date; - @Column() + @Column({ nullable: true, default: null }) equipmentTypeId?: string; - @Column() + @Column({ nullable: true, default: null }) vehicleTypeId?: string; @ManyToOne(() => equipmentType, { diff --git a/src/entity/unit/wearable/wearable.ts b/src/entity/unit/wearable/wearable.ts index 0313997..d1168d6 100644 --- a/src/entity/unit/wearable/wearable.ts +++ b/src/entity/unit/wearable/wearable.ts @@ -28,7 +28,7 @@ export class wearable { @Column() wearableTypeId: string; - @Column() + @Column({ nullable: true, default: null }) wearerId?: string; @ManyToOne(() => wearableType, { diff --git a/src/migrations/baseSchemaTables/inspection.ts b/src/migrations/baseSchemaTables/inspection.ts index bfa480a..fbca0ab 100644 --- a/src/migrations/baseSchemaTables/inspection.ts +++ b/src/migrations/baseSchemaTables/inspection.ts @@ -1,4 +1,4 @@ -import { Table, TableForeignKey, TableUnique, Unique } from "typeorm"; +import { Table, TableForeignKey, TableUnique } from "typeorm"; import { getTypeByORM, isUUIDPrimary, getDefaultByORM } from "../ormHelper"; export const inspection_plan_table = new Table({ @@ -8,9 +8,9 @@ export const inspection_plan_table = new Table({ { name: "title", ...getTypeByORM("varchar") }, { name: "inspectionInterval", ...getTypeByORM("varchar") }, { name: "remindTime", ...getTypeByORM("varchar") }, - { name: "createdAt", ...getTypeByORM("date"), default: getDefaultByORM("currentTimestamp") }, - { name: "equipmentTypeId", ...getTypeByORM("uuid", true), default: getDefaultByORM("null") }, - { name: "vehicleTypeId", ...getTypeByORM("uuid", true), default: getDefaultByORM("null") }, + { name: "createdAt", ...getTypeByORM("datetime"), default: getDefaultByORM("currentTimestamp") }, + { name: "equipmentTypeId", ...getTypeByORM("uuid", true) }, + { name: "vehicleTypeId", ...getTypeByORM("uuid", true) }, ], foreignKeys: [ new TableForeignKey({ @@ -35,7 +35,7 @@ export const inspection_versioned_plan_table = new Table({ columns: [ { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary }, { name: "version", ...getTypeByORM("int"), default: getDefaultByORM("number", 0) }, - { name: "createdAt", ...getTypeByORM("date"), default: getDefaultByORM("currentTimestamp") }, + { name: "createdAt", ...getTypeByORM("datetime"), default: getDefaultByORM("currentTimestamp") }, { name: "inspectionPlanId", ...getTypeByORM("uuid") }, ], foreignKeys: [ @@ -62,8 +62,8 @@ export const inspection_point_table = new Table({ { name: "title", ...getTypeByORM("varchar") }, { name: "description", ...getTypeByORM("text") }, { name: "type", ...getTypeByORM("varchar") }, - { name: "min", ...getTypeByORM("int", true), default: getDefaultByORM("null") }, - { name: "max", ...getTypeByORM("int", true), default: getDefaultByORM("null") }, + { name: "min", ...getTypeByORM("int", true) }, + { name: "max", ...getTypeByORM("int", true) }, { name: "sort", ...getTypeByORM("int"), default: getDefaultByORM("number", 0) }, { name: "versionedPlanId", ...getTypeByORM("uuid") }, ], @@ -83,13 +83,13 @@ export const inspection_table = new Table({ columns: [ { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary }, { name: "context", ...getTypeByORM("text") }, - { name: "createdAt", ...getTypeByORM("date"), default: getDefaultByORM("currentTimestamp") }, + { name: "createdAt", ...getTypeByORM("datetime"), default: getDefaultByORM("currentTimestamp") }, { name: "finishedAt", ...getTypeByORM("date", true) }, { name: "nextInspection", ...getTypeByORM("date", true) }, { name: "inspectionPlanId", ...getTypeByORM("uuid") }, { name: "inspectionVersionedPlanId", ...getTypeByORM("uuid") }, - { name: "equipmentId", ...getTypeByORM("uuid", true), default: getDefaultByORM("null") }, - { name: "vehicleId", ...getTypeByORM("uuid", true), default: getDefaultByORM("null") }, + { name: "equipmentId", ...getTypeByORM("uuid", true) }, + { name: "vehicleId", ...getTypeByORM("uuid", true) }, ], foreignKeys: [ new TableForeignKey({ diff --git a/src/migrations/baseSchemaTables/unit.ts b/src/migrations/baseSchemaTables/unit.ts index aec48b3..4d18e11 100644 --- a/src/migrations/baseSchemaTables/unit.ts +++ b/src/migrations/baseSchemaTables/unit.ts @@ -5,11 +5,11 @@ export const equipment_table = new Table({ name: "equipment", columns: [ { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary }, - { name: "code", ...getTypeByORM("varchar", true), default: getDefaultByORM("null"), isUnique: true }, + { name: "code", ...getTypeByORM("varchar", true), isUnique: true }, { name: "name", ...getTypeByORM("varchar") }, { name: "location", ...getTypeByORM("varchar") }, { name: "commissioned", ...getTypeByORM("date") }, - { name: "decommissioned", ...getTypeByORM("date", true), default: getDefaultByORM("null") }, + { name: "decommissioned", ...getTypeByORM("date", true) }, { name: "equipmentTypeId", ...getTypeByORM("uuid") }, ], foreignKeys: [ @@ -28,7 +28,7 @@ export const equipment_type_table = new Table({ columns: [ { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary }, { name: "type", ...getTypeByORM("varchar"), isUnique: true }, - { name: "description", ...getTypeByORM("text") }, + { name: "description", ...getTypeByORM("text", true) }, ], }); @@ -36,11 +36,11 @@ export const vehicle_table = new Table({ name: "vehicle", columns: [ { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary }, - { name: "code", ...getTypeByORM("varchar", true), default: getDefaultByORM("null"), isUnique: true }, + { name: "code", ...getTypeByORM("varchar", true), isUnique: true }, { name: "name", ...getTypeByORM("varchar") }, { name: "location", ...getTypeByORM("varchar") }, { name: "commissioned", ...getTypeByORM("date") }, - { name: "decommissioned", ...getTypeByORM("date", true), default: getDefaultByORM("null") }, + { name: "decommissioned", ...getTypeByORM("date", true) }, { name: "vehicleTypeId", ...getTypeByORM("uuid") }, ], foreignKeys: [ @@ -59,7 +59,7 @@ export const vehicle_type_table = new Table({ columns: [ { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary }, { name: "type", ...getTypeByORM("varchar"), isUnique: true }, - { name: "description", ...getTypeByORM("text") }, + { name: "description", ...getTypeByORM("text", true) }, ], }); @@ -67,13 +67,13 @@ export const wearable_table = new Table({ name: "wearable", columns: [ { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary }, - { name: "code", ...getTypeByORM("varchar", true), default: getDefaultByORM("null"), isUnique: true }, + { name: "code", ...getTypeByORM("varchar", true), isUnique: true }, { name: "name", ...getTypeByORM("varchar") }, { name: "location", ...getTypeByORM("varchar") }, { name: "commissioned", ...getTypeByORM("date") }, - { name: "decommissioned", ...getTypeByORM("date", true), default: getDefaultByORM("null") }, + { name: "decommissioned", ...getTypeByORM("date", true) }, { name: "wearableTypeId", ...getTypeByORM("uuid") }, - { name: "wearerId", ...getTypeByORM("uuid", true), default: getDefaultByORM("null") }, + { name: "wearerId", ...getTypeByORM("uuid", true) }, ], foreignKeys: [ new TableForeignKey({ @@ -98,6 +98,6 @@ export const wearable_type_table = new Table({ columns: [ { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary }, { name: "type", ...getTypeByORM("varchar"), isUnique: true }, - { name: "description", ...getTypeByORM("text") }, + { name: "description", ...getTypeByORM("text", true) }, ], }); diff --git a/src/migrations/baseSchemaTables/unit_extend.ts b/src/migrations/baseSchemaTables/unit_extend.ts index 3f78910..43bece7 100644 --- a/src/migrations/baseSchemaTables/unit_extend.ts +++ b/src/migrations/baseSchemaTables/unit_extend.ts @@ -5,16 +5,16 @@ export const damage_report_table = new Table({ name: "damage_report", columns: [ { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary }, - { name: "reportedAt", ...getTypeByORM("date"), default: getDefaultByORM("currentTimestamp") }, + { name: "reportedAt", ...getTypeByORM("datetime"), default: getDefaultByORM("currentTimestamp") }, { name: "status", ...getTypeByORM("varchar") }, { name: "done", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) }, { name: "description", ...getTypeByORM("text") }, { name: "reportedBy", ...getTypeByORM("varchar") }, { name: "imageCount", ...getTypeByORM("int"), default: getDefaultByORM("number", 0) }, - { name: "equipmentId", ...getTypeByORM("uuid", true), default: getDefaultByORM("null") }, - { name: "vehicleId", ...getTypeByORM("uuid", true), default: getDefaultByORM("null") }, - { name: "wearableId", ...getTypeByORM("uuid", true), default: getDefaultByORM("null") }, - { name: "maintenanceId", ...getTypeByORM("uuid", true), default: getDefaultByORM("null") }, + { name: "equipmentId", ...getTypeByORM("uuid", true) }, + { name: "vehicleId", ...getTypeByORM("uuid", true) }, + { name: "wearableId", ...getTypeByORM("uuid", true) }, + { name: "maintenanceId", ...getTypeByORM("uuid", true) }, ], foreignKeys: [ new TableForeignKey({ @@ -52,13 +52,13 @@ export const maintenance_table = new Table({ name: "maintenance", columns: [ { name: "id", ...getTypeByORM("uuid"), ...isUUIDPrimary }, - { name: "createdAt", ...getTypeByORM("date"), default: getDefaultByORM("currentTimestamp") }, + { name: "createdAt", ...getTypeByORM("datetime"), default: getDefaultByORM("currentTimestamp") }, { name: "status", ...getTypeByORM("varchar") }, { name: "done", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) }, { name: "description", ...getTypeByORM("text") }, - { name: "equipmentId", ...getTypeByORM("uuid", true), default: getDefaultByORM("null") }, - { name: "vehicleId", ...getTypeByORM("uuid", true), default: getDefaultByORM("null") }, - { name: "wearableId", ...getTypeByORM("uuid", true), default: getDefaultByORM("null") }, + { name: "equipmentId", ...getTypeByORM("uuid", true) }, + { name: "vehicleId", ...getTypeByORM("uuid", true) }, + { name: "wearableId", ...getTypeByORM("uuid", true) }, ], foreignKeys: [ new TableForeignKey({