From e429a2cebff69900473b6bd96f0e74e472fc59e7 Mon Sep 17 00:00:00 2001
From: natib21 <yaschalew10@gmail.com>
Date: Thu, 2 Jul 2026 13:15:44 +0000
Subject: [PATCH] fix

---
 ...8427600000-AddServiceTypesAndCargoTypes.ts | 33 +++++++++++--------
 .../1880000000000-AddVehicleStatuses.ts       | 15 ++++++---
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/apps/edr-freight-api/src/migrations/1748427600000-AddServiceTypesAndCargoTypes.ts b/apps/edr-freight-api/src/migrations/1748427600000-AddServiceTypesAndCargoTypes.ts
index 65052bad4..c3698aed6 100644
--- a/apps/edr-freight-api/src/migrations/1748427600000-AddServiceTypesAndCargoTypes.ts
+++ b/apps/edr-freight-api/src/migrations/1748427600000-AddServiceTypesAndCargoTypes.ts
@@ -93,20 +93,25 @@ export class AddServiceTypesAndCargoTypes1748427600000 implements MigrationInter
     );
 
     // Create indexes for service_types
-    await queryRunner.createIndex(
-      "freight.service_types",
-      new TableIndex({
-        name: "IDX_SERVICE_TYPES_IS_ACTIVE",
-        columnNames: ["is_active"],
-      }),
-    );
-    await queryRunner.createIndex(
-      "freight.service_types",
-      new TableIndex({
-        name: "IDX_SERVICE_TYPES_DISPLAY_ORDER",
-        columnNames: ["display_order"],
-      }),
-    );
+    const table = await queryRunner.getTable("freight.service_types");
+    if (table && !(await queryRunner.hasIndex("freight.service_types", "IDX_SERVICE_TYPES_IS_ACTIVE"))) {
+      await queryRunner.createIndex(
+        "freight.service_types",
+        new TableIndex({
+          name: "IDX_SERVICE_TYPES_IS_ACTIVE",
+          columnNames: ["is_active"],
+        }),
+      );
+    }
+    if (table && !(await queryRunner.hasIndex("freight.service_types", "IDX_SERVICE_TYPES_DISPLAY_ORDER"))) {
+      await queryRunner.createIndex(
+        "freight.service_types",
+        new TableIndex({
+          name: "IDX_SERVICE_TYPES_DISPLAY_ORDER",
+          columnNames: ["display_order"],
+        }),
+      );
+    }
 
     // Create cargo_types table
     if (!(await queryRunner.hasTable("freight.cargo_types"))) await queryRunner.createTable(
diff --git a/apps/edr-freight-api/src/migrations/1880000000000-AddVehicleStatuses.ts b/apps/edr-freight-api/src/migrations/1880000000000-AddVehicleStatuses.ts
index ce9af151b..484a2686b 100644
--- a/apps/edr-freight-api/src/migrations/1880000000000-AddVehicleStatuses.ts
+++ b/apps/edr-freight-api/src/migrations/1880000000000-AddVehicleStatuses.ts
@@ -7,11 +7,18 @@ export class AddVehicleStatuses1880000000000 implements MigrationInterface {
   name = "AddVehicleStatuses1880000000000";
 
   public async up(queryRunner: QueryRunner): Promise<void> {
+    // Create enum type if it doesn't exist
     await queryRunner.query(`
-      ALTER TYPE freight.vehicles_status_enum ADD VALUE IF NOT EXISTS 'FREE' BEFORE 'MAINTENANCE';
-    `);
-    await queryRunner.query(`
-      ALTER TYPE freight.vehicles_status_enum ADD VALUE IF NOT EXISTS 'BUSY' AFTER 'FREE';
+      DO $$
+      BEGIN
+        IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'vehicles_status_enum' AND typnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'freight')) THEN
+          CREATE TYPE freight.vehicles_status_enum AS ENUM ('ACTIVE', 'FREE', 'BUSY', 'MAINTENANCE', 'RETIRED', 'OUT_OF_SERVICE');
+        ELSE
+          -- Add values if enum already exists but doesn't have them
+          ALTER TYPE freight.vehicles_status_enum ADD VALUE IF NOT EXISTS 'FREE' BEFORE 'MAINTENANCE';
+          ALTER TYPE freight.vehicles_status_enum ADD VALUE IF NOT EXISTS 'BUSY' AFTER 'FREE';
+        END IF;
+      END $$;
     `);
   }