@platform-modules/civil-aviation-authority 2.3.310 → 2.3.311

package/dist/data-source.js

@@ -256,6 +256,7 @@ const SlaMyRequestsViewModel_1 = require("./models/SlaMyRequestsViewModel");
 const SlaApprovalsViewModel_1 = require("./models/SlaApprovalsViewModel");
 const ServiceSlaApprovalModel_1 = require("./models/ServiceSlaApprovalModel");
 const SlaConfigModel_1 = require("./models/SlaConfigModel");
+const ChatbotQnsAnsMappingModel_1 = require("./models/ChatbotQnsAnsMappingModel");
 const CSRMBusinessImpactRatingMasterModel_1 = require("./models/CSRMBusinessImpactRatingMasterModel");
 const CSRMLikelihoodMasterModel_1 = require("./models/CSRMLikelihoodMasterModel");
 const LocationModel_1 = require("./models/LocationModel");
@@ -579,6 +580,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         SlaApprovalsViewModel_1.SlaApprovalsView,
         ServiceSlaApprovalModel_1.ServiceSlaApproval,
         SlaConfigModel_1.SlaConfig,
+        ChatbotQnsAnsMappingModel_1.ChatbotQnsAnsMapping,
         CSRMBusinessImpactRatingMasterModel_1.CSRMBusinessImpactRatingMaster,
         CSRMLikelihoodMasterModel_1.CSRMLikelihoodMaster,
         LocationModel_1.Location,

package/dist/i18n/workflow-chat-i18n.json

@@ -309,6 +309,14 @@
     "logistics_actual_return_updated": {
       "en": "{{roleName}} updated the Vehicle Actual Return Date, Time, and Reason. Actual Return Date: {{date}}, Actual Return Time: {{time}}, Reason: {{reason}}",
       "ar": "قام {{roleName}} بتحديث تاريخ الإرجاع الفعلي للمركبة والوقت والسبب. تاريخ الإرجاع الفعلي: {{date}}، وقت الإرجاع الفعلي: {{time}}، السبب: {{reason}}"
+    },
+    "pending_with_user": {
+      "en": "Pending with {{userName}} ({{employeeId}})",
+      "ar": "قيد الانتظار لدى {{userName}} ({{employeeId}})"
+    },
+    "pending_with_role": {
+      "en": "Pending with {{roleName}}",
+      "ar": "قيد الانتظار لدى {{roleName}}"
     }
   },
   "notificationTemplates": {

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

@@ -348,7 +348,7 @@ export declare function buildItHelpdeskCloseNotificationMessage(params: {
     status: 'Approved' | 'Rejected';
 }): BilingualText;
 export declare function resolveWorkflowStatusAr(status: string | null | undefined): string | null;
-export declare function resolveChatStatusAr(status: string | null | undefined): string | null;
+export declare function resolveChatStatusAr(status: string | null | undefined, actors?: BilingualActorNames): string | null;
 /** Pull bilingual actor fields from joined relations on workflow/chat rows. */
 export declare function extractBilingualActorsFromRecord(record: Record<string, unknown>): BilingualActorNames;
 export declare function resolveWorkflowContentAr(content: string | null | undefined, actors?: BilingualActorNames): string | null;

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

@@ -951,10 +951,28 @@ function resolveWorkflowStatusAr(status) {
         return null;
     return WORKFLOW_STATUS_LABELS[status] ?? status;
 }
-function resolveChatStatusAr(status) {
+function resolveChatStatusAr(status, actors) {
     if (status == null || status === '')
         return null;
-    return CHAT_STATUS_LABELS[status] ?? status;
+    const labeled = CHAT_STATUS_LABELS[status];
+    if (labeled)
+        return labeled;
+    const normalized = status.trim();
+    const pendingWithUserTpl = CHAT_TEMPLATES.pending_with_user;
+    if (pendingWithUserTpl) {
+        const params = matchTemplateMessage(pendingWithUserTpl.en, normalized);
+        if (params) {
+            return interpolate(pendingWithUserTpl.ar, buildArabicChatTemplateParams(params, actors));
+        }
+    }
+    const pendingWithRoleTpl = CHAT_TEMPLATES.pending_with_role;
+    if (pendingWithRoleTpl) {
+        const params = matchTemplateMessage(pendingWithRoleTpl.en, normalized);
+        if (params) {
+            return interpolate(pendingWithRoleTpl.ar, buildArabicChatTemplateParams(params, actors));
+        }
+    }
+    return status;
 }
 // ─── Legacy row enrichment (read API) ────────────────────────────────────────
 /** Pull bilingual actor fields from joined relations on workflow/chat rows. */
@@ -1599,7 +1617,7 @@ function enrichChatMessage(chat) {
     return {
         ...chat,
         message_ar: chat.message_ar ?? resolveChatMessageAr(message, actors),
-        status_ar: chat.status_ar ?? resolveChatStatusAr(status),
+        status_ar: chat.status_ar ?? resolveChatStatusAr(status, actors),
     };
 }
 /** @deprecated Use enrichWorkflowLog */

package/dist/index.d.ts

@@ -414,6 +414,7 @@ export * from './models/RequestTenderAnalysisRequestModel';
 export * from './models/ContractServiceRequestModel';
 export * from './models/ContractServiceRequestDocumentModel';
 export * from './models/SlaConfigModel';
+export * from './models/ChatbotQnsAnsMappingModel';
 export * from './models/SlaRequestModel';
 export * from './models/SlaMyRequestsViewModel';
 export * from './models/SlaApprovalsViewModel';

package/dist/index.js

@@ -603,6 +603,7 @@ __exportStar(require("./models/RequestTenderAnalysisRequestModel"), exports);
 __exportStar(require("./models/ContractServiceRequestModel"), exports);
 __exportStar(require("./models/ContractServiceRequestDocumentModel"), exports);
 __exportStar(require("./models/SlaConfigModel"), exports);
+__exportStar(require("./models/ChatbotQnsAnsMappingModel"), exports);
 __exportStar(require("./models/SlaRequestModel"), exports);
 __exportStar(require("./models/SlaMyRequestsViewModel"), exports);
 __exportStar(require("./models/SlaApprovalsViewModel"), exports);

package/dist/models/ChatbotQnsAnsMappingModel.d.ts

@@ -0,0 +1,8 @@
+import { BaseModel } from "./BaseModel";
+export declare class ChatbotQnsAnsMapping extends BaseModel {
+    service_id: number;
+    sub_service_id: number;
+    question: Record<string, unknown> | unknown[];
+    answer: Record<string, unknown> | unknown[];
+    constructor();
+}

package/dist/models/ChatbotQnsAnsMappingModel.js

@@ -0,0 +1,40 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChatbotQnsAnsMapping = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ChatbotQnsAnsMapping = class ChatbotQnsAnsMapping extends BaseModel_1.BaseModel {
+    constructor() {
+        super();
+    }
+};
+exports.ChatbotQnsAnsMapping = ChatbotQnsAnsMapping;
+__decorate([
+    (0, typeorm_1.Column)({ type: "int", nullable: false }),
+    __metadata("design:type", Number)
+], ChatbotQnsAnsMapping.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "int", nullable: false }),
+    __metadata("design:type", Number)
+], ChatbotQnsAnsMapping.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "jsonb", nullable: false }),
+    __metadata("design:type", Object)
+], ChatbotQnsAnsMapping.prototype, "question", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "jsonb", nullable: false }),
+    __metadata("design:type", Object)
+], ChatbotQnsAnsMapping.prototype, "answer", void 0);
+exports.ChatbotQnsAnsMapping = ChatbotQnsAnsMapping = __decorate([
+    (0, typeorm_1.Entity)({ name: "chatbot_qns_ans_mapping" }),
+    __metadata("design:paramtypes", [])
+], ChatbotQnsAnsMapping);

package/package.json

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

package/sql/create_chatbot_qns_ans_mapping.sql

@@ -0,0 +1,25 @@
+-- Chatbot Q&A mapping master table (User Service)
+-- PostgreSQL
+
+CREATE TABLE IF NOT EXISTS chatbot_qns_ans_mapping (
+    id SERIAL PRIMARY KEY,
+    service_id INTEGER NOT NULL,
+    sub_service_id INTEGER NOT NULL,
+    question JSONB NOT NULL,
+    answer JSONB NOT NULL,
+    created_by INTEGER NULL,
+    created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
+    updated_by INTEGER NULL,
+    updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
+    is_deleted BOOLEAN DEFAULT FALSE
+);
+
+CREATE INDEX IF NOT EXISTS idx_chatbot_qns_ans_mapping_service_sub_service
+    ON chatbot_qns_ans_mapping (service_id, sub_service_id)
+    WHERE is_deleted = FALSE;
+
+CREATE INDEX IF NOT EXISTS idx_chatbot_qns_ans_mapping_question_gin
+    ON chatbot_qns_ans_mapping USING GIN (question);
+
+CREATE INDEX IF NOT EXISTS idx_chatbot_qns_ans_mapping_answer_gin
+    ON chatbot_qns_ans_mapping USING GIN (answer);

package/sql/sla_reports_admin_procedures.sql

@@ -19,13 +19,15 @@ $$;
 -- Admin list views: served by Reports_Service TypeORM (sla-my-requests-view.query.ts, sla-approvals-view.query.ts)
 
 -- ---------------------------------------------------------------------------
--- ADMIN — my requests Excel (optional p_target_user_id)
+-- ADMIN — my requests Excel (optional p_target_user_ids INT[])
 -- Per sub-service Requests + Approvals sheets (same as user my-requests download)
 -- ---------------------------------------------------------------------------
 DROP FUNCTION IF EXISTS sp_sla_admin_my_requests_excel_export(INT, INT[], INT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS sp_sla_admin_my_requests_excel_export(INT, INT[], INT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS sp_sla_admin_my_requests_excel_export(INT[], INT[], INT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT, TEXT);
 
 CREATE OR REPLACE FUNCTION sp_sla_admin_my_requests_excel_export(
-  p_target_user_id    INT      DEFAULT NULL,
+  p_target_user_ids   INT[]    DEFAULT NULL,
   p_service_ids       INT[]    DEFAULT NULL,
   p_sub_service_ids   INT[]    DEFAULT NULL,
   p_statuses          TEXT[]   DEFAULT ARRAY['Pending','In Progress','Approved','Rejected'],
@@ -65,10 +67,21 @@ DECLARE
   v_k                 TEXT;
   v_sheet_order       INT := 0;
   v_user_filter       TEXT;
+  v_user_scope        TEXT;
 BEGIN
+  IF p_target_user_ids IS NULL OR cardinality(p_target_user_ids) = 0 THEN
+    v_user_scope := 'TRUE';
+  ELSE
+    -- Validated positive ints from app; format as int array literal for ANY()
+    v_user_scope := format(
+      'v.user_id = ANY (ARRAY[%s]::int[])',
+      array_to_string(p_target_user_ids, ',')
+    );
+  END IF;
+
   v_user_filter := format(
     '(%s) AND (%s)',
-    CASE WHEN p_target_user_id IS NULL THEN 'TRUE' ELSE format('v.user_id = %s', p_target_user_id) END,
+    v_user_scope,
     COALESCE(NULLIF(trim(p_extra_filter_sql), ''), 'TRUE')
   );
 
@@ -256,15 +269,21 @@ $$;
 
 -- ---------------------------------------------------------------------------
 -- ADMIN — approvals Excel
--- Per sub-service Requests + Approvals; optional approver_user_id (NULL = all queues)
+-- Per sub-service Requests + Approvals; optional approver user id(s) (NULL/empty = all queues)
 -- Does not exclude own requests (unlike user approvals download)
 -- ---------------------------------------------------------------------------
 DROP FUNCTION IF EXISTS sp_sla_admin_approvals_excel_export(
   INT, INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT
 );
+DROP FUNCTION IF EXISTS sp_sla_admin_approvals_excel_export(
+  INT, INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT, TEXT
+);
+DROP FUNCTION IF EXISTS sp_sla_admin_approvals_excel_export(
+  INT[], INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT, TEXT
+);
 
 CREATE OR REPLACE FUNCTION sp_sla_admin_approvals_excel_export(
-  p_target_approver_user_id INT      DEFAULT NULL,
+  p_target_approver_user_ids INT[]   DEFAULT NULL,
   p_service_ids             INT[]    DEFAULT NULL,
   p_sub_service_ids         INT[]    DEFAULT NULL,
   p_request_statuses        TEXT[]   DEFAULT ARRAY['Pending','In Progress','Approved','Rejected'],
@@ -283,7 +302,7 @@ LANGUAGE plpgsql
 STABLE
 AS $$
 DECLARE
-  v_exists TEXT := sla_approval_queue_exists_sql_optional(p_target_approver_user_id);
+  v_exists TEXT := sla_approval_queue_exists_sql_any(p_target_approver_user_ids);
   v_own    TEXT := COALESCE(NULLIF(trim(p_extra_filter_sql), ''), 'TRUE');
 BEGIN
   RETURN QUERY

package/sql/sla_reports_approvals_workbook.sql

@@ -96,6 +96,53 @@ AS $$
   END;
 $$;
 
+-- Admin: any of multiple approver user ids (NULL/empty = all queues)
+CREATE OR REPLACE FUNCTION sla_approval_queue_exists_sql_any(p_user_ids INT[])
+RETURNS TEXT
+LANGUAGE plpgsql
+STABLE
+AS $$
+DECLARE
+  v_id INT;
+  v_parts TEXT[] := ARRAY[]::TEXT[];
+  v_match TEXT;
+BEGIN
+  IF p_user_ids IS NULL OR cardinality(p_user_ids) = 0 THEN
+    RETURN sla_approval_queue_exists_sql_optional(NULL);
+  END IF;
+
+  IF cardinality(p_user_ids) = 1 THEN
+    RETURN sla_approval_queue_exists_sql(p_user_ids[1]);
+  END IF;
+
+  FOREACH v_id IN ARRAY p_user_ids LOOP
+    IF v_id IS NOT NULL AND v_id > 0 THEN
+      v_parts := array_append(v_parts, '(' || sla_approval_matches_user('appr', v_id) || ')');
+    END IF;
+  END LOOP;
+
+  IF cardinality(v_parts) = 0 THEN
+    RETURN sla_approval_queue_exists_sql_optional(NULL);
+  END IF;
+
+  v_match := array_to_string(v_parts, ' OR ');
+
+  RETURN format(
+    'EXISTS (
+      SELECT 1
+      FROM sla_approval appr
+      WHERE appr.request_id = sr.request_id
+        AND COALESCE(appr.is_deleted, false) = false
+        AND (appr.service_id = sr.service_id OR appr.service_id IS NULL)
+        AND (appr.sub_service_id = sr.sub_service_id OR appr.sub_service_id IS NULL)
+        AND (%s)
+        AND (appr.approval_status = ANY($1) OR appr.approval_status IS NULL)
+    )',
+    v_match
+  );
+END;
+$$;
+
 DROP FUNCTION IF EXISTS sp_sla_approvals_workbook_excel_export(
   TEXT, TEXT, INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT
 );

package/sql/user_role_department_section_validation.sql

@@ -0,0 +1,214 @@
+-- =============================================================================
+-- User Role – Department / Section Data Validation
+-- =============================================================================
+-- Purpose:
+--   Identify user_role rows whose department_id and/or section_id reference
+--   master records that are missing or soft-deleted (is_deleted = true).
+--
+-- Database: PostgreSQL (CAA / FM User Service schema)
+-- Tables:   user_role, departments, sections
+--
+-- Usage:
+--   psql -U <user> -d <database> -f shared_models/sql/user_role_department_section_validation.sql
+--
+-- Notes:
+--   * department_id / section_id may be NULL on user_role; NULL is treated as
+--     "not assigned" and is not flagged unless an ID is present but invalid.
+--   * Soft-deleted user_role rows are included by default (see filter comment).
+-- =============================================================================
+
+-- -----------------------------------------------------------------------------
+-- 1) Detailed invalid records with reason
+-- -----------------------------------------------------------------------------
+WITH validated AS (
+    SELECT
+        ur.id                          AS user_role_id,
+        ur.role_id,
+        ur.user_id,
+        ur.department_id,
+        ur.section_id,
+        ur.is_active,
+        COALESCE(ur.is_deleted, false) AS user_role_is_deleted,
+        ur.created_at,
+        ur.updated_at,
+
+        r.name                         AS role_name,
+        u.employee_name                AS user_name,
+        u.email                        AS user_email,
+
+        d.id                           AS department_master_id,
+        d.department_name,
+        COALESCE(d.is_deleted, false)  AS department_is_deleted,
+
+        s.id                           AS section_master_id,
+        s.section_name,
+        COALESCE(s.is_deleted, false)  AS section_is_deleted,
+
+        CASE
+            WHEN ur.department_id IS NULL THEN 'NOT_APPLICABLE'
+            WHEN d.id IS NULL THEN 'DEPARTMENT_NOT_FOUND'
+            WHEN COALESCE(d.is_deleted, false) = true THEN 'DEPARTMENT_DELETED'
+            ELSE 'VALID'
+        END AS department_status,
+
+        CASE
+            WHEN ur.section_id IS NULL THEN 'NOT_APPLICABLE'
+            WHEN s.id IS NULL THEN 'SECTION_NOT_FOUND'
+            WHEN COALESCE(s.is_deleted, false) = true THEN 'SECTION_DELETED'
+            ELSE 'VALID'
+        END AS section_status
+
+    FROM user_role ur
+    LEFT JOIN role r
+        ON r.id = ur.role_id
+    LEFT JOIN users u
+        ON u.id = ur.user_id
+    LEFT JOIN departments d
+        ON d.id = ur.department_id
+    LEFT JOIN sections s
+        ON s.id = ur.section_id
+    -- Uncomment to restrict to active user_role rows only:
+    -- WHERE COALESCE(ur.is_deleted, false) = false
+)
+SELECT
+    user_role_id,
+    role_id,
+    role_name,
+    user_id,
+    user_name,
+    user_email,
+    department_id,
+    department_name,
+    section_id,
+    section_name,
+    is_active,
+    user_role_is_deleted,
+    department_status,
+    section_status,
+    CASE
+        WHEN department_status IN ('DEPARTMENT_NOT_FOUND', 'DEPARTMENT_DELETED')
+         AND section_status IN ('SECTION_NOT_FOUND', 'SECTION_DELETED')
+            THEN 'INVALID_DEPARTMENT_AND_SECTION'
+        WHEN department_status IN ('DEPARTMENT_NOT_FOUND', 'DEPARTMENT_DELETED')
+            THEN 'INVALID_DEPARTMENT'
+        WHEN section_status IN ('SECTION_NOT_FOUND', 'SECTION_DELETED')
+            THEN 'INVALID_SECTION'
+    END AS invalid_reason,
+    CASE
+        WHEN department_status IN ('DEPARTMENT_NOT_FOUND', 'DEPARTMENT_DELETED')
+         AND section_status IN ('SECTION_NOT_FOUND', 'SECTION_DELETED')
+            THEN department_status || ' | ' || section_status
+        WHEN department_status IN ('DEPARTMENT_NOT_FOUND', 'DEPARTMENT_DELETED')
+            THEN department_status
+        WHEN section_status IN ('SECTION_NOT_FOUND', 'SECTION_DELETED')
+            THEN section_status
+    END AS invalid_reason_detail,
+    created_at,
+    updated_at
+FROM validated
+WHERE
+    department_status IN ('DEPARTMENT_NOT_FOUND', 'DEPARTMENT_DELETED')
+    OR section_status IN ('SECTION_NOT_FOUND', 'SECTION_DELETED')
+ORDER BY
+    invalid_reason,
+    user_role_id;
+
+
+-- -----------------------------------------------------------------------------
+-- 2) Summary counts by invalidity category
+-- -----------------------------------------------------------------------------
+WITH validated AS (
+    SELECT
+        ur.id AS user_role_id,
+        CASE
+            WHEN ur.department_id IS NULL THEN 'NOT_APPLICABLE'
+            WHEN d.id IS NULL THEN 'DEPARTMENT_NOT_FOUND'
+            WHEN COALESCE(d.is_deleted, false) = true THEN 'DEPARTMENT_DELETED'
+            ELSE 'VALID'
+        END AS department_status,
+        CASE
+            WHEN ur.section_id IS NULL THEN 'NOT_APPLICABLE'
+            WHEN s.id IS NULL THEN 'SECTION_NOT_FOUND'
+            WHEN COALESCE(s.is_deleted, false) = true THEN 'SECTION_DELETED'
+            ELSE 'VALID'
+        END AS section_status
+    FROM user_role ur
+    LEFT JOIN departments d ON d.id = ur.department_id
+    LEFT JOIN sections s ON s.id = ur.section_id
+    -- Uncomment to restrict to active user_role rows only:
+    -- WHERE COALESCE(ur.is_deleted, false) = false
+),
+invalid AS (
+    SELECT
+        user_role_id,
+        CASE
+            WHEN department_status IN ('DEPARTMENT_NOT_FOUND', 'DEPARTMENT_DELETED')
+             AND section_status IN ('SECTION_NOT_FOUND', 'SECTION_DELETED')
+                THEN 'INVALID_DEPARTMENT_AND_SECTION'
+            WHEN department_status IN ('DEPARTMENT_NOT_FOUND', 'DEPARTMENT_DELETED')
+                THEN 'INVALID_DEPARTMENT'
+            WHEN section_status IN ('SECTION_NOT_FOUND', 'SECTION_DELETED')
+                THEN 'INVALID_SECTION'
+        END AS invalid_reason,
+        department_status,
+        section_status
+    FROM validated
+    WHERE
+        department_status IN ('DEPARTMENT_NOT_FOUND', 'DEPARTMENT_DELETED')
+        OR section_status IN ('SECTION_NOT_FOUND', 'SECTION_DELETED')
+)
+SELECT
+    invalid_reason,
+    COUNT(*) AS record_count
+FROM invalid
+GROUP BY invalid_reason
+
+UNION ALL
+
+SELECT
+    'TOTAL_INVALID_RECORDS' AS invalid_reason,
+    COUNT(*) AS record_count
+FROM invalid
+
+ORDER BY
+    CASE invalid_reason
+        WHEN 'INVALID_DEPARTMENT' THEN 1
+        WHEN 'INVALID_SECTION' THEN 2
+        WHEN 'INVALID_DEPARTMENT_AND_SECTION' THEN 3
+        WHEN 'TOTAL_INVALID_RECORDS' THEN 4
+        ELSE 5
+    END;
+
+
+-- -----------------------------------------------------------------------------
+-- 3) Breakdown by underlying master-table status (optional drill-down)
+-- -----------------------------------------------------------------------------
+WITH validated AS (
+    SELECT
+        ur.id AS user_role_id,
+        CASE
+            WHEN ur.department_id IS NULL THEN 'NOT_APPLICABLE'
+            WHEN d.id IS NULL THEN 'DEPARTMENT_NOT_FOUND'
+            WHEN COALESCE(d.is_deleted, false) = true THEN 'DEPARTMENT_DELETED'
+            ELSE 'VALID'
+        END AS department_status,
+        CASE
+            WHEN ur.section_id IS NULL THEN 'NOT_APPLICABLE'
+            WHEN s.id IS NULL THEN 'SECTION_NOT_FOUND'
+            WHEN COALESCE(s.is_deleted, false) = true THEN 'SECTION_DELETED'
+            ELSE 'VALID'
+        END AS section_status
+    FROM user_role ur
+    LEFT JOIN departments d ON d.id = ur.department_id
+    LEFT JOIN sections s ON s.id = ur.section_id
+)
+SELECT
+    department_status,
+    section_status,
+    COUNT(*) AS record_count
+FROM validated
+WHERE
+    department_status IN ('DEPARTMENT_NOT_FOUND', 'DEPARTMENT_DELETED')
+    OR section_status IN ('SECTION_NOT_FOUND', 'SECTION_DELETED')
+GROUP BY department_status, section_status
+ORDER BY record_count DESC, department_status, section_status;

package/src/data-source.ts

@@ -254,6 +254,7 @@ import { SlaMyRequestsView } from './models/SlaMyRequestsViewModel';
 import { SlaApprovalsView } from './models/SlaApprovalsViewModel';
 import { ServiceSlaApproval } from './models/ServiceSlaApprovalModel';
 import { SlaConfig } from './models/SlaConfigModel';
+import { ChatbotQnsAnsMapping } from './models/ChatbotQnsAnsMappingModel';
 import { CSRMBusinessImpactRatingMaster } from './models/CSRMBusinessImpactRatingMasterModel';
 import { CSRMLikelihoodMaster } from './models/CSRMLikelihoodMasterModel';
 import { Location } from './models/LocationModel';
@@ -579,6 +580,7 @@ export const AppDataSource = new DataSource({
     SlaApprovalsView,
     ServiceSlaApproval,
     SlaConfig,
+    ChatbotQnsAnsMapping,
     CSRMBusinessImpactRatingMaster,
     CSRMLikelihoodMaster,
     Location,

package/src/i18n/workflow-chat-i18n.json

@@ -309,6 +309,14 @@
     "logistics_actual_return_updated": {
       "en": "{{roleName}} updated the Vehicle Actual Return Date, Time, and Reason. Actual Return Date: {{date}}, Actual Return Time: {{time}}, Reason: {{reason}}",
       "ar": "قام {{roleName}} بتحديث تاريخ الإرجاع الفعلي للمركبة والوقت والسبب. تاريخ الإرجاع الفعلي: {{date}}، وقت الإرجاع الفعلي: {{time}}، السبب: {{reason}}"
+    },
+    "pending_with_user": {
+      "en": "Pending with {{userName}} ({{employeeId}})",
+      "ar": "قيد الانتظار لدى {{userName}} ({{employeeId}})"
+    },
+    "pending_with_role": {
+      "en": "Pending with {{roleName}}",
+      "ar": "قيد الانتظار لدى {{roleName}}"
     }
   },
   "notificationTemplates": {

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

@@ -1545,9 +1545,33 @@ export function resolveWorkflowStatusAr(status: string | null | undefined): stri
   return WORKFLOW_STATUS_LABELS[status] ?? status;
 }
 
-export function resolveChatStatusAr(status: string | null | undefined): string | null {
+export function resolveChatStatusAr(
+  status: string | null | undefined,
+  actors?: BilingualActorNames,
+): string | null {
   if (status == null || status === '') return null;
-  return CHAT_STATUS_LABELS[status] ?? status;
+
+  const labeled = CHAT_STATUS_LABELS[status];
+  if (labeled) return labeled;
+
+  const normalized = status.trim();
+  const pendingWithUserTpl = CHAT_TEMPLATES.pending_with_user;
+  if (pendingWithUserTpl) {
+    const params = matchTemplateMessage(pendingWithUserTpl.en, normalized);
+    if (params) {
+      return interpolate(pendingWithUserTpl.ar, buildArabicChatTemplateParams(params, actors));
+    }
+  }
+
+  const pendingWithRoleTpl = CHAT_TEMPLATES.pending_with_role;
+  if (pendingWithRoleTpl) {
+    const params = matchTemplateMessage(pendingWithRoleTpl.en, normalized);
+    if (params) {
+      return interpolate(pendingWithRoleTpl.ar, buildArabicChatTemplateParams(params, actors));
+    }
+  }
+
+  return status;
 }
 
 // ─── Legacy row enrichment (read API) ────────────────────────────────────────
@@ -2310,7 +2334,7 @@ export function enrichChatMessage(chat: Record<string, unknown>): Record<string,
   return {
     ...chat,
     message_ar: chat.message_ar ?? resolveChatMessageAr(message, actors),
-    status_ar: chat.status_ar ?? resolveChatStatusAr(status),
+    status_ar: chat.status_ar ?? resolveChatStatusAr(status, actors),
   };
 }
 

package/src/index.ts

@@ -504,6 +504,7 @@ export * from './models/RequestTenderAnalysisRequestModel';
 export * from './models/ContractServiceRequestModel';
 export * from './models/ContractServiceRequestDocumentModel';
 export * from './models/SlaConfigModel';
+export * from './models/ChatbotQnsAnsMappingModel';
 export * from './models/SlaRequestModel';
 export * from './models/SlaMyRequestsViewModel';
 export * from './models/SlaApprovalsViewModel';

package/src/models/ChatbotQnsAnsMappingModel.ts

@@ -0,0 +1,21 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "chatbot_qns_ans_mapping" })
+export class ChatbotQnsAnsMapping extends BaseModel {
+    @Column({ type: "int", nullable: false })
+    service_id: number;
+
+    @Column({ type: "int", nullable: false })
+    sub_service_id: number;
+
+    @Column({ type: "jsonb", nullable: false })
+    question: Record<string, unknown> | unknown[];
+
+    @Column({ type: "jsonb", nullable: false })
+    answer: Record<string, unknown> | unknown[];
+
+    constructor() {
+        super();
+    }
+}