@platform-modules/civil-aviation-authority 2.3.293 → 2.3.294

package/dist/models/FollowUpReportItemModel.d.ts

@@ -1,5 +1,4 @@
 import { BaseModel } from './BaseModel';
-import { FollowUpReportSubjectClassification } from './FollowUpReportRequestModel';
 export declare class FollowUpReportItem extends BaseModel {
     request_id: number;
     service_id: number | null;
@@ -7,7 +6,7 @@ export declare class FollowUpReportItem extends BaseModel {
     reference_type: string | null;
     letter_date: Date | null;
     subject: string | null;
-    subject_classification: FollowUpReportSubjectClassification | null;
+    subject_classification: string | null;
     general_manager_comment: string | null;
     response_date_target: string | null;
     action_status: string | null;

package/dist/models/FollowUpReportItemModel.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FollowUpReportItem = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
-const FollowUpReportRequestModel_1 = require("./FollowUpReportRequestModel");
 let FollowUpReportItem = class FollowUpReportItem extends BaseModel_1.BaseModel {
 };
 exports.FollowUpReportItem = FollowUpReportItem;
@@ -41,12 +40,7 @@ __decorate([
     __metadata("design:type", Object)
 ], FollowUpReportItem.prototype, "subject", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        type: 'enum',
-        enum: FollowUpReportRequestModel_1.FollowUpReportSubjectClassification,
-        enumName: 'maintenance_subject_classification_en',
-        nullable: true,
-    }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", Object)
 ], FollowUpReportItem.prototype, "subject_classification", void 0);
 __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.3.293",
+  "version": "2.3.294",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
   "scripts": {

package/sql/caa_api_payload_changes_2026_07.sql

@@ -37,6 +37,45 @@ ALTER TYPE maintenance_subject_classification_en ADD VALUE IF NOT EXISTS 'Highly
 ALTER TYPE maintenance_subject_classification_en ADD VALUE IF NOT EXISTS 'Restricted';
 ALTER TYPE maintenance_subject_classification_en ADD VALUE IF NOT EXISTS 'Limited';
 
+-- 7b. Repair failed TypeORM enum swap (items column can remain on _old type)
+DO $$
+BEGIN
+  IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'maintenance_subject_classification_en_old') THEN
+    IF EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_items'
+        AND column_name = 'subject_classification'
+        AND udt_name = 'maintenance_subject_classification_en_old'
+    ) THEN
+      ALTER TABLE followup_report_items
+        ALTER COLUMN subject_classification TYPE maintenance_subject_classification_en
+        USING subject_classification::text::maintenance_subject_classification_en;
+    END IF;
+
+    IF EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_requests'
+        AND column_name = 'subject_classification'
+        AND udt_name = 'maintenance_subject_classification_en_old'
+    ) THEN
+      ALTER TABLE followup_report_requests
+        ALTER COLUMN subject_classification TYPE maintenance_subject_classification_en
+        USING subject_classification::text::maintenance_subject_classification_en;
+    END IF;
+
+    DROP TYPE maintenance_subject_classification_en_old;
+  END IF;
+END $$;
+
+-- 7c. Report items use varchar (nullable) so TypeORM sync does not fight shared PG enum on two tables
+ALTER TABLE followup_report_items
+  ALTER COLUMN subject_classification TYPE VARCHAR(100)
+  USING subject_classification::text;
+
 -- 8. Contract service request: notes, company phone, contract documents table
 ALTER TABLE contract_service_requests
   ADD COLUMN IF NOT EXISTS notes TEXT,

package/sql/fix_maintenance_subject_classification_enum_2026_07.sql

@@ -0,0 +1,48 @@
+-- Run this BEFORE shared_models synchronize if you see:
+--   cannot drop type maintenance_subject_classification_en_old because other objects depend on it
+--
+-- Safe to re-run.
+
+-- Add new enum values on the live type (no-op if already present)
+ALTER TYPE maintenance_subject_classification_en ADD VALUE IF NOT EXISTS 'Important';
+ALTER TYPE maintenance_subject_classification_en ADD VALUE IF NOT EXISTS 'Highly Confidential';
+ALTER TYPE maintenance_subject_classification_en ADD VALUE IF NOT EXISTS 'Restricted';
+ALTER TYPE maintenance_subject_classification_en ADD VALUE IF NOT EXISTS 'Limited';
+
+DO $$
+BEGIN
+  IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'maintenance_subject_classification_en_old') THEN
+    IF EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_items'
+        AND column_name = 'subject_classification'
+        AND udt_name = 'maintenance_subject_classification_en_old'
+    ) THEN
+      ALTER TABLE followup_report_items
+        ALTER COLUMN subject_classification TYPE maintenance_subject_classification_en
+        USING subject_classification::text::maintenance_subject_classification_en;
+    END IF;
+
+    IF EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_requests'
+        AND column_name = 'subject_classification'
+        AND udt_name = 'maintenance_subject_classification_en_old'
+    ) THEN
+      ALTER TABLE followup_report_requests
+        ALTER COLUMN subject_classification TYPE maintenance_subject_classification_en
+        USING subject_classification::text::maintenance_subject_classification_en;
+    END IF;
+
+    DROP TYPE maintenance_subject_classification_en_old;
+  END IF;
+END $$;
+
+-- Items column: varchar avoids TypeORM multi-table PG enum sync failures
+ALTER TABLE followup_report_items
+  ALTER COLUMN subject_classification TYPE VARCHAR(100)
+  USING subject_classification::text;

package/src/models/FollowUpReportItemModel.ts

@@ -1,6 +1,5 @@
 import { Column, Entity } from 'typeorm';
 import { BaseModel } from './BaseModel';
-import { FollowUpReportSubjectClassification } from './FollowUpReportRequestModel';
 
 @Entity({ name: 'followup_report_items' })
 export class FollowUpReportItem extends BaseModel {
@@ -22,13 +21,8 @@ export class FollowUpReportItem extends BaseModel {
   @Column({ type: 'varchar', length: 500, nullable: true })
   subject: string | null;
 
-  @Column({
-    type: 'enum',
-    enum: FollowUpReportSubjectClassification,
-    enumName: 'maintenance_subject_classification_en',
-    nullable: true,
-  })
-  subject_classification: FollowUpReportSubjectClassification | null;
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  subject_classification: string | null;
 
   @Column({ type: 'varchar', length: 500, nullable: true })
   general_manager_comment: string | null;