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

package/dist/i18n/workflow-chat-message.builder.d.ts

@@ -77,7 +77,6 @@ export type RequestApprovedAssignedWorkflowParams = {
     employeeId: string | number;
     assigneeLabel?: 'user' | 'technician';
 };
-/** Parse legacy English-only assignment comments used as workflow log suffixes. */
 export declare function tryParseRequestAssignedComment(comment?: string | null): Omit<RequestApprovedAssignedWorkflowParams, 'roleArabicName'> | null;
 /** Bilingual workflow content for approved assignment steps (HR, IT, Tender, etc.). */
 export declare function buildRequestApprovedAssignedWorkflowFields(params: RequestApprovedAssignedWorkflowParams): BilingualText;

package/dist/i18n/workflow-chat-message.builder.js

@@ -178,10 +178,19 @@ function buildSynchronizedWorkflowMessage(ctx) {
             return actorEn
                 ? renderSynchronizedWorkflowMessage('request_approval_pending_from', { name: actorEn }, { name: actorAr })
                 : workflowTemplate('request_approval_pending');
-        case 'approved':
+        case 'approved': {
+            const assignment = tryParseRequestAssignedComment(ctx.comment);
+            if (assignment) {
+                return buildRequestApprovedAssignedWorkflowFields({
+                    ...assignment,
+                    roleName: ctx.roleName?.trim() || assignment.roleName,
+                    roleArabicName: ctx.roleArabicName,
+                });
+            }
             return actorEn
                 ? renderSynchronizedWorkflowMessage('request_approved_by', { name: actorEn, comment: commentWf }, { name: actorAr, comment: commentWf })
                 : renderSynchronizedWorkflowMessage('request_approved', { comment: commentWf }, { comment: commentWf });
+        }
         case 'rejected':
             return actorEn
                 ? renderSynchronizedWorkflowMessage('request_rejected_by', { name: actorEn, comment: commentWf }, { name: actorAr, comment: commentWf })
@@ -236,11 +245,11 @@ function buildSynchronizedChatMessage(ctx) {
     }
 }
 /** Parse legacy English-only assignment comments used as workflow log suffixes. */
-function tryParseRequestAssignedComment(comment) {
-    const text = comment?.trim();
-    if (!text)
+function parseRequestAssignedCommentText(text) {
+    const normalized = text.trim();
+    if (!normalized)
         return null;
-    const technicianMatch = text.match(/^Request assigned to technician (.+?) by (.+?) \((.+?) - (.+?)\)$/);
+    const technicianMatch = normalized.match(/^request assigned to technician (.+?) by (.+?) \((.+?) - (.+?)\)$/i);
     if (technicianMatch) {
         return {
             assignedUserName: technicianMatch[1].trim(),
@@ -250,7 +259,7 @@ function tryParseRequestAssignedComment(comment) {
             assigneeLabel: 'technician',
         };
     }
-    const userMatch = text.match(/^Request assigned to (.+?) by (.+?) \((.+?) - (.+?)\)$/);
+    const userMatch = normalized.match(/^request assigned to (.+?) by (.+?) \((.+?) - (.+?)\)$/i);
     if (userMatch) {
         return {
             assignedUserName: userMatch[1].trim(),
@@ -262,6 +271,36 @@ function tryParseRequestAssignedComment(comment) {
     }
     return null;
 }
+function tryParseRequestAssignedComment(comment) {
+    let text = comment?.trim();
+    if (!text)
+        return null;
+    if (text.startsWith(':')) {
+        text = text.replace(/^:\s*/, '').trim();
+    }
+    const direct = parseRequestAssignedCommentText(text);
+    if (direct)
+        return direct;
+    const colonIdx = text.indexOf(': ');
+    if (colonIdx >= 0) {
+        const afterColon = text.slice(colonIdx + 2).trim();
+        const parsedAfterColon = parseRequestAssignedCommentText(afterColon);
+        if (parsedAfterColon)
+            return parsedAfterColon;
+    }
+    const assignMatch = text.match(/request assigned to/i);
+    if (assignMatch && assignMatch.index != null && assignMatch.index >= 0) {
+        return parseRequestAssignedCommentText(text.slice(assignMatch.index).trim());
+    }
+    return null;
+}
+function buildAssignmentWorkflowFieldsFromActors(assignment, actors) {
+    return buildRequestApprovedAssignedWorkflowFields({
+        ...assignment,
+        roleName: actors?.roleName?.trim() || assignment.roleName,
+        roleArabicName: actors?.roleArabicName ?? null,
+    });
+}
 /** Bilingual workflow content for approved assignment steps (HR, IT, Tender, etc.). */
 function buildRequestApprovedAssignedWorkflowFields(params) {
     const assignedUserEn = params.assignedUserName?.trim() || 'User';
@@ -286,7 +325,8 @@ function buildRequestApprovedAssignedWorkflowFields(params) {
 }
 /** Standard workflow log UPDATE fields for all CAA module repositories. */
 function buildWorkflowLogUpdateFields(params) {
-    if (params.approvalStatus === 'Approved') {
+    const isApprovedLike = params.approvalStatus === 'Approved' || params.approvalStatus === 'Assigned';
+    if (isApprovedLike) {
         const assignment = tryParseRequestAssignedComment(params.comment);
         if (assignment) {
             const bilingual = buildRequestApprovedAssignedWorkflowFields({
@@ -303,7 +343,7 @@ function buildWorkflowLogUpdateFields(params) {
         }
     }
     let action;
-    if (params.approvalStatus === 'Approved')
+    if (params.approvalStatus === 'Approved' || params.approvalStatus === 'Assigned')
         action = 'approved';
     else if (params.approvalStatus === 'Rejected')
         action = 'rejected';
@@ -880,6 +920,10 @@ function resolveWorkflowContentAr(content, actors) {
     if (content == null || content.trim() === '')
         return null;
     const normalized = content.trim();
+    const embeddedAssignment = tryParseRequestAssignedComment(normalized);
+    if (embeddedAssignment) {
+        return buildAssignmentWorkflowFieldsFromActors(embeddedAssignment, actors).ar;
+    }
     for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
         if (tpl.en === normalized || tpl.en.toLowerCase() === normalized.toLowerCase())
             return tpl.ar;
@@ -896,6 +940,10 @@ function resolveWorkflowContentAr(content, actors) {
     if (commentIdx > 0) {
         const baseEn = normalized.slice(0, commentIdx).trim();
         const commentText = normalized.slice(commentIdx + 2).trim();
+        const assignment = tryParseRequestAssignedComment(commentText);
+        if (assignment) {
+            return buildAssignmentWorkflowFieldsFromActors(assignment, actors).ar;
+        }
         const commentSuffix = formatWorkflowCommentSuffix(commentText);
         for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
             if (!tpl.en.includes('{{comment}}'))
@@ -999,7 +1047,7 @@ function enrichWorkflowLog(log) {
         existingAr &&
         resolvedAr &&
         existingAr !== resolvedAr &&
-        /Request assigned to/i.test(existingAr)) {
+        (/request assigned to/i.test(content) || /request assigned to/i.test(existingAr))) {
         content_ar = resolvedAr;
     }
     if (content &&

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.296",
  "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/i18n/workflow-chat-message.builder.ts

@@ -237,7 +237,15 @@ export function buildSynchronizedWorkflowMessage(ctx: WorkflowMessageContext): B
             { name: actorAr },
           )
         : workflowTemplate('request_approval_pending');
-    case 'approved':
+    case 'approved': {
+      const assignment = tryParseRequestAssignedComment(ctx.comment);
+      if (assignment) {
+        return buildRequestApprovedAssignedWorkflowFields({
+          ...assignment,
+          roleName: ctx.roleName?.trim() || assignment.roleName,
+          roleArabicName: ctx.roleArabicName,
+        });
+      }
       return actorEn
         ? renderSynchronizedWorkflowMessage(
             'request_approved_by',
@@ -249,6 +257,7 @@ export function buildSynchronizedWorkflowMessage(ctx: WorkflowMessageContext): B
             { comment: commentWf },
             { comment: commentWf },
           );
+    }
     case 'rejected':
       return actorEn
         ? renderSynchronizedWorkflowMessage(
@@ -354,14 +363,14 @@ export type RequestApprovedAssignedWorkflowParams = {
 };
 
 /** Parse legacy English-only assignment comments used as workflow log suffixes. */
-export function tryParseRequestAssignedComment(
-  comment?: string | null,
+function parseRequestAssignedCommentText(
+  text: string,
 ): Omit<RequestApprovedAssignedWorkflowParams, 'roleArabicName'> | null {
-  const text = comment?.trim();
-  if (!text) return null;
+  const normalized = text.trim();
+  if (!normalized) return null;
 
-  const technicianMatch = text.match(
-    /^Request assigned to technician (.+?) by (.+?) \((.+?) - (.+?)\)$/,
+  const technicianMatch = normalized.match(
+    /^request assigned to technician (.+?) by (.+?) \((.+?) - (.+?)\)$/i,
   );
   if (technicianMatch) {
     return {
@@ -373,7 +382,7 @@ export function tryParseRequestAssignedComment(
     };
   }
 
-  const userMatch = text.match(/^Request assigned to (.+?) by (.+?) \((.+?) - (.+?)\)$/);
+  const userMatch = normalized.match(/^request assigned to (.+?) by (.+?) \((.+?) - (.+?)\)$/i);
   if (userMatch) {
     return {
       assignedUserName: userMatch[1].trim(),
@@ -387,6 +396,45 @@ export function tryParseRequestAssignedComment(
   return null;
 }
 
+export function tryParseRequestAssignedComment(
+  comment?: string | null,
+): Omit<RequestApprovedAssignedWorkflowParams, 'roleArabicName'> | null {
+  let text = comment?.trim();
+  if (!text) return null;
+
+  if (text.startsWith(':')) {
+    text = text.replace(/^:\s*/, '').trim();
+  }
+
+  const direct = parseRequestAssignedCommentText(text);
+  if (direct) return direct;
+
+  const colonIdx = text.indexOf(': ');
+  if (colonIdx >= 0) {
+    const afterColon = text.slice(colonIdx + 2).trim();
+    const parsedAfterColon = parseRequestAssignedCommentText(afterColon);
+    if (parsedAfterColon) return parsedAfterColon;
+  }
+
+  const assignMatch = text.match(/request assigned to/i);
+  if (assignMatch && assignMatch.index != null && assignMatch.index >= 0) {
+    return parseRequestAssignedCommentText(text.slice(assignMatch.index).trim());
+  }
+
+  return null;
+}
+
+function buildAssignmentWorkflowFieldsFromActors(
+  assignment: Omit<RequestApprovedAssignedWorkflowParams, 'roleArabicName'>,
+  actors?: BilingualActorNames,
+): BilingualText {
+  return buildRequestApprovedAssignedWorkflowFields({
+    ...assignment,
+    roleName: actors?.roleName?.trim() || assignment.roleName,
+    roleArabicName: actors?.roleArabicName ?? null,
+  });
+}
+
 /** Bilingual workflow content for approved assignment steps (HR, IT, Tender, etc.). */
 export function buildRequestApprovedAssignedWorkflowFields(
   params: RequestApprovedAssignedWorkflowParams,
@@ -427,7 +475,10 @@ export function buildWorkflowLogUpdateFields(params: {
   roleArabicName?: string | null;
   comment?: string | null;
 }): { content: string; content_ar: string; status: string; status_ar: string | null } {
-  if (params.approvalStatus === 'Approved') {
+  const isApprovedLike =
+    params.approvalStatus === 'Approved' || params.approvalStatus === 'Assigned';
+
+  if (isApprovedLike) {
     const assignment = tryParseRequestAssignedComment(params.comment);
     if (assignment) {
       const bilingual = buildRequestApprovedAssignedWorkflowFields({
@@ -445,7 +496,7 @@ export function buildWorkflowLogUpdateFields(params: {
   }
 
   let action: WorkflowMessageAction;
-  if (params.approvalStatus === 'Approved') action = 'approved';
+  if (params.approvalStatus === 'Approved' || params.approvalStatus === 'Assigned') action = 'approved';
   else if (params.approvalStatus === 'Rejected') action = 'rejected';
   else if (params.approvalStatus === 'Returned for Modification') action = 'returned_for_modification';
   else action = 'approval_pending_update';
@@ -1368,6 +1419,11 @@ export function resolveWorkflowContentAr(
   if (content == null || content.trim() === '') return null;
   const normalized = content.trim();
 
+  const embeddedAssignment = tryParseRequestAssignedComment(normalized);
+  if (embeddedAssignment) {
+    return buildAssignmentWorkflowFieldsFromActors(embeddedAssignment, actors).ar;
+  }
+
   for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
     if (tpl.en === normalized || tpl.en.toLowerCase() === normalized.toLowerCase()) return tpl.ar;
   }
@@ -1383,6 +1439,10 @@ export function resolveWorkflowContentAr(
   if (commentIdx > 0) {
     const baseEn = normalized.slice(0, commentIdx).trim();
     const commentText = normalized.slice(commentIdx + 2).trim();
+    const assignment = tryParseRequestAssignedComment(commentText);
+    if (assignment) {
+      return buildAssignmentWorkflowFieldsFromActors(assignment, actors).ar;
+    }
     const commentSuffix = formatWorkflowCommentSuffix(commentText);
 
     for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
@@ -1502,7 +1562,7 @@ export function enrichWorkflowLog(log: Record<string, unknown>): Record<string,
     existingAr &&
     resolvedAr &&
     existingAr !== resolvedAr &&
-    /Request assigned to/i.test(existingAr)
+    (/request assigned to/i.test(content) || /request assigned to/i.test(existingAr))
   ) {
     content_ar = resolvedAr;
   }

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 })