From d5646753f1d47675b29d1b4ba02ad0515eac67f7 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 13 Jun 2025 18:05:55 +0200
Subject: [PATCH] inspection extend fixes

---
 src/migrations/baseSchemaTables/inspection.ts | 16 ++++++++++++++++
 src/routes/admin/index.ts                     |  2 +-
 src/service/unit/damageReportService.ts       |  2 +-
 src/service/unit/maintenanceService.ts        |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/migrations/baseSchemaTables/inspection.ts b/src/migrations/baseSchemaTables/inspection.ts
index fbca0ab..2b827fc 100644
--- a/src/migrations/baseSchemaTables/inspection.ts
+++ b/src/migrations/baseSchemaTables/inspection.ts
@@ -11,6 +11,7 @@ export const inspection_plan_table = new Table({
     { name: "createdAt", ...getTypeByORM("datetime"), default: getDefaultByORM("currentTimestamp") },
     { name: "equipmentTypeId", ...getTypeByORM("uuid", true) },
     { name: "vehicleTypeId", ...getTypeByORM("uuid", true) },
+    { name: "wearableTypeId", ...getTypeByORM("uuid", true) },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -27,6 +28,13 @@ export const inspection_plan_table = new Table({
       onDelete: "CASCADE",
       onUpdate: "RESTRICT",
     }),
+    new TableForeignKey({
+      columnNames: ["wearableTypeId"],
+      referencedColumnNames: ["id"],
+      referencedTableName: "wearable_type",
+      onDelete: "CASCADE",
+      onUpdate: "RESTRICT",
+    }),
   ],
 });
 
@@ -90,6 +98,7 @@ export const inspection_table = new Table({
     { name: "inspectionVersionedPlanId", ...getTypeByORM("uuid") },
     { name: "equipmentId", ...getTypeByORM("uuid", true) },
     { name: "vehicleId", ...getTypeByORM("uuid", true) },
+    { name: "wearableId", ...getTypeByORM("uuid", true) },
   ],
   foreignKeys: [
     new TableForeignKey({
@@ -120,6 +129,13 @@ export const inspection_table = new Table({
       onDelete: "CASCADE",
       onUpdate: "RESTRICT",
     }),
+    new TableForeignKey({
+      columnNames: ["wearableId"],
+      referencedColumnNames: ["id"],
+      referencedTableName: "wearable",
+      onDelete: "CASCADE",
+      onUpdate: "RESTRICT",
+    }),
   ],
 });
 
diff --git a/src/routes/admin/index.ts b/src/routes/admin/index.ts
index f6f1f3d..3a6edf2 100644
--- a/src/routes/admin/index.ts
+++ b/src/routes/admin/index.ts
@@ -274,7 +274,7 @@ router.use(
   damageReport
 );
 router.use(
-  "/mainenance",
+  "/maintenance",
   PermissionHelper.passCheckSomeMiddleware([
     { requiredPermission: "read", section: "unit", module: "maintenance" },
     { requiredPermission: "read", section: "unit", module: "equipment" },
diff --git a/src/service/unit/damageReportService.ts b/src/service/unit/damageReportService.ts
index 622b377..21072c7 100644
--- a/src/service/unit/damageReportService.ts
+++ b/src/service/unit/damageReportService.ts
@@ -68,7 +68,7 @@ export default abstract class DamageReportService {
     }
 
     return await query
-      .orderBy("reportedAt", "ASC")
+      .orderBy("damageReport.reportedAt", "ASC")
       .getManyAndCount()
       .then((res) => {
         return res;
diff --git a/src/service/unit/maintenanceService.ts b/src/service/unit/maintenanceService.ts
index 73a8a39..d9d997d 100644
--- a/src/service/unit/maintenanceService.ts
+++ b/src/service/unit/maintenanceService.ts
@@ -34,7 +34,7 @@ export default abstract class MaintenanceService {
     }
 
     return await query
-      .orderBy("maintenance.type", "ASC")
+      .orderBy("maintenance.createdAt", "ASC")
       .getManyAndCount()
       .then((res) => {
         return res;