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

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.294",
+  "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,51 +31,29 @@ 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;
 
--- 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;
+ALTER TABLE followup_report_requests
+  ALTER COLUMN subject_classification TYPE VARCHAR(100)
+  USING subject_classification::text;
 
-    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 IF EXISTS maintenance_subject_classification_en_old;
 
-    DROP TYPE 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 $$;
 
--- 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

@@ -1,48 +1,28 @@
--- Run this BEFORE shared_models synchronize if you see:
---   cannot drop type maintenance_subject_classification_en_old because other objects depend on it
---
+-- Repair stuck TypeORM enum swap for follow-up report subject_classification.
 -- 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';
+-- 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;
 
-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;
+-- 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;
 
-    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;
+-- 3) Drop leftover TypeORM enum type if nothing depends on it
+DROP TYPE IF EXISTS maintenance_subject_classification_en_old;
 
-    DROP TYPE 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 $$;
-
--- 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/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 })