From c02487ad3c572c2b351d4f74e1b7913bb20489b1 Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Thu, 17 Jul 2025 10:37:26 +0200 Subject: [PATCH] extend damageReport with noteByWorker --- src/command/unit/damageReportCommand.ts | 3 ++- src/command/unit/damageReportCommandHandler.ts | 3 ++- src/controller/admin/unit/damageReportController.ts | 4 +++- src/controller/publicController.ts | 2 +- src/entity/unit/damageReport.ts | 5 ++++- src/factory/admin/unit/damageReport.ts | 3 ++- src/migrations/baseSchemaTables/unit_extend.ts | 3 ++- src/viewmodel/admin/unit/damageReport.models.ts | 3 ++- 8 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/command/unit/damageReportCommand.ts b/src/command/unit/damageReportCommand.ts index c1a5538..9d7a631 100644 --- a/src/command/unit/damageReportCommand.ts +++ b/src/command/unit/damageReportCommand.ts @@ -1,7 +1,7 @@ export interface CreateDamageReportCommand { description: string; location: string; - note: string; + noteByReporter: string; reportedBy: string; images: string[]; affectedId?: string; @@ -11,6 +11,7 @@ export interface CreateDamageReportCommand { export interface UpdateDamageReportCommand { id: string; status: string; + noteByWorker: string; done: boolean; } diff --git a/src/command/unit/damageReportCommandHandler.ts b/src/command/unit/damageReportCommandHandler.ts index 248d7c9..e5357d6 100644 --- a/src/command/unit/damageReportCommandHandler.ts +++ b/src/command/unit/damageReportCommandHandler.ts @@ -23,7 +23,7 @@ export default abstract class DamageReportCommandHandler { status: "eingereicht", description: createDamageReport.description, location: createDamageReport.location, - note: createDamageReport.note, + noteByReporter: createDamageReport.noteByReporter, reportedBy: createDamageReport.reportedBy, images: createDamageReport.images, equipmentId: createDamageReport.affected == "equipment" ? createDamageReport.affectedId : null, @@ -50,6 +50,7 @@ export default abstract class DamageReportCommandHandler { .update(damageReport) .set({ status: updateDamageReport.status, + noteByWorker: updateDamageReport.noteByWorker, done: updateDamageReport.done, }) .where("id = :id", { id: updateDamageReport.id }) diff --git a/src/controller/admin/unit/damageReportController.ts b/src/controller/admin/unit/damageReportController.ts index 7e23556..055b3bc 100644 --- a/src/controller/admin/unit/damageReportController.ts +++ b/src/controller/admin/unit/damageReportController.ts @@ -108,7 +108,7 @@ export async function createDamageReport(req: Request, res: Response): Promise i.filename), affectedId, @@ -128,11 +128,13 @@ export async function createDamageReport(req: Request, res: Response): Promise { const damageReportId = req.params.id; const status = req.body.status; + const noteByWorker = req.body.noteByWorker; const done = req.body.done; let updateDamageReport: UpdateDamageReportCommand = { id: damageReportId, status, + noteByWorker, done, }; await DamageReportCommandHandler.update(updateDamageReport); diff --git a/src/controller/publicController.ts b/src/controller/publicController.ts index e385307..fd2ff81 100644 --- a/src/controller/publicController.ts +++ b/src/controller/publicController.ts @@ -129,7 +129,7 @@ export async function createDamageReport(req: Request, res: Response): Promise i.filename), affectedId: related ? related.id : undefined, diff --git a/src/entity/unit/damageReport.ts b/src/entity/unit/damageReport.ts index 5eba9b2..bfb45ae 100644 --- a/src/entity/unit/damageReport.ts +++ b/src/entity/unit/damageReport.ts @@ -25,7 +25,10 @@ export class damageReport { location: string; @Column({ type: "text" }) - note: string; + noteByReporter: string; + + @Column({ type: "text" }) + noteByWorker: string; @Column({ type: "text", diff --git a/src/factory/admin/unit/damageReport.ts b/src/factory/admin/unit/damageReport.ts index cb61860..fe6ff61 100644 --- a/src/factory/admin/unit/damageReport.ts +++ b/src/factory/admin/unit/damageReport.ts @@ -46,7 +46,8 @@ export default abstract class DamageReportFactory { done: record.done, description: record.description, location: record.location, - note: record.note, + noteByReporter: record.noteByReporter, + noteByWorker: record.noteByWorker, images: record.images, reportedBy: record?.reportedBy, ...assigned, diff --git a/src/migrations/baseSchemaTables/unit_extend.ts b/src/migrations/baseSchemaTables/unit_extend.ts index 0beef1c..86de02c 100644 --- a/src/migrations/baseSchemaTables/unit_extend.ts +++ b/src/migrations/baseSchemaTables/unit_extend.ts @@ -10,7 +10,8 @@ export const damage_report_table = new Table({ { name: "done", ...getTypeByORM("boolean"), default: getDefaultByORM("boolean", false) }, { name: "description", ...getTypeByORM("text") }, { name: "location", ...getTypeByORM("text") }, - { name: "note", ...getTypeByORM("text") }, + { name: "noteByReporter", ...getTypeByORM("text") }, + { name: "noteByWorker", ...getTypeByORM("text") }, { name: "reportedBy", ...getTypeByORM("varchar") }, { name: "imageCount", ...getTypeByORM("int"), default: getDefaultByORM("number", 0) }, { name: "equipmentId", ...getTypeByORM("uuid", true) }, diff --git a/src/viewmodel/admin/unit/damageReport.models.ts b/src/viewmodel/admin/unit/damageReport.models.ts index 25692b2..15b03f2 100644 --- a/src/viewmodel/admin/unit/damageReport.models.ts +++ b/src/viewmodel/admin/unit/damageReport.models.ts @@ -27,7 +27,8 @@ export type DamageReportViewModel = { done: boolean; description: string; location: string; - note: string; + noteByReporter: string; + noteByWorker: string; images: string[]; reportedBy: string; maintenance?: MaintenanceViewModel;