resolve merge conflict

apps/edr-freight-api/src/migrations/2000000000000-CreateCompanyChangeRequest.ts

@@ -0,0 +1,60 @@
+import { MigrationInterface, QueryRunner, Table, TableIndex } from 'typeorm';
+
+/**
+ * Staging table for customer profile edits that require backoffice review. An
+ * already-approved company's settings edits are snapshotted here (Pending)
+ * instead of being written to the live `companies` row; a reviewer approves
+ * (snapshot applied) or rejects with a note (customer amends & resubmits).
+ */
+export class CreateCompanyChangeRequest2000000000000
+  implements MigrationInterface
+{
+  name = 'CreateCompanyChangeRequest2000000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.createTable(
+      new Table({
+        schema: 'freight',
+        name: 'company_change_request',
+        columns: [
+          { name: 'id', type: 'uuid', isPrimary: true, generationStrategy: 'uuid', default: 'gen_random_uuid()' },
+          { name: 'company_id', type: 'uuid' },
+          { name: 'snapshot', type: 'jsonb' },
+          { name: 'documents', type: 'jsonb', isNullable: true },
+          { name: 'status', type: 'varchar', length: '20', default: "'pending'" },
+          { name: 'note', type: 'text', isNullable: true },
+          { name: 'submitted_by', type: 'uuid', isNullable: true },
+          { name: 'submitted_at', type: 'timestamptz', isNullable: true },
+          { name: 'reviewed_by', type: 'uuid', isNullable: true },
+          { name: 'reviewed_at', type: 'timestamptz', isNullable: true },
+          { name: 'created_at', type: 'timestamptz', default: 'now()' },
+          { name: 'updated_at', type: 'timestamptz', default: 'now()' },
+          { name: 'deleted_at', type: 'timestamptz', isNullable: true },
+        ],
+        foreignKeys: [
+          {
+            columnNames: ['company_id'],
+            referencedSchema: 'freight',
+            referencedTableName: 'companies',
+            referencedColumnNames: ['id'],
+            onDelete: 'CASCADE',
+          },
+        ],
+      }),
+      true,
+    );
+
+    await queryRunner.createIndex(
+      'freight.company_change_request',
+      new TableIndex({ name: 'idx_company_change_request_company', columnNames: ['company_id'] }),
+    );
+    await queryRunner.createIndex(
+      'freight.company_change_request',
+      new TableIndex({ name: 'idx_company_change_request_status', columnNames: ['status'] }),
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.dropTable('freight.company_change_request', true);
+  }
+}

apps/edr-freight-api/src/migrations/2000000000001-AddCompanyProfileReview.ts

@@ -0,0 +1,28 @@
+import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';
+
+/**
+ * Adds reviewer note/id/timestamp to company_profiles so a rejected operational
+ * role (new ProfileStatus 'rejected') can carry the reason back to the customer,
+ * who can then amend and reapply.
+ */
+export class AddCompanyProfileReview2000000000001
+  implements MigrationInterface
+{
+  name = 'AddCompanyProfileReview2000000000001';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.addColumns('freight.company_profiles', [
+      new TableColumn({ name: 'review_note', type: 'text', isNullable: true }),
+      new TableColumn({ name: 'reviewed_by', type: 'uuid', isNullable: true }),
+      new TableColumn({ name: 'reviewed_at', type: 'timestamptz', isNullable: true }),
+    ]);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.dropColumns('freight.company_profiles', [
+      'review_note',
+      'reviewed_by',
+      'reviewed_at',
+    ]);
+  }
+}

apps/edr-freight-api/src/migrations/2020000000000-WarehouseCapacityKgToTons.ts

@@ -0,0 +1,35 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Weights are tonnes everywhere. Warehouse / yard / zone capacity was stored in
+ * kg (e.g. 25000, 5000, 2500) — convert existing rows to tonnes (÷1000). Cargo
+ * weight (warehouse_inventory.weight ← cargo_total_weight_vgm) is already tonnes
+ * and is NOT touched; truck gross weight has no data yet. Runs exactly once
+ * (tracked by TypeORM) — re-running would divide again.
+ */
+export class WarehouseCapacityKgToTons2020000000000 implements MigrationInterface {
+  name = 'WarehouseCapacityKgToTons2020000000000';
+
+  private readonly tables = ['warehouses', 'warehouse_yards', 'warehouse_zones'];
+  private readonly columns = ['capacity_weight', 'current_weight', 'max_weight'];
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    for (const table of this.tables) {
+      for (const column of this.columns) {
+        await queryRunner.query(
+          `UPDATE freight.${table} SET ${column} = ${column} / 1000.0 WHERE ${column} IS NOT NULL`,
+        );
+      }
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    for (const table of this.tables) {
+      for (const column of this.columns) {
+        await queryRunner.query(
+          `UPDATE freight.${table} SET ${column} = ${column} * 1000.0 WHERE ${column} IS NOT NULL`,
+        );
+      }
+    }
+  }
+}

apps/edr-freight-api/src/migrations/2040000000000-MigrateLicenseFilesToFileRecords.ts

@@ -0,0 +1,59 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/**
+ * Business-license files used to live inline as a jsonb array on
+ * `company_profiles.business_license_files`. They now belong to the FileRecord
+ * model (`freight.files`, resource `company_profiles`, code `business_license`)
+ * so they get stable ids and stream through `GET /api/files/:id` — the same
+ * proxy path regular documents use — instead of broken direct-MinIO URLs.
+ *
+ * This copies each existing inline entry into `freight.files` by reference
+ * (keeping the stored object URL — no bytes are re-uploaded). The original jsonb
+ * column is left intact for rollback safety.
+ */
+export class MigrateLicenseFilesToFileRecords2040000000000
+  implements MigrationInterface
+{
+  name = "MigrateLicenseFilesToFileRecords2040000000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      INSERT INTO freight.files
+        (id, resource_id, resource, code, name, url, size, mime_type, created_at, updated_at)
+      SELECT
+        gen_random_uuid(),
+        cp.id,
+        'company_profiles',
+        'business_license',
+        COALESCE(elem->>'name', 'license'),
+        elem->>'url',
+        COALESCE(NULLIF(elem->>'size', '')::int, 0),
+        COALESCE(NULLIF(elem->>'mimeType', ''), 'application/octet-stream'),
+        now(),
+        now()
+      FROM freight.company_profiles cp
+      CROSS JOIN LATERAL jsonb_array_elements(cp.business_license_files) AS elem
+      WHERE cp.business_license_files IS NOT NULL
+        AND jsonb_typeof(cp.business_license_files) = 'array'
+        AND elem->>'url' IS NOT NULL
+        AND NOT EXISTS (
+          SELECT 1 FROM freight.files f
+          WHERE f.resource_id = cp.id
+            AND f.resource = 'company_profiles'
+            AND f.code = 'business_license'
+            AND f.url = elem->>'url'
+            AND f.deleted_at IS NULL
+        );
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Reverse the model migration by dropping the license FileRecords. The
+    // original jsonb column was never cleared, so the data still exists there.
+    await queryRunner.query(`
+      DELETE FROM freight.files
+      WHERE resource = 'company_profiles'
+        AND code = 'business_license';
+    `);
+  }
+}

apps/edr-freight-api/src/migrations/2050000000000-AddCustomerTruckContainerLoadedAt.ts

@@ -0,0 +1,35 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Adds customer_truck_containers.loaded_at so an assignment (customer planning
+ * which containers ride which truck) is distinct from the container actually
+ * being loaded. Stage LOADED now requires loaded_at; customer assignment alone
+ * keeps the container at its prior stage (RECEIVED/GRN) with its planned truck
+ * shown. Backfills containers on already-departed trucks (they left loaded).
+ */
+export class AddCustomerTruckContainerLoadedAt2050000000000
+  implements MigrationInterface
+{
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.customer_truck_containers
+        ADD COLUMN IF NOT EXISTS loaded_at TIMESTAMPTZ;
+    `);
+
+    await queryRunner.query(`
+      UPDATE freight.customer_truck_containers ctc
+      SET loaded_at = a.departed_at
+      FROM freight.customer_truck_assignments a
+      WHERE a.id = ctc.assignment_id
+        AND a.departed_at IS NOT NULL
+        AND ctc.deleted_at IS NULL
+        AND ctc.loaded_at IS NULL;
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.customer_truck_containers DROP COLUMN IF EXISTS loaded_at;
+    `);
+  }
+}