Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority

apps/edr-freight-api/src/migrations/1791000000000-AddWarehouseAllocationAndFeeRules.ts

@@ -2,9 +2,9 @@ import { MigrationInterface, QueryRunner, Table, TableColumn } from 'typeorm';
 
 /**
  * Batch 5 — warehouse allocation rules, storage/demurrage fee rules,
- * and demurrage lifecycle timestamps on inventory.
+ * and demurrage lifecycle timestamps on inventory. Idempotent.
  */
-export class AddWarehouseAllocationAndFeeRules1790000000000 implements MigrationInterface {
+export class AddWarehouseAllocationAndFeeRules1791000000000 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.createTable(
       new Table({

apps/edr-freight-api/src/migrations/1791000000001-AddWarehouseFeeInvoices.ts

@@ -1,7 +1,7 @@
 import { MigrationInterface, QueryRunner, Table } from 'typeorm';
 
-/** Batch 6 — warehouse fee invoices + invoice items. */
-export class AddWarehouseFeeInvoices1790000000001 implements MigrationInterface {
+/** Batch 6 — warehouse fee invoices + invoice items. Idempotent (createTable ifNotExists). */
+export class AddWarehouseFeeInvoices1791000000001 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.createTable(
       new Table({

apps/edr-freight-api/src/migrations/1791000000002-AddImportPickupDeliveryColumns.ts

@@ -0,0 +1,37 @@
+import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';
+
+/**
+ * Import pickup branch on warehouse_inventory:
+ *  - release_order_reference: DO / release order number sent to the customer
+ *  - delivered_at: when the goods were handed over (proof of delivery)
+ *
+ * Idempotent: the shared dev DB may already carry some of these columns
+ * (added by another checkout), so only add what is missing.
+ */
+export class AddImportPickupDeliveryColumns1791000000002 implements MigrationInterface {
+  private readonly table = 'freight.warehouse_inventory';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    if (!(await queryRunner.hasColumn(this.table, 'release_order_reference'))) {
+      await queryRunner.addColumn(
+        this.table,
+        new TableColumn({ name: 'release_order_reference', type: 'varchar', length: '100', isNullable: true }),
+      );
+    }
+    if (!(await queryRunner.hasColumn(this.table, 'delivered_at'))) {
+      await queryRunner.addColumn(
+        this.table,
+        new TableColumn({ name: 'delivered_at', type: 'timestamptz', isNullable: true }),
+      );
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    if (await queryRunner.hasColumn(this.table, 'release_order_reference')) {
+      await queryRunner.dropColumn(this.table, 'release_order_reference');
+    }
+    if (await queryRunner.hasColumn(this.table, 'delivered_at')) {
+      await queryRunner.dropColumn(this.table, 'delivered_at');
+    }
+  }
+}

apps/edr-freight-api/src/migrations/1791000000003-AddInventoryUnloadedAt.ts

@@ -0,0 +1,27 @@
+import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';
+
+/**
+ * Batch 8 — train-arrival unload landing state on warehouse_inventory:
+ *  - unloaded_at: when the goods were unloaded off the arrived train (before storage/inspection)
+ *
+ * The `status` column is a free varchar, so the new 'UNLOADED' value needs no schema change.
+ * Idempotent: the shared dev DB may already carry this column (added by another checkout).
+ */
+export class AddInventoryUnloadedAt1791000000003 implements MigrationInterface {
+  private readonly table = 'freight.warehouse_inventory';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    if (!(await queryRunner.hasColumn(this.table, 'unloaded_at'))) {
+      await queryRunner.addColumn(
+        this.table,
+        new TableColumn({ name: 'unloaded_at', type: 'timestamptz', isNullable: true }),
+      );
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    if (await queryRunner.hasColumn(this.table, 'unloaded_at')) {
+      await queryRunner.dropColumn(this.table, 'unloaded_at');
+    }
+  }
+}

apps/edr-freight-api/src/migrations/1791000000004-AddFacilityIdToWarehousesFix.ts

@@ -0,0 +1,52 @@
+import { MigrationInterface, QueryRunner, TableColumn, TableForeignKey } from 'typeorm';
+
+/**
+ * Fix: migration 1750000000001 (AddFacilityIdToWarehouses) silently skipped because
+ * the freight.warehouses table didn't exist yet at that timestamp. The column was
+ * never added. Add it now with idempotent guards.
+ */
+export class AddFacilityIdToWarehousesFix1791000000004 implements MigrationInterface {
+  private readonly table = 'freight.warehouses';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    if (!(await queryRunner.hasColumn(this.table, 'facility_id'))) {
+      await queryRunner.addColumn(
+        this.table,
+        new TableColumn({
+          name: 'facility_id',
+          type: 'uuid',
+          isNullable: true,
+        }),
+      );
+    }
+
+    const table = await queryRunner.getTable(this.table);
+    const hasFk = table?.foreignKeys.some((fk) => fk.columnNames.includes('facility_id'));
+    if (!hasFk) {
+      await queryRunner.createForeignKey(
+        this.table,
+        new TableForeignKey({
+          columnNames: ['facility_id'],
+          referencedColumnNames: ['id'],
+          referencedTableName: 'facilities',
+          referencedSchema: 'freight',
+          onDelete: 'SET NULL',
+        }),
+      );
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    const table = await queryRunner.getTable(this.table);
+    if (!table) return;
+
+    const foreignKey = table.foreignKeys.find((fk) => fk.columnNames.includes('facility_id'));
+    if (foreignKey) {
+      await queryRunner.dropForeignKey(this.table, foreignKey);
+    }
+
+    if (await queryRunner.hasColumn(this.table, 'facility_id')) {
+      await queryRunner.dropColumn(this.table, 'facility_id');
+    }
+  }
+}