@platform-modules/civil-aviation-authority 2.3.298 → 2.3.300

package/.env

@@ -2,17 +2,11 @@ DB_HOST=164.52.222.169
 DB_PORT=5432 
 DB_USER=postgres_admin_user
 DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
-DB_NAME=CAA_DEV
+DB_NAME=CAA
 
 
 # DB_HOST=localhost
 # DB_PORT=5432 
 # DB_USER=postgres
 # DB_PASS=stevejobs
-# DB_NAME=CAA
-
-# DB_HOST=10.44.3.201
-# DB_PORT=5432 
-# DB_USER=appuser
-# DB_PASS=HamaCaa7489
-# DB_NAME=caa_prd_db
+# DB_NAME=CAA

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

@@ -58,6 +58,15 @@ export declare function renderSynchronizedWorkflowMessage(templateKey: string, e
 export declare function renderSynchronizedChatMessage(templateKey: string, enParams: Record<string, string>, arParams: Record<string, string>): BilingualText;
 export declare function buildBilingualFromTemplate(templateCatalog: Record<string, BilingualText>, key: string, params?: Record<string, string>, arParams?: Record<string, string>): BilingualText;
 export declare function workflowTemplate(key: string, params?: Record<string, string>, arParams?: Record<string, string>): BilingualText;
+/** Create/submit step for assign-tasks-emp workflow logs. */
+export declare function buildAssignTasksEmpAssignedWorkflowFields(): BilingualText;
+/** Approval step — pending from assigned employee. */
+export declare function buildAssignTasksEmpPendingFromWorkflowFields(params: {
+    userName: string;
+    userArabicName?: string | null;
+}): BilingualText;
+/** Approval step fallback when assignee name is unavailable. */
+export declare function buildAssignTasksEmpPendingWorkflowFields(): BilingualText;
 export declare function chatTemplate(key: string, params?: Record<string, string>, arParams?: Record<string, string>): BilingualText;
 /**
  * Standard entry point for workflow `content` + `content_ar`.

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

@@ -17,6 +17,9 @@ exports.renderSynchronizedWorkflowMessage = renderSynchronizedWorkflowMessage;
 exports.renderSynchronizedChatMessage = renderSynchronizedChatMessage;
 exports.buildBilingualFromTemplate = buildBilingualFromTemplate;
 exports.workflowTemplate = workflowTemplate;
+exports.buildAssignTasksEmpAssignedWorkflowFields = buildAssignTasksEmpAssignedWorkflowFields;
+exports.buildAssignTasksEmpPendingFromWorkflowFields = buildAssignTasksEmpPendingFromWorkflowFields;
+exports.buildAssignTasksEmpPendingWorkflowFields = buildAssignTasksEmpPendingWorkflowFields;
 exports.chatTemplate = chatTemplate;
 exports.buildSynchronizedWorkflowMessage = buildSynchronizedWorkflowMessage;
 exports.buildSynchronizedChatMessage = buildSynchronizedChatMessage;
@@ -154,6 +157,45 @@ function buildBilingualFromTemplate(templateCatalog, key, params = {}, arParams)
 function workflowTemplate(key, params = {}, arParams) {
     return buildBilingualFromTemplate(WORKFLOW_TEMPLATES, key, params, arParams);
 }
+/** Assign-tasks-emp workflow templates (catalog + runtime fallback when dist JSON is stale). */
+const ASSIGN_TASKS_EMP_WF_FALLBACKS = {
+    request_assigned: { en: 'Request Assigned', ar: 'تم تعيين الطلب' },
+    request_pending_from: { en: 'Request Pending from {{name}}', ar: 'الطلب قيد الانتظار من {{name}}' },
+    request_pending: { en: 'Request Pending', ar: 'الطلب قيد الانتظار' },
+};
+function resolveAssignTasksEmpWorkflowTemplate(key, enParams = {}, arParams) {
+    const tpl = WORKFLOW_TEMPLATES[key] ?? ASSIGN_TASKS_EMP_WF_FALLBACKS[key];
+    const arabicParams = arParams ?? enParams;
+    return {
+        en: interpolate(tpl.en, enParams),
+        ar: interpolate(tpl.ar, arabicParams),
+    };
+}
+/** Create/submit step for assign-tasks-emp workflow logs. */
+function buildAssignTasksEmpAssignedWorkflowFields() {
+    return resolveAssignTasksEmpWorkflowTemplate('request_assigned');
+}
+/** Approval step — pending from assigned employee. */
+function buildAssignTasksEmpPendingFromWorkflowFields(params) {
+    const nameEn = params.userName.trim() || 'Unknown User';
+    const nameAr = resolveBilingualName(nameEn, params.userArabicName);
+    return resolveAssignTasksEmpWorkflowTemplate('request_pending_from', { name: nameEn }, { name: nameAr });
+}
+/** Approval step fallback when assignee name is unavailable. */
+function buildAssignTasksEmpPendingWorkflowFields() {
+    return resolveAssignTasksEmpWorkflowTemplate('request_pending');
+}
+function resolveStoredAssignTasksEmpTemplateKey(content, actors) {
+    const normalized = content?.trim();
+    if (!normalized || !(normalized in ASSIGN_TASKS_EMP_WF_FALLBACKS))
+        return null;
+    if (normalized === 'request_pending_from') {
+        const nameEn = actors?.userName?.trim() || 'Unknown User';
+        const nameAr = resolveArabicWorkflowActorName(actors, nameEn);
+        return resolveAssignTasksEmpWorkflowTemplate('request_pending_from', { name: nameEn }, { name: nameAr });
+    }
+    return resolveAssignTasksEmpWorkflowTemplate(normalized);
+}
 function chatTemplate(key, params = {}, arParams) {
     return buildBilingualFromTemplate(CHAT_TEMPLATES, key, params, arParams);
 }
@@ -1144,6 +1186,9 @@ function resolveWorkflowContentAr(content, actors) {
     if (content == null || content.trim() === '')
         return null;
     const normalized = content.trim();
+    const assignTasksEmpFromKey = resolveStoredAssignTasksEmpTemplateKey(normalized, actors);
+    if (assignTasksEmpFromKey)
+        return assignTasksEmpFromKey.ar;
     const embeddedAssignment = tryParseRequestAssignedComment(normalized);
     if (embeddedAssignment) {
         return buildAssignmentWorkflowFieldsFromActors(embeddedAssignment, actors).ar;
@@ -1269,9 +1314,11 @@ function isSystemGeneratedChatMessage(message, actors) {
 /** Generic workflow log enricher — use in all module repositories. */
 function enrichWorkflowLog(log) {
     const status = log.status != null ? String(log.status) : null;
-    const content = log.content != null ? String(log.content) : null;
+    const rawContent = log.content != null ? String(log.content) : null;
     const actors = extractBilingualActorsFromRecord(log);
-    const resolvedAr = resolveWorkflowContentAr(content, actors);
+    const assignTasksEmpResolved = resolveStoredAssignTasksEmpTemplateKey(rawContent, actors);
+    const content = assignTasksEmpResolved?.en ?? rawContent;
+    const resolvedAr = assignTasksEmpResolved?.ar ?? resolveWorkflowContentAr(content, actors);
     const existingAr = log.content_ar != null && String(log.content_ar).trim() !== ''
         ? String(log.content_ar)
         : null;
@@ -1341,8 +1388,12 @@ function enrichWorkflowLog(log) {
         if (notificationAr)
             content_ar = notificationAr;
     }
+    if (assignTasksEmpResolved) {
+        content_ar = assignTasksEmpResolved.ar;
+    }
     return {
         ...log,
+        ...(content !== rawContent ? { content } : {}),
         content_ar,
         status_ar: log.status_ar ?? resolveWorkflowStatusAr(status),
     };

package/dist/models/FollowUpReportRequestModel.js

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

package/package.json

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

package/scripts/run-enum-fix.js

@@ -1,30 +1,51 @@
-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');
+function loadEnv() {
+  try {
+    require('dotenv').config({ path: path.join(__dirname, '..', '.env') });
+  } catch {
+    // dotenv is optional at runtime if env vars are already set
+  }
+}
 
-  const client = new Client({
+function getDbConfig() {
+  const config = {
     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,
-  });
+  };
+
+  const missing = ['DB_HOST', 'DB_USER', 'DB_PASS', 'DB_NAME'].filter((key) => !process.env[key]);
+  if (missing.length > 0) {
+    throw new Error(
+      `Missing database env vars in shared_models/.env: ${missing.join(', ')}`,
+    );
+  }
+
+  return config;
+}
+
+async function main() {
+  loadEnv();
+
+  const sqlPath = path.join(__dirname, '..', 'sql', 'fix_maintenance_subject_classification_enum_2026_07.sql');
+  const sql = fs.readFileSync(sqlPath, 'utf8');
+  const client = new Client(getDbConfig());
 
   await client.connect();
   try {
     await client.query(sql);
-    console.log('✅ Enum repair SQL applied successfully.');
+    console.log('Enum repair SQL applied successfully.');
   } finally {
     await client.end();
   }
 }
 
 main().catch((error) => {
-  console.error('❌ Enum repair failed:', error.message);
+  console.error('Enum repair failed:', error.message);
   process.exit(1);
 });

package/sql/caa_api_payload_changes_2026_07.sql

@@ -32,13 +32,62 @@ ALTER TABLE cyber_security_risk_management_risks
   ADD COLUMN IF NOT EXISTS action TEXT;
 
 -- 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;
+DO $$
+BEGIN
+  IF EXISTS (
+    SELECT 1 FROM information_schema.tables
+    WHERE table_schema = 'public' AND table_name = 'followup_report_requests'
+  ) THEN
+    IF NOT EXISTS (
+      SELECT 1 FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_requests'
+        AND column_name = 'subject_classification'
+    ) THEN
+      ALTER TABLE followup_report_requests
+        ADD COLUMN subject_classification VARCHAR(100);
+    END IF;
+
+    BEGIN
+      ALTER TABLE followup_report_requests
+        ALTER COLUMN subject_classification TYPE VARCHAR(100)
+        USING COALESCE(subject_classification::text, 'Normal');
+    EXCEPTION WHEN OTHERS THEN NULL;
+    END;
+
+    UPDATE followup_report_requests
+    SET subject_classification = 'Normal'
+    WHERE subject_classification IS NULL OR TRIM(subject_classification) = '';
+
+    ALTER TABLE followup_report_requests
+      ALTER COLUMN subject_classification SET DEFAULT 'Normal';
 
-ALTER TABLE followup_report_requests
-  ALTER COLUMN subject_classification TYPE VARCHAR(100)
-  USING subject_classification::text;
+    ALTER TABLE followup_report_requests
+      ALTER COLUMN subject_classification SET NOT NULL;
+  END IF;
+
+  IF EXISTS (
+    SELECT 1 FROM information_schema.tables
+    WHERE table_schema = 'public' AND table_name = 'followup_report_items'
+  ) THEN
+    IF NOT EXISTS (
+      SELECT 1 FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_items'
+        AND column_name = 'subject_classification'
+    ) THEN
+      ALTER TABLE followup_report_items
+        ADD COLUMN subject_classification VARCHAR(100);
+    END IF;
+
+    BEGIN
+      ALTER TABLE followup_report_items
+        ALTER COLUMN subject_classification TYPE VARCHAR(100)
+        USING subject_classification::text;
+    EXCEPTION WHEN OTHERS THEN NULL;
+    END;
+  END IF;
+END $$;
 
 DROP TYPE IF EXISTS maintenance_subject_classification_en_old;
 

package/sql/fix_maintenance_subject_classification_enum_2026_07.sql

@@ -1,20 +1,76 @@
--- Repair stuck TypeORM enum swap for follow-up report subject_classification.
--- Safe to re-run.
+-- Repair follow-up report subject_classification for TypeORM schema sync.
+-- Safe to re-run. Skips tables/columns that do not exist yet.
 
--- 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 information_schema.tables
+    WHERE table_schema = 'public'
+      AND table_name = 'followup_report_requests'
+  ) THEN
+    IF NOT EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_requests'
+        AND column_name = 'subject_classification'
+    ) THEN
+      ALTER TABLE followup_report_requests
+        ADD COLUMN subject_classification VARCHAR(100);
+    END IF;
+
+    BEGIN
+      ALTER TABLE followup_report_requests
+        ALTER COLUMN subject_classification TYPE VARCHAR(100)
+        USING COALESCE(subject_classification::text, 'Normal');
+    EXCEPTION
+      WHEN OTHERS THEN
+        NULL;
+    END;
+
+    UPDATE followup_report_requests
+    SET subject_classification = 'Normal'
+    WHERE subject_classification IS NULL
+       OR TRIM(subject_classification) = '';
+
+    ALTER TABLE followup_report_requests
+      ALTER COLUMN subject_classification SET DEFAULT 'Normal';
 
--- 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;
+    ALTER TABLE followup_report_requests
+      ALTER COLUMN subject_classification SET NOT NULL;
+  END IF;
+
+  IF EXISTS (
+    SELECT 1
+    FROM information_schema.tables
+    WHERE table_schema = 'public'
+      AND table_name = 'followup_report_items'
+  ) THEN
+    IF NOT EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_items'
+        AND column_name = 'subject_classification'
+    ) THEN
+      ALTER TABLE followup_report_items
+        ADD COLUMN subject_classification VARCHAR(100);
+    END IF;
+
+    BEGIN
+      ALTER TABLE followup_report_items
+        ALTER COLUMN subject_classification TYPE VARCHAR(100)
+        USING subject_classification::text;
+    EXCEPTION
+      WHEN OTHERS THEN
+        NULL;
+    END;
+  END IF;
+END $$;
 
--- 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 (

package/src/i18n/workflow-chat-message.builder.ts

@@ -199,6 +199,70 @@ export function workflowTemplate(
   return buildBilingualFromTemplate(WORKFLOW_TEMPLATES, key, params, arParams);
 }
 
+/** Assign-tasks-emp workflow templates (catalog + runtime fallback when dist JSON is stale). */
+const ASSIGN_TASKS_EMP_WF_FALLBACKS = {
+  request_assigned: { en: 'Request Assigned', ar: 'تم تعيين الطلب' },
+  request_pending_from: { en: 'Request Pending from {{name}}', ar: 'الطلب قيد الانتظار من {{name}}' },
+  request_pending: { en: 'Request Pending', ar: 'الطلب قيد الانتظار' },
+} as const;
+
+type AssignTasksEmpWorkflowTemplateKey = keyof typeof ASSIGN_TASKS_EMP_WF_FALLBACKS;
+
+function resolveAssignTasksEmpWorkflowTemplate(
+  key: AssignTasksEmpWorkflowTemplateKey,
+  enParams: Record<string, string> = {},
+  arParams?: Record<string, string>,
+): BilingualText {
+  const tpl = WORKFLOW_TEMPLATES[key] ?? ASSIGN_TASKS_EMP_WF_FALLBACKS[key];
+  const arabicParams = arParams ?? enParams;
+  return {
+    en: interpolate(tpl.en, enParams),
+    ar: interpolate(tpl.ar, arabicParams),
+  };
+}
+
+/** Create/submit step for assign-tasks-emp workflow logs. */
+export function buildAssignTasksEmpAssignedWorkflowFields(): BilingualText {
+  return resolveAssignTasksEmpWorkflowTemplate('request_assigned');
+}
+
+/** Approval step — pending from assigned employee. */
+export function buildAssignTasksEmpPendingFromWorkflowFields(params: {
+  userName: string;
+  userArabicName?: string | null;
+}): BilingualText {
+  const nameEn = params.userName.trim() || 'Unknown User';
+  const nameAr = resolveBilingualName(nameEn, params.userArabicName);
+  return resolveAssignTasksEmpWorkflowTemplate(
+    'request_pending_from',
+    { name: nameEn },
+    { name: nameAr },
+  );
+}
+
+/** Approval step fallback when assignee name is unavailable. */
+export function buildAssignTasksEmpPendingWorkflowFields(): BilingualText {
+  return resolveAssignTasksEmpWorkflowTemplate('request_pending');
+}
+
+function resolveStoredAssignTasksEmpTemplateKey(
+  content: string | null | undefined,
+  actors?: BilingualActorNames,
+): BilingualText | null {
+  const normalized = content?.trim();
+  if (!normalized || !(normalized in ASSIGN_TASKS_EMP_WF_FALLBACKS)) return null;
+  if (normalized === 'request_pending_from') {
+    const nameEn = actors?.userName?.trim() || 'Unknown User';
+    const nameAr = resolveArabicWorkflowActorName(actors, nameEn);
+    return resolveAssignTasksEmpWorkflowTemplate(
+      'request_pending_from',
+      { name: nameEn },
+      { name: nameAr },
+    );
+  }
+  return resolveAssignTasksEmpWorkflowTemplate(normalized as AssignTasksEmpWorkflowTemplateKey);
+}
+
 export function chatTemplate(
   key: string,
   params: Record<string, string> = {},
@@ -1746,6 +1810,9 @@ export function resolveWorkflowContentAr(
   if (content == null || content.trim() === '') return null;
   const normalized = content.trim();
 
+  const assignTasksEmpFromKey = resolveStoredAssignTasksEmpTemplateKey(normalized, actors);
+  if (assignTasksEmpFromKey) return assignTasksEmpFromKey.ar;
+
   const embeddedAssignment = tryParseRequestAssignedComment(normalized);
   if (embeddedAssignment) {
     return buildAssignmentWorkflowFieldsFromActors(embeddedAssignment, actors).ar;
@@ -1885,9 +1952,11 @@ export function isSystemGeneratedChatMessage(
 /** Generic workflow log enricher — use in all module repositories. */
 export function enrichWorkflowLog(log: Record<string, unknown>): Record<string, unknown> {
   const status = log.status != null ? String(log.status) : null;
-  const content = log.content != null ? String(log.content) : null;
+  const rawContent = log.content != null ? String(log.content) : null;
   const actors = extractBilingualActorsFromRecord(log);
-  const resolvedAr = resolveWorkflowContentAr(content, actors);
+  const assignTasksEmpResolved = resolveStoredAssignTasksEmpTemplateKey(rawContent, actors);
+  const content = assignTasksEmpResolved?.en ?? rawContent;
+  const resolvedAr = assignTasksEmpResolved?.ar ?? resolveWorkflowContentAr(content, actors);
   const existingAr =
     log.content_ar != null && String(log.content_ar).trim() !== ''
       ? String(log.content_ar)
@@ -1970,8 +2039,12 @@ export function enrichWorkflowLog(log: Record<string, unknown>): Record<string,
     const notificationAr = resolveWorkflowContentAr(content, actors);
     if (notificationAr) content_ar = notificationAr;
   }
+  if (assignTasksEmpResolved) {
+    content_ar = assignTasksEmpResolved.ar;
+  }
   return {
     ...log,
+    ...(content !== rawContent ? { content } : {}),
     content_ar,
     status_ar: log.status_ar ?? resolveWorkflowStatusAr(status),
   };

package/src/models/FollowUpReportRequestModel.ts

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