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

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/dist/models/FollowUpReportRequestModel.js

@@ -80,12 +80,7 @@ __decorate([
     __metadata("design:type", String)
 ], FollowUpReportRequests.prototype, "subject", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        type: 'enum',
-        enum: FollowUpReportSubjectClassification,
-        enumName: 'maintenance_subject_classification_en',
-        nullable: false,
-    }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
     __metadata("design:type", String)
 ], FollowUpReportRequests.prototype, "subject_classification", void 0);
 __decorate([

package/package.json

@@ -1,11 +1,12 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.3.293",
+  "version": "2.3.295",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
   "scripts": {
   "build": "tsc && node -e \"require('fs').mkdirSync('dist/i18n',{recursive:true}); require('fs').copyFileSync('src/i18n/workflow-chat-i18n.json','dist/i18n/workflow-chat-i18n.json')\"",
   "dev": "ts-node src/scripts.ts",
+  "fix:enum": "node scripts/run-enum-fix.js",
   "sync:sla-sql": "node scripts/sync-sla-reports-sql.js"
  },
  "publishConfig": {

package/scripts/run-enum-fix.js

@@ -0,0 +1,30 @@
+require('dotenv').config();
+const fs = require('fs');
+const path = require('path');
+const { Client } = require('pg');
+
+async function main() {
+  const sqlPath = path.join(__dirname, '..', 'sql', 'fix_maintenance_subject_classification_enum_2026_07.sql');
+  const sql = fs.readFileSync(sqlPath, 'utf8');
+
+  const client = new Client({
+    host: process.env.DB_HOST,
+    port: Number(process.env.DB_PORT || 5432),
+    user: process.env.DB_USER,
+    password: process.env.DB_PASS,
+    database: process.env.DB_NAME,
+  });
+
+  await client.connect();
+  try {
+    await client.query(sql);
+    console.log('✅ Enum repair SQL applied successfully.');
+  } finally {
+    await client.end();
+  }
+}
+
+main().catch((error) => {
+  console.error('❌ Enum repair failed:', error.message);
+  process.exit(1);
+});

package/sql/caa_api_payload_changes_2026_07.sql

@@ -31,11 +31,28 @@ ALTER TABLE cyber_security_risk_management_risks
   ADD COLUMN IF NOT EXISTS treatment TEXT,
   ADD COLUMN IF NOT EXISTS action TEXT;
 
--- 7. Follow-up report: subject_classification enum values
-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';
+-- 7. Follow-up report: subject_classification as varchar (avoids TypeORM PG enum sync failures)
+ALTER TABLE followup_report_items
+  ALTER COLUMN subject_classification TYPE VARCHAR(100)
+  USING subject_classification::text;
+
+ALTER TABLE followup_report_requests
+  ALTER COLUMN subject_classification TYPE VARCHAR(100)
+  USING subject_classification::text;
+
+DROP TYPE IF EXISTS maintenance_subject_classification_en_old;
+
+DO $$
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1
+    FROM information_schema.columns
+    WHERE table_schema = 'public'
+      AND udt_name = 'maintenance_subject_classification_en'
+  ) THEN
+    DROP TYPE IF EXISTS maintenance_subject_classification_en;
+  END IF;
+END $$;
 
 -- 8. Contract service request: notes, company phone, contract documents table
 ALTER TABLE contract_service_requests

package/sql/fix_maintenance_subject_classification_enum_2026_07.sql

@@ -0,0 +1,28 @@
+-- Repair stuck TypeORM enum swap for follow-up report subject_classification.
+-- Safe to re-run.
+
+-- 1) Move report items off PG enum (_old or live) -> varchar
+ALTER TABLE followup_report_items
+  ALTER COLUMN subject_classification TYPE VARCHAR(100)
+  USING subject_classification::text;
+
+-- 2) Move requests off PG enum (_old or live) -> varchar
+ALTER TABLE followup_report_requests
+  ALTER COLUMN subject_classification TYPE VARCHAR(100)
+  USING subject_classification::text;
+
+-- 3) Drop leftover TypeORM enum type if nothing depends on it
+DROP TYPE IF EXISTS maintenance_subject_classification_en_old;
+
+-- 4) Drop orphaned live enum only when no column uses it anymore
+DO $$
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1
+    FROM information_schema.columns
+    WHERE table_schema = 'public'
+      AND udt_name = 'maintenance_subject_classification_en'
+  ) THEN
+    DROP TYPE IF EXISTS maintenance_subject_classification_en;
+  END IF;
+END $$;

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;

package/src/models/FollowUpReportRequestModel.ts

@@ -62,12 +62,7 @@ export class FollowUpReportRequests extends BaseModel {
   @Column({ type: 'varchar', length: 500, nullable: false })
   subject: string;
 
-  @Column({
-    type: 'enum',
-    enum: FollowUpReportSubjectClassification,
-    enumName: 'maintenance_subject_classification_en',
-    nullable: false,
-  })
+  @Column({ type: 'varchar', length: 100, nullable: false })
   subject_classification: FollowUpReportSubjectClassification;
 
   @Column({ type: 'text', nullable: false })