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

package/dist/data-source.js

@@ -271,6 +271,7 @@ const ComplaintLostPropertyReportChatModel_1 = require("./models/ComplaintLostPr
 const ComplaintLostPropertyReportRequestModel_1 = require("./models/ComplaintLostPropertyReportRequestModel");
 const ComplaintLostPropertyReportWorkflowModel_1 = require("./models/ComplaintLostPropertyReportWorkflowModel");
 const ContractServiceRequestModel_1 = require("./models/ContractServiceRequestModel");
+const ContractServiceRequestDocumentModel_1 = require("./models/ContractServiceRequestDocumentModel");
 const CountryMasterModel_1 = require("./models/CountryMasterModel");
 const CyberSecurityAuditRequestModel_1 = require("./models/CyberSecurityAuditRequestModel");
 const CyberSecurityRiskManagementRequestModel_1 = require("./models/CyberSecurityRiskManagementRequestModel");
@@ -593,6 +594,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         ComplaintLostPropertyReportRequestModel_1.ComplaintLostPropertyReportRequest,
         ComplaintLostPropertyReportWorkflowModel_1.ComplaintLostPropertyReportWorkflow,
         ContractServiceRequestModel_1.ContractServiceRequest,
+        ContractServiceRequestDocumentModel_1.ContractServiceRequestDocument,
         CountryMasterModel_1.CountryMaster,
         CyberSecurityAuditRequestModel_1.CyberSecurityAuditRequest,
         CyberSecurityRiskManagementRequestModel_1.CyberSecurityRiskManagementRequest,

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

@@ -40,6 +40,14 @@
       "en": "Request Approved{{comment}}",
       "ar": "تمت الموافقة على الطلب{{comment}}"
     },
+    "request_approved_assigned_to_user": {
+      "en": "Request Approved: Request assigned to {{assignedUserName}} by {{roleName}} ({{actorUserName}} - {{employeeId}})",
+      "ar": "تمت الموافقة على الطلب: تم تعيين الطلب إلى {{assignedUserName}} من قبل {{roleName}} ({{actorUserName}} - {{employeeId}})"
+    },
+    "request_approved_assigned_to_technician": {
+      "en": "Request Approved: Request assigned to technician {{assignedUserName}} by {{roleName}} ({{actorUserName}} - {{employeeId}})",
+      "ar": "تمت الموافقة على الطلب: تم تعيين الطلب إلى الفني {{assignedUserName}} من قبل {{roleName}} ({{actorUserName}} - {{employeeId}})"
+    },
     "request_rejected": {
       "en": "Request Rejected{{comment}}",
       "ar": "تم رفض الطلب{{comment}}"
@@ -106,7 +114,7 @@
     },
     "it_helpdesk_wf_status_by_role": {
       "en": "Request {{status}} by {{approverRoleName}}{{comment}}",
-      "ar": "تم {{statusAr}} الطلب من قبل {{approverRoleName}}{{comment}}"
+      "ar": "{{statusAr}} الطلب من قبل {{approverRoleName}}{{comment}}"
     },
     "it_helpdesk_wf_l3_step_rejected": {
       "en": "{{roleName}} rejected the request{{comment}}",

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

@@ -69,6 +69,18 @@ export declare function buildSynchronizedWorkflowMessage(ctx: WorkflowMessageCon
  * Use for every chat insert/update across all CAA modules.
  */
 export declare function buildSynchronizedChatMessage(ctx: ChatMessageContext): BilingualText;
+export type RequestApprovedAssignedWorkflowParams = {
+    assignedUserName: string;
+    roleName: string;
+    roleArabicName?: string | null;
+    actorUserName: string;
+    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;
 /** Standard workflow log UPDATE fields for all CAA module repositories. */
 export declare function buildWorkflowLogUpdateFields(params: {
     approvalStatus: string;

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

@@ -20,6 +20,8 @@ exports.workflowTemplate = workflowTemplate;
 exports.chatTemplate = chatTemplate;
 exports.buildSynchronizedWorkflowMessage = buildSynchronizedWorkflowMessage;
 exports.buildSynchronizedChatMessage = buildSynchronizedChatMessage;
+exports.tryParseRequestAssignedComment = tryParseRequestAssignedComment;
+exports.buildRequestApprovedAssignedWorkflowFields = buildRequestApprovedAssignedWorkflowFields;
 exports.buildWorkflowLogUpdateFields = buildWorkflowLogUpdateFields;
 exports.toWorkflowPersistFields = toWorkflowPersistFields;
 exports.toChatPersistFields = toChatPersistFields;
@@ -233,9 +235,73 @@ function buildSynchronizedChatMessage(ctx) {
             return chatTemplate('request_received');
     }
 }
-// ─── Backward-compatible aliases used by Cancellation pilot ───────────────────
+/** Parse legacy English-only assignment comments used as workflow log suffixes. */
+function tryParseRequestAssignedComment(comment) {
+    const text = comment?.trim();
+    if (!text)
+        return null;
+    const technicianMatch = text.match(/^Request assigned to technician (.+?) by (.+?) \((.+?) - (.+?)\)$/);
+    if (technicianMatch) {
+        return {
+            assignedUserName: technicianMatch[1].trim(),
+            roleName: technicianMatch[2].trim(),
+            actorUserName: technicianMatch[3].trim(),
+            employeeId: technicianMatch[4].trim(),
+            assigneeLabel: 'technician',
+        };
+    }
+    const userMatch = text.match(/^Request assigned to (.+?) by (.+?) \((.+?) - (.+?)\)$/);
+    if (userMatch) {
+        return {
+            assignedUserName: userMatch[1].trim(),
+            roleName: userMatch[2].trim(),
+            actorUserName: userMatch[3].trim(),
+            employeeId: userMatch[4].trim(),
+            assigneeLabel: 'user',
+        };
+    }
+    return null;
+}
+/** Bilingual workflow content for approved assignment steps (HR, IT, Tender, etc.). */
+function buildRequestApprovedAssignedWorkflowFields(params) {
+    const assignedUserEn = params.assignedUserName?.trim() || 'User';
+    const roleEn = params.roleName?.trim() || 'Approver';
+    const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+    const actorEn = params.actorUserName?.trim() || 'User';
+    const employeeId = String(params.employeeId ?? 'N/A');
+    const templateKey = params.assigneeLabel === 'technician'
+        ? 'request_approved_assigned_to_technician'
+        : 'request_approved_assigned_to_user';
+    return renderSynchronizedWorkflowMessage(templateKey, {
+        assignedUserName: assignedUserEn,
+        roleName: roleEn,
+        actorUserName: actorEn,
+        employeeId,
+    }, {
+        assignedUserName: assignedUserEn,
+        roleName: roleAr,
+        actorUserName: actorEn,
+        employeeId,
+    });
+}
 /** Standard workflow log UPDATE fields for all CAA module repositories. */
 function buildWorkflowLogUpdateFields(params) {
+    if (params.approvalStatus === 'Approved') {
+        const assignment = tryParseRequestAssignedComment(params.comment);
+        if (assignment) {
+            const bilingual = buildRequestApprovedAssignedWorkflowFields({
+                ...assignment,
+                roleName: params.roleName?.trim() || assignment.roleName,
+                roleArabicName: params.roleArabicName,
+            });
+            return {
+                content: bilingual.en,
+                content_ar: bilingual.ar,
+                status: params.workflowStatus,
+                status_ar: resolveWorkflowStatusAr(params.workflowStatus),
+            };
+        }
+    }
     let action;
     if (params.approvalStatus === 'Approved')
         action = 'approved';
@@ -516,6 +582,22 @@ function buildItHelpdeskReassignModifiers(params) {
     }
     return { en, ar };
 }
+function resolveItHelpdeskGenericStatusAr(status) {
+    switch (status.trim()) {
+        case 'Approved':
+            return 'تمت الموافقة على';
+        case 'Rejected':
+            return 'تم رفض';
+        case 'Closed':
+            return 'تم إغلاق';
+        case 'Assigned':
+            return 'تم تعيين';
+        case 'Reassigned':
+            return 'تمت إعادة تعيين';
+        default:
+            return resolveChatStatusAr(status) ?? status.toLowerCase();
+    }
+}
 function buildItHelpdeskMuscatWorkflowLog(params) {
     const comment = formatColonCommentSuffix('comment' in params ? params.comment : undefined);
     const modifiers = 'modifiers' in params && params.modifiers ? params.modifiers : { en: '', ar: '' };
@@ -590,7 +672,7 @@ function buildItHelpdeskMuscatWorkflowLog(params) {
             const approverEn = params.approverRoleName.trim();
             const approverAr = resolveBilingualName(approverEn, params.approverRoleArabicName);
             const statusEn = params.status.toLowerCase();
-            const statusAr = resolveChatStatusAr(params.status) ?? statusEn;
+            const statusAr = resolveItHelpdeskGenericStatusAr(params.status);
             return renderSynchronizedWorkflowMessage('it_helpdesk_wf_status_by_role', { status: statusEn, statusAr, approverRoleName: approverEn, comment }, { status: statusEn, statusAr, approverRoleName: approverAr, comment });
         }
         case 'technician_completed': {
@@ -692,13 +774,20 @@ function resolveArabicWorkflowActorName(actors, parsedEnglishName) {
 }
 /** Arabic role/user label for chat templates. */
 function resolveArabicChatRoleName(actors, parsedEnglishRole) {
+    const parsed = parsedEnglishRole?.trim();
     if (actors?.roleName?.trim()) {
-        return resolveBilingualName(actors.roleName, actors.roleArabicName);
+        const actorRole = actors.roleName.trim();
+        if (!parsed || parsed.toLowerCase() === actorRole.toLowerCase()) {
+            return resolveBilingualName(actorRole, actors.roleArabicName);
+        }
+    }
+    if (actors?.roleArabicName?.trim() && parsed) {
+        return resolveBilingualName(parsed, actors.roleArabicName);
     }
     if (actors?.userName?.trim()) {
         return resolveBilingualName(actors.userName, actors.userArabicName);
     }
-    return resolveBilingualName(parsedEnglishRole, actors?.roleArabicName);
+    return resolveBilingualName(parsed, actors?.roleArabicName);
 }
 function escapeRegexLiteral(value) {
     return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
@@ -707,16 +796,36 @@ function escapeRegexLiteral(value) {
 function matchTemplateMessage(templateEn, message) {
     if (!/\{\{\w+\}\}/.test(templateEn))
         return null;
-    const placeholders = [];
+    const captures = [];
     let regexBody = '';
     let cursor = 0;
+    let groupIndex = 0;
     const tokenRe = /\{\{(\w+)\}\}/g;
     let tokenMatch;
     while ((tokenMatch = tokenRe.exec(templateEn)) !== null) {
         regexBody += escapeRegexLiteral(templateEn.slice(cursor, tokenMatch.index));
         const key = tokenMatch[1];
-        placeholders.push(key);
-        regexBody += key === 'comment' ? '(.*)' : '(.+?)';
+        const afterToken = templateEn.slice(tokenMatch.index + tokenMatch[0].length);
+        if (key === 'comment') {
+            groupIndex += 1;
+            captures.push({ key, groupIndex });
+            regexBody += '(.*)';
+            cursor = tokenMatch.index + tokenMatch[0].length;
+            continue;
+        }
+        if (afterToken.startsWith('{{comment}}')) {
+            groupIndex += 1;
+            captures.push({ key, groupIndex });
+            groupIndex += 1;
+            captures.push({ key: 'comment', groupIndex });
+            regexBody += '([^:]+?)(: .*)?';
+            tokenRe.lastIndex = tokenMatch.index + tokenMatch[0].length + '{{comment}}'.length;
+            cursor = tokenRe.lastIndex;
+            continue;
+        }
+        groupIndex += 1;
+        captures.push({ key, groupIndex });
+        regexBody += '(.+?)';
         cursor = tokenMatch.index + tokenMatch[0].length;
     }
     regexBody += escapeRegexLiteral(templateEn.slice(cursor));
@@ -724,8 +833,8 @@ function matchTemplateMessage(templateEn, message) {
     if (!match)
         return null;
     const params = {};
-    placeholders.forEach((key, index) => {
-        params[key] = match[index + 1] ?? '';
+    captures.forEach(({ key, groupIndex: idx }) => {
+        params[key] = match[idx] ?? '';
     });
     return params;
 }
@@ -741,14 +850,48 @@ function buildArabicChatTemplateParams(params, actors) {
     }
     return arParams;
 }
+function buildArabicWorkflowTemplateParams(params, actors) {
+    const arParams = { ...params };
+    if (params.roleName !== undefined) {
+        arParams.roleName = resolveArabicChatRoleName(actors, params.roleName.trim());
+    }
+    if (params.approverRoleName !== undefined) {
+        arParams.approverRoleName = resolveArabicChatRoleName(actors, params.approverRoleName.trim());
+    }
+    if (params.assignedRoleName !== undefined) {
+        arParams.assignedRoleName = resolveArabicChatRoleName(actors, params.assignedRoleName.trim());
+    }
+    if (params.name !== undefined) {
+        arParams.name = resolveArabicWorkflowActorName(actors, params.name.trim());
+    }
+    if (params.status !== undefined && params.statusAr === undefined) {
+        const normalizedStatus = params.status.charAt(0).toUpperCase() + params.status.slice(1).toLowerCase();
+        arParams.statusAr = resolveItHelpdeskGenericStatusAr(normalizedStatus);
+    }
+    return arParams;
+}
+function countTemplatePlaceholders(templateEn) {
+    return (templateEn.match(/\{\{\w+\}\}/g) || []).length;
+}
+function listWorkflowTemplatesBySpecificity() {
+    return Object.entries(WORKFLOW_TEMPLATES).sort(([, a], [, b]) => countTemplatePlaceholders(b.en) - countTemplatePlaceholders(a.en));
+}
 function resolveWorkflowContentAr(content, actors) {
     if (content == null || content.trim() === '')
         return null;
     const normalized = content.trim();
     for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
-        if (tpl.en === normalized)
+        if (tpl.en === normalized || tpl.en.toLowerCase() === normalized.toLowerCase())
             return tpl.ar;
     }
+    for (const [, tpl] of listWorkflowTemplatesBySpecificity()) {
+        if (!/\{\{\w+\}\}/.test(tpl.en))
+            continue;
+        const params = matchTemplateMessage(tpl.en, normalized);
+        if (!params)
+            continue;
+        return interpolate(tpl.ar, buildArabicWorkflowTemplateParams(params, actors));
+    }
     const commentIdx = normalized.indexOf(': ');
     if (commentIdx > 0) {
         const baseEn = normalized.slice(0, commentIdx).trim();
@@ -783,6 +926,28 @@ function resolveWorkflowContentAr(content, actors) {
         const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
         return interpolate(WORKFLOW_TEMPLATES.request_approval_pending_from.ar, { name: nameAr });
     }
+    // Legacy HR worker strings (pre-i18n catalog)
+    if (normalized === 'Send Notification') {
+        return WORKFLOW_TEMPLATES.notification_sent_pending?.ar ?? null;
+    }
+    const notificationSuccessVariants = [
+        'notification sent successfully',
+        'notification sent sucessfully',
+        'notification sent',
+    ];
+    if (notificationSuccessVariants.includes(normalized.toLowerCase())) {
+        return WORKFLOW_TEMPLATES.notification_sent_successfully?.ar ?? null;
+    }
+    const legacyPendingPrefix = 'Approval pending from ';
+    if (normalized.startsWith(legacyPendingPrefix)) {
+        const namePartEn = normalized.slice(legacyPendingPrefix.length).trim();
+        const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
+        return interpolate(WORKFLOW_TEMPLATES.request_approval_pending_from.ar, { name: nameAr });
+    }
+    if (normalized === 'Approval Pending from HR Section' ||
+        normalized === 'Approval Pending from Records Department') {
+        return WORKFLOW_TEMPLATES.request_approval_pending?.ar ?? null;
+    }
     return null;
 }
 function resolveChatMessageAr(message, actors) {
@@ -812,9 +977,48 @@ function enrichWorkflowLog(log) {
     const status = log.status != null ? String(log.status) : null;
     const content = log.content != null ? String(log.content) : null;
     const actors = extractBilingualActorsFromRecord(log);
+    const resolvedAr = resolveWorkflowContentAr(content, actors);
+    const existingAr = log.content_ar != null && String(log.content_ar).trim() !== ''
+        ? String(log.content_ar)
+        : null;
+    // Re-resolve when stored AR still embeds the English actor parsed from `content`.
+    const pendingPrefix = WORKFLOW_TEMPLATES.request_approval_pending_from?.en.split('{{name}}')[0].trim();
+    let content_ar = existingAr ?? resolvedAr;
+    if (content &&
+        pendingPrefix &&
+        content.startsWith(pendingPrefix) &&
+        existingAr &&
+        resolvedAr &&
+        existingAr !== resolvedAr) {
+        const namePartEn = content.slice(pendingPrefix.length).trim();
+        if (namePartEn && existingAr.includes(namePartEn)) {
+            content_ar = resolvedAr;
+        }
+    }
+    if (content &&
+        existingAr &&
+        resolvedAr &&
+        existingAr !== resolvedAr &&
+        /Request assigned to/i.test(existingAr)) {
+        content_ar = resolvedAr;
+    }
+    if (content &&
+        existingAr &&
+        resolvedAr &&
+        existingAr !== resolvedAr &&
+        actors?.roleName?.trim() &&
+        actors?.roleArabicName?.trim() &&
+        existingAr.includes(actors.roleName.trim())) {
+        content_ar = resolvedAr;
+    }
+    if ((content_ar == null || content_ar === '') && content) {
+        const notificationAr = resolveWorkflowContentAr(content, actors);
+        if (notificationAr)
+            content_ar = notificationAr;
+    }
     return {
         ...log,
-        content_ar: log.content_ar ?? resolveWorkflowContentAr(content, actors),
+        content_ar,
         status_ar: log.status_ar ?? resolveWorkflowStatusAr(status),
     };
 }

package/dist/index.d.ts

@@ -409,6 +409,7 @@ export { RespondToEnquiriesRequestAttachment } from './models/RespondToEnquiries
 export * from './models/RequestATenderRequestModel';
 export * from './models/RequestTenderAnalysisRequestModel';
 export * from './models/ContractServiceRequestModel';
+export * from './models/ContractServiceRequestDocumentModel';
 export * from './models/SlaConfigModel';
 export * from './models/SlaRequestModel';
 export * from './models/SlaMyRequestsViewModel';

package/dist/index.js

@@ -598,6 +598,7 @@ Object.defineProperty(exports, "RespondToEnquiriesRequestAttachment", { enumerab
 __exportStar(require("./models/RequestATenderRequestModel"), exports);
 __exportStar(require("./models/RequestTenderAnalysisRequestModel"), exports);
 __exportStar(require("./models/ContractServiceRequestModel"), exports);
+__exportStar(require("./models/ContractServiceRequestDocumentModel"), exports);
 __exportStar(require("./models/SlaConfigModel"), exports);
 __exportStar(require("./models/SlaRequestModel"), exports);
 __exportStar(require("./models/SlaMyRequestsViewModel"), exports);

package/dist/models/ContractServiceRequestDocumentModel.d.ts

@@ -0,0 +1,13 @@
+import { BaseModel } from './BaseModel';
+export declare class ContractServiceRequestDocument extends BaseModel {
+    request_id: number;
+    service_id: number | null;
+    sub_service_id: number | null;
+    document_name: string;
+    description: string | null;
+    file_url: string;
+    file_name: string | null;
+    file_type: string | null;
+    file_size: number | null;
+    uploaded_by: number;
+}

package/dist/models/ContractServiceRequestDocumentModel.js

@@ -0,0 +1,60 @@
+"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.ContractServiceRequestDocument = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ContractServiceRequestDocument = class ContractServiceRequestDocument extends BaseModel_1.BaseModel {
+};
+exports.ContractServiceRequestDocument = ContractServiceRequestDocument;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], ContractServiceRequestDocument.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ContractServiceRequestDocument.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ContractServiceRequestDocument.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: false }),
+    __metadata("design:type", String)
+], ContractServiceRequestDocument.prototype, "document_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], ContractServiceRequestDocument.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: false }),
+    __metadata("design:type", String)
+], ContractServiceRequestDocument.prototype, "file_url", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], ContractServiceRequestDocument.prototype, "file_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], ContractServiceRequestDocument.prototype, "file_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Object)
+], ContractServiceRequestDocument.prototype, "file_size", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], ContractServiceRequestDocument.prototype, "uploaded_by", void 0);
+exports.ContractServiceRequestDocument = ContractServiceRequestDocument = __decorate([
+    (0, typeorm_1.Entity)({ name: 'contract_service_request_documents' })
+], ContractServiceRequestDocument);

package/dist/models/ContractServiceRequestModel.d.ts

@@ -14,6 +14,8 @@ export declare class ContractServiceRequest extends BaseModel {
     request_id: string | null;
     project_or_budget_code: string;
     company_name: string;
+    company_phone_number: string | null;
+    notes: string | null;
     status: RespondToEnquiriesRequestStatus;
     reviewer_user_id: number | null;
     assigned_to_user_id: number | null;

package/dist/models/ContractServiceRequestModel.js

@@ -68,6 +68,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
     __metadata("design:type", String)
 ], ContractServiceRequest.prototype, "company_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 30, nullable: true }),
+    __metadata("design:type", Object)
+], ContractServiceRequest.prototype, "company_phone_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
+], ContractServiceRequest.prototype, "notes", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",

package/dist/models/FollowUpReportItemModel.d.ts

@@ -13,4 +13,8 @@ export declare class FollowUpReportItem extends BaseModel {
     action_status: string | null;
     action_taken: string | null;
     delay_period: string | null;
+    file_url: string | null;
+    file_name: string | null;
+    file_type: string | null;
+    file_size: number | null;
 }

package/dist/models/FollowUpReportItemModel.js

@@ -69,6 +69,22 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", Object)
 ], FollowUpReportItem.prototype, "delay_period", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "file_url", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "file_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "file_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "file_size", void 0);
 exports.FollowUpReportItem = FollowUpReportItem = __decorate([
     (0, typeorm_1.Entity)({ name: 'followup_report_items' })
 ], FollowUpReportItem);

package/dist/models/FollowUpReportRequestModel.d.ts

@@ -5,8 +5,14 @@ export declare enum FollowUpReportSubjectClassification {
     VERY_URGENT = "Very Urgent",
     CONFIDENTIAL = "Confidential",
     INFORMATIONAL = "Informational",
-    NORMAL = "Normal"
+    NORMAL = "Normal",
+    IMPORTANT = "Important",
+    HIGHLY_CONFIDENTIAL = "Highly Confidential",
+    RESTRICTED = "Restricted",
+    LIMITED = "Limited"
 }
+/** Allowed API/DB values for follow-up report subject classification. */
+export declare const FOLLOW_UP_REPORT_SUBJECT_CLASSIFICATION_VALUES: FollowUpReportSubjectClassification[];
 /** Concerned department under General Manager of Support Services */
 export declare enum FollowUpReportConcernedDepartment {
     IT = "IT",

package/dist/models/FollowUpReportRequestModel.js

@@ -9,7 +9,7 @@ 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.FollowUpReportRequests = exports.FollowUpReportRequestStatus = exports.FollowUpReportConcernedDepartment = exports.FollowUpReportSubjectClassification = void 0;
+exports.FollowUpReportRequests = exports.FollowUpReportRequestStatus = exports.FollowUpReportConcernedDepartment = exports.FOLLOW_UP_REPORT_SUBJECT_CLASSIFICATION_VALUES = exports.FollowUpReportSubjectClassification = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 /** Subject / handling priority classification */
@@ -20,7 +20,13 @@ var FollowUpReportSubjectClassification;
     FollowUpReportSubjectClassification["CONFIDENTIAL"] = "Confidential";
     FollowUpReportSubjectClassification["INFORMATIONAL"] = "Informational";
     FollowUpReportSubjectClassification["NORMAL"] = "Normal";
+    FollowUpReportSubjectClassification["IMPORTANT"] = "Important";
+    FollowUpReportSubjectClassification["HIGHLY_CONFIDENTIAL"] = "Highly Confidential";
+    FollowUpReportSubjectClassification["RESTRICTED"] = "Restricted";
+    FollowUpReportSubjectClassification["LIMITED"] = "Limited";
 })(FollowUpReportSubjectClassification || (exports.FollowUpReportSubjectClassification = FollowUpReportSubjectClassification = {}));
+/** Allowed API/DB values for follow-up report subject classification. */
+exports.FOLLOW_UP_REPORT_SUBJECT_CLASSIFICATION_VALUES = Object.values(FollowUpReportSubjectClassification);
 /** Concerned department under General Manager of Support Services */
 var FollowUpReportConcernedDepartment;
 (function (FollowUpReportConcernedDepartment) {

package/dist/models/RespondToEnquiriesAttachmentModel.d.ts

@@ -9,5 +9,6 @@ export declare class RespondToEnquiriesRequestAttachment extends BaseModel {
     file_type: string;
     file_size: number | null;
     description: string;
-    constructor(request_id: number, uploaded_by: number, file_url: string, service_id?: number | null, sub_service_id?: number | null, file_name?: string, file_type?: string, file_size?: number, description?: string);
+    document_name: string | null;
+    constructor(request_id: number, uploaded_by: number, file_url: string, service_id?: number | null, sub_service_id?: number | null, file_name?: string, file_type?: string, file_size?: number, description?: string, document_name?: string);
 }

package/dist/models/RespondToEnquiriesAttachmentModel.js

@@ -13,7 +13,7 @@ exports.RespondToEnquiriesRequestAttachment = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let RespondToEnquiriesRequestAttachment = class RespondToEnquiriesRequestAttachment extends BaseModel_1.BaseModel {
-    constructor(request_id, uploaded_by, file_url, service_id, sub_service_id, file_name, file_type, file_size, description) {
+    constructor(request_id, uploaded_by, file_url, service_id, sub_service_id, file_name, file_type, file_size, description, document_name) {
         super();
         this.request_id = request_id;
         this.service_id = service_id || null;
@@ -24,6 +24,7 @@ let RespondToEnquiriesRequestAttachment = class RespondToEnquiriesRequestAttachm
         this.file_type = file_type || "";
         this.file_size = file_size || null;
         this.description = description || "";
+        this.document_name = document_name || null;
     }
 };
 exports.RespondToEnquiriesRequestAttachment = RespondToEnquiriesRequestAttachment;
@@ -63,7 +64,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: "text", nullable: true }),
     __metadata("design:type", String)
 ], RespondToEnquiriesRequestAttachment.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequestAttachment.prototype, "document_name", void 0);
 exports.RespondToEnquiriesRequestAttachment = RespondToEnquiriesRequestAttachment = __decorate([
     (0, typeorm_1.Entity)({ name: "respond_to_enquiries_request_attachments" }),
-    __metadata("design:paramtypes", [Number, Number, String, Object, Object, String, String, Number, String])
+    __metadata("design:paramtypes", [Number, Number, String, Object, Object, String, String, Number, String, String])
 ], RespondToEnquiriesRequestAttachment);

package/package.json

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

package/sql/caa_api_payload_changes_2026_07.sql

@@ -30,3 +30,43 @@ ALTER TABLE request_a_tender_requests
 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';
+
+-- 8. Contract service request: notes, company phone, contract documents table
+ALTER TABLE contract_service_requests
+  ADD COLUMN IF NOT EXISTS notes TEXT,
+  ADD COLUMN IF NOT EXISTS company_phone_number VARCHAR(30);
+
+CREATE TABLE IF NOT EXISTS contract_service_request_documents (
+  id SERIAL PRIMARY KEY,
+  created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
+  created_by INT,
+  updated_by INT,
+  is_deleted BOOLEAN DEFAULT FALSE,
+  request_id INT NOT NULL,
+  service_id INT,
+  sub_service_id INT,
+  document_name VARCHAR(500) NOT NULL,
+  description TEXT,
+  file_url VARCHAR(500) NOT NULL,
+  file_name VARCHAR(255),
+  file_type VARCHAR(100),
+  file_size BIGINT,
+  uploaded_by INT NOT NULL
+);
+
+ALTER TABLE respond_to_enquiries_request_attachments
+  ADD COLUMN IF NOT EXISTS document_name VARCHAR(500);
+
+-- 9. Follow-up report items: per-item attachment fields
+ALTER TABLE followup_report_items
+  ADD COLUMN IF NOT EXISTS file_url VARCHAR(500),
+  ADD COLUMN IF NOT EXISTS file_name VARCHAR(255),
+  ADD COLUMN IF NOT EXISTS file_type VARCHAR(100),
+  ADD COLUMN IF NOT EXISTS file_size BIGINT;

package/src/data-source.ts

@@ -269,6 +269,7 @@ import { ComplaintLostPropertyReportChat } from './models/ComplaintLostPropertyR
 import { ComplaintLostPropertyReportRequest } from './models/ComplaintLostPropertyReportRequestModel';
 import { ComplaintLostPropertyReportWorkflow } from './models/ComplaintLostPropertyReportWorkflowModel';
 import { ContractServiceRequest } from './models/ContractServiceRequestModel';
+import { ContractServiceRequestDocument } from './models/ContractServiceRequestDocumentModel';
 import { CountryMaster } from './models/CountryMasterModel';
 import { CyberSecurityAuditRequest } from './models/CyberSecurityAuditRequestModel';
 import { CyberSecurityRiskManagementRequest } from './models/CyberSecurityRiskManagementRequestModel';
@@ -593,6 +594,7 @@ export const AppDataSource = new DataSource({
     ComplaintLostPropertyReportRequest,
     ComplaintLostPropertyReportWorkflow,
     ContractServiceRequest,
+    ContractServiceRequestDocument,
     CountryMaster,
     CyberSecurityAuditRequest,
     CyberSecurityRiskManagementRequest,

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

@@ -40,6 +40,14 @@
       "en": "Request Approved{{comment}}",
       "ar": "تمت الموافقة على الطلب{{comment}}"
     },
+    "request_approved_assigned_to_user": {
+      "en": "Request Approved: Request assigned to {{assignedUserName}} by {{roleName}} ({{actorUserName}} - {{employeeId}})",
+      "ar": "تمت الموافقة على الطلب: تم تعيين الطلب إلى {{assignedUserName}} من قبل {{roleName}} ({{actorUserName}} - {{employeeId}})"
+    },
+    "request_approved_assigned_to_technician": {
+      "en": "Request Approved: Request assigned to technician {{assignedUserName}} by {{roleName}} ({{actorUserName}} - {{employeeId}})",
+      "ar": "تمت الموافقة على الطلب: تم تعيين الطلب إلى الفني {{assignedUserName}} من قبل {{roleName}} ({{actorUserName}} - {{employeeId}})"
+    },
     "request_rejected": {
       "en": "Request Rejected{{comment}}",
       "ar": "تم رفض الطلب{{comment}}"
@@ -106,7 +114,7 @@
     },
     "it_helpdesk_wf_status_by_role": {
       "en": "Request {{status}} by {{approverRoleName}}{{comment}}",
-      "ar": "تم {{statusAr}} الطلب من قبل {{approverRoleName}}{{comment}}"
+      "ar": "{{statusAr}} الطلب من قبل {{approverRoleName}}{{comment}}"
     },
     "it_helpdesk_wf_l3_step_rejected": {
       "en": "{{roleName}} rejected the request{{comment}}",

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

@@ -344,6 +344,81 @@ export function buildSynchronizedChatMessage(ctx: ChatMessageContext): Bilingual
 
 // ─── Backward-compatible aliases used by Cancellation pilot ───────────────────
 
+export type RequestApprovedAssignedWorkflowParams = {
+  assignedUserName: string;
+  roleName: string;
+  roleArabicName?: string | null;
+  actorUserName: string;
+  employeeId: string | number;
+  assigneeLabel?: 'user' | 'technician';
+};
+
+/** Parse legacy English-only assignment comments used as workflow log suffixes. */
+export function tryParseRequestAssignedComment(
+  comment?: string | null,
+): Omit<RequestApprovedAssignedWorkflowParams, 'roleArabicName'> | null {
+  const text = comment?.trim();
+  if (!text) return null;
+
+  const technicianMatch = text.match(
+    /^Request assigned to technician (.+?) by (.+?) \((.+?) - (.+?)\)$/,
+  );
+  if (technicianMatch) {
+    return {
+      assignedUserName: technicianMatch[1].trim(),
+      roleName: technicianMatch[2].trim(),
+      actorUserName: technicianMatch[3].trim(),
+      employeeId: technicianMatch[4].trim(),
+      assigneeLabel: 'technician',
+    };
+  }
+
+  const userMatch = text.match(/^Request assigned to (.+?) by (.+?) \((.+?) - (.+?)\)$/);
+  if (userMatch) {
+    return {
+      assignedUserName: userMatch[1].trim(),
+      roleName: userMatch[2].trim(),
+      actorUserName: userMatch[3].trim(),
+      employeeId: userMatch[4].trim(),
+      assigneeLabel: 'user',
+    };
+  }
+
+  return null;
+}
+
+/** Bilingual workflow content for approved assignment steps (HR, IT, Tender, etc.). */
+export function buildRequestApprovedAssignedWorkflowFields(
+  params: RequestApprovedAssignedWorkflowParams,
+): BilingualText {
+  const assignedUserEn = params.assignedUserName?.trim() || 'User';
+  const roleEn = params.roleName?.trim() || 'Approver';
+  const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+  const actorEn = params.actorUserName?.trim() || 'User';
+  const employeeId = String(params.employeeId ?? 'N/A');
+
+  const templateKey =
+    params.assigneeLabel === 'technician'
+      ? 'request_approved_assigned_to_technician'
+      : 'request_approved_assigned_to_user';
+
+  return renderSynchronizedWorkflowMessage(
+    templateKey,
+    {
+      assignedUserName: assignedUserEn,
+      roleName: roleEn,
+      actorUserName: actorEn,
+      employeeId,
+    },
+    {
+      assignedUserName: assignedUserEn,
+      roleName: roleAr,
+      actorUserName: actorEn,
+      employeeId,
+    },
+  );
+}
+
 /** Standard workflow log UPDATE fields for all CAA module repositories. */
 export function buildWorkflowLogUpdateFields(params: {
   approvalStatus: string;
@@ -352,6 +427,23 @@ 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 assignment = tryParseRequestAssignedComment(params.comment);
+    if (assignment) {
+      const bilingual = buildRequestApprovedAssignedWorkflowFields({
+        ...assignment,
+        roleName: params.roleName?.trim() || assignment.roleName,
+        roleArabicName: params.roleArabicName,
+      });
+      return {
+        content: bilingual.en,
+        content_ar: bilingual.ar,
+        status: params.workflowStatus,
+        status_ar: resolveWorkflowStatusAr(params.workflowStatus),
+      };
+    }
+  }
+
   let action: WorkflowMessageAction;
   if (params.approvalStatus === 'Approved') action = 'approved';
   else if (params.approvalStatus === 'Rejected') action = 'rejected';
@@ -845,6 +937,23 @@ export type ItHelpdeskMuscatWorkflowParams =
     }
   | { variant: 'routing_resolved' };
 
+function resolveItHelpdeskGenericStatusAr(status: string): string {
+  switch (status.trim()) {
+    case 'Approved':
+      return 'تمت الموافقة على';
+    case 'Rejected':
+      return 'تم رفض';
+    case 'Closed':
+      return 'تم إغلاق';
+    case 'Assigned':
+      return 'تم تعيين';
+    case 'Reassigned':
+      return 'تمت إعادة تعيين';
+    default:
+      return resolveChatStatusAr(status) ?? status.toLowerCase();
+  }
+}
+
 export function buildItHelpdeskMuscatWorkflowLog(params: ItHelpdeskMuscatWorkflowParams): BilingualText {
   const comment = formatColonCommentSuffix(
     'comment' in params ? params.comment : undefined,
@@ -967,7 +1076,7 @@ export function buildItHelpdeskMuscatWorkflowLog(params: ItHelpdeskMuscatWorkflo
       const approverEn = params.approverRoleName.trim();
       const approverAr = resolveBilingualName(approverEn, params.approverRoleArabicName);
       const statusEn = params.status.toLowerCase();
-      const statusAr = resolveChatStatusAr(params.status) ?? statusEn;
+      const statusAr = resolveItHelpdeskGenericStatusAr(params.status);
       return renderSynchronizedWorkflowMessage(
         'it_helpdesk_wf_status_by_role',
         { status: statusEn, statusAr, approverRoleName: approverEn, comment },
@@ -1126,13 +1235,20 @@ function resolveArabicChatRoleName(
   actors: BilingualActorNames | undefined,
   parsedEnglishRole?: string,
 ): string {
+  const parsed = parsedEnglishRole?.trim();
   if (actors?.roleName?.trim()) {
-    return resolveBilingualName(actors.roleName, actors.roleArabicName);
+    const actorRole = actors.roleName.trim();
+    if (!parsed || parsed.toLowerCase() === actorRole.toLowerCase()) {
+      return resolveBilingualName(actorRole, actors.roleArabicName);
+    }
+  }
+  if (actors?.roleArabicName?.trim() && parsed) {
+    return resolveBilingualName(parsed, actors.roleArabicName);
   }
   if (actors?.userName?.trim()) {
     return resolveBilingualName(actors.userName, actors.userArabicName);
   }
-  return resolveBilingualName(parsedEnglishRole, actors?.roleArabicName);
+  return resolveBilingualName(parsed, actors?.roleArabicName);
 }
 
 function escapeRegexLiteral(value: string): string {
@@ -1146,17 +1262,40 @@ function matchTemplateMessage(
 ): Record<string, string> | null {
   if (!/\{\{\w+\}\}/.test(templateEn)) return null;
 
-  const placeholders: string[] = [];
+  const captures: Array<{ key: string; groupIndex: number }> = [];
   let regexBody = '';
   let cursor = 0;
+  let groupIndex = 0;
   const tokenRe = /\{\{(\w+)\}\}/g;
   let tokenMatch: RegExpExecArray | null;
 
   while ((tokenMatch = tokenRe.exec(templateEn)) !== null) {
     regexBody += escapeRegexLiteral(templateEn.slice(cursor, tokenMatch.index));
     const key = tokenMatch[1];
-    placeholders.push(key);
-    regexBody += key === 'comment' ? '(.*)' : '(.+?)';
+    const afterToken = templateEn.slice(tokenMatch.index + tokenMatch[0].length);
+
+    if (key === 'comment') {
+      groupIndex += 1;
+      captures.push({ key, groupIndex });
+      regexBody += '(.*)';
+      cursor = tokenMatch.index + tokenMatch[0].length;
+      continue;
+    }
+
+    if (afterToken.startsWith('{{comment}}')) {
+      groupIndex += 1;
+      captures.push({ key, groupIndex });
+      groupIndex += 1;
+      captures.push({ key: 'comment', groupIndex });
+      regexBody += '([^:]+?)(: .*)?';
+      tokenRe.lastIndex = tokenMatch.index + tokenMatch[0].length + '{{comment}}'.length;
+      cursor = tokenRe.lastIndex;
+      continue;
+    }
+
+    groupIndex += 1;
+    captures.push({ key, groupIndex });
+    regexBody += '(.+?)';
     cursor = tokenMatch.index + tokenMatch[0].length;
   }
   regexBody += escapeRegexLiteral(templateEn.slice(cursor));
@@ -1165,8 +1304,8 @@ function matchTemplateMessage(
   if (!match) return null;
 
   const params: Record<string, string> = {};
-  placeholders.forEach((key, index) => {
-    params[key] = match[index + 1] ?? '';
+  captures.forEach(({ key, groupIndex: idx }) => {
+    params[key] = match[idx] ?? '';
   });
   return params;
 }
@@ -1187,6 +1326,41 @@ function buildArabicChatTemplateParams(
   return arParams;
 }
 
+function buildArabicWorkflowTemplateParams(
+  params: Record<string, string>,
+  actors?: BilingualActorNames,
+): Record<string, string> {
+  const arParams: Record<string, string> = { ...params };
+  if (params.roleName !== undefined) {
+    arParams.roleName = resolveArabicChatRoleName(actors, params.roleName.trim());
+  }
+  if (params.approverRoleName !== undefined) {
+    arParams.approverRoleName = resolveArabicChatRoleName(actors, params.approverRoleName.trim());
+  }
+  if (params.assignedRoleName !== undefined) {
+    arParams.assignedRoleName = resolveArabicChatRoleName(actors, params.assignedRoleName.trim());
+  }
+  if (params.name !== undefined) {
+    arParams.name = resolveArabicWorkflowActorName(actors, params.name.trim());
+  }
+  if (params.status !== undefined && params.statusAr === undefined) {
+    const normalizedStatus =
+      params.status.charAt(0).toUpperCase() + params.status.slice(1).toLowerCase();
+    arParams.statusAr = resolveItHelpdeskGenericStatusAr(normalizedStatus);
+  }
+  return arParams;
+}
+
+function countTemplatePlaceholders(templateEn: string): number {
+  return (templateEn.match(/\{\{\w+\}\}/g) || []).length;
+}
+
+function listWorkflowTemplatesBySpecificity(): Array<[string, BilingualText]> {
+  return Object.entries(WORKFLOW_TEMPLATES).sort(
+    ([, a], [, b]) => countTemplatePlaceholders(b.en) - countTemplatePlaceholders(a.en),
+  );
+}
+
 export function resolveWorkflowContentAr(
   content: string | null | undefined,
   actors?: BilingualActorNames,
@@ -1195,7 +1369,14 @@ export function resolveWorkflowContentAr(
   const normalized = content.trim();
 
   for (const tpl of Object.values(WORKFLOW_TEMPLATES)) {
-    if (tpl.en === normalized) return tpl.ar;
+    if (tpl.en === normalized || tpl.en.toLowerCase() === normalized.toLowerCase()) return tpl.ar;
+  }
+
+  for (const [, tpl] of listWorkflowTemplatesBySpecificity()) {
+    if (!/\{\{\w+\}\}/.test(tpl.en)) continue;
+    const params = matchTemplateMessage(tpl.en, normalized);
+    if (!params) continue;
+    return interpolate(tpl.ar, buildArabicWorkflowTemplateParams(params, actors));
   }
 
   const commentIdx = normalized.indexOf(': ');
@@ -1233,6 +1414,31 @@ export function resolveWorkflowContentAr(
     return interpolate(WORKFLOW_TEMPLATES.request_approval_pending_from.ar, { name: nameAr });
   }
 
+  // Legacy HR worker strings (pre-i18n catalog)
+  if (normalized === 'Send Notification') {
+    return WORKFLOW_TEMPLATES.notification_sent_pending?.ar ?? null;
+  }
+  const notificationSuccessVariants = [
+    'notification sent successfully',
+    'notification sent sucessfully',
+    'notification sent',
+  ];
+  if (notificationSuccessVariants.includes(normalized.toLowerCase())) {
+    return WORKFLOW_TEMPLATES.notification_sent_successfully?.ar ?? null;
+  }
+  const legacyPendingPrefix = 'Approval pending from ';
+  if (normalized.startsWith(legacyPendingPrefix)) {
+    const namePartEn = normalized.slice(legacyPendingPrefix.length).trim();
+    const nameAr = resolveArabicWorkflowActorName(actors, namePartEn);
+    return interpolate(WORKFLOW_TEMPLATES.request_approval_pending_from.ar, { name: nameAr });
+  }
+  if (
+    normalized === 'Approval Pending from HR Section' ||
+    normalized === 'Approval Pending from Records Department'
+  ) {
+    return WORKFLOW_TEMPLATES.request_approval_pending?.ar ?? null;
+  }
+
   return null;
 }
 
@@ -1270,9 +1476,54 @@ export function enrichWorkflowLog(log: Record<string, unknown>): Record<string,
   const status = log.status != null ? String(log.status) : null;
   const content = log.content != null ? String(log.content) : null;
   const actors = extractBilingualActorsFromRecord(log);
+  const resolvedAr = resolveWorkflowContentAr(content, actors);
+  const existingAr =
+    log.content_ar != null && String(log.content_ar).trim() !== ''
+      ? String(log.content_ar)
+      : null;
+  // Re-resolve when stored AR still embeds the English actor parsed from `content`.
+  const pendingPrefix = WORKFLOW_TEMPLATES.request_approval_pending_from?.en.split('{{name}}')[0].trim();
+  let content_ar = existingAr ?? resolvedAr;
+  if (
+    content &&
+    pendingPrefix &&
+    content.startsWith(pendingPrefix) &&
+    existingAr &&
+    resolvedAr &&
+    existingAr !== resolvedAr
+  ) {
+    const namePartEn = content.slice(pendingPrefix.length).trim();
+    if (namePartEn && existingAr.includes(namePartEn)) {
+      content_ar = resolvedAr;
+    }
+  }
+  if (
+    content &&
+    existingAr &&
+    resolvedAr &&
+    existingAr !== resolvedAr &&
+    /Request assigned to/i.test(existingAr)
+  ) {
+    content_ar = resolvedAr;
+  }
+  if (
+    content &&
+    existingAr &&
+    resolvedAr &&
+    existingAr !== resolvedAr &&
+    actors?.roleName?.trim() &&
+    actors?.roleArabicName?.trim() &&
+    existingAr.includes(actors.roleName.trim())
+  ) {
+    content_ar = resolvedAr;
+  }
+  if ((content_ar == null || content_ar === '') && content) {
+    const notificationAr = resolveWorkflowContentAr(content, actors);
+    if (notificationAr) content_ar = notificationAr;
+  }
   return {
     ...log,
-    content_ar: log.content_ar ?? resolveWorkflowContentAr(content, actors),
+    content_ar,
     status_ar: log.status_ar ?? resolveWorkflowStatusAr(status),
   };
 }

package/src/index.ts

@@ -498,7 +498,9 @@ export * from './models/RespondToEnquiriesAttachmentModel';
 export {RespondToEnquiriesRequestAttachment} from './models/RespondToEnquiriesAttachmentModel';
 export * from './models/RequestATenderRequestModel';
 export * from './models/RequestTenderAnalysisRequestModel';
-export * from './models/ContractServiceRequestModel';export * from './models/SlaConfigModel';
+export * from './models/ContractServiceRequestModel';
+export * from './models/ContractServiceRequestDocumentModel';
+export * from './models/SlaConfigModel';
 export * from './models/SlaRequestModel';
 export * from './models/SlaMyRequestsViewModel';
 export * from './models/SlaApprovalsViewModel';

package/src/models/ContractServiceRequestDocumentModel.ts

@@ -0,0 +1,35 @@
+import { Column, Entity } from 'typeorm';
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'contract_service_request_documents' })
+export class ContractServiceRequestDocument extends BaseModel {
+  @Column({ type: 'integer', nullable: false })
+  request_id: number;
+
+  @Column({ type: 'integer', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: false })
+  document_name: string;
+
+  @Column({ type: 'text', nullable: true })
+  description: string | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: false })
+  file_url: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  file_name: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  file_type: string | null;
+
+  @Column({ type: 'bigint', nullable: true })
+  file_size: number | null;
+
+  @Column({ type: 'integer', nullable: false })
+  uploaded_by: number;
+}

package/src/models/ContractServiceRequestModel.ts

@@ -43,6 +43,12 @@ export class ContractServiceRequest extends BaseModel {
     @Column({ type: "varchar", length: 255, nullable: false })
     company_name: string;
 
+    @Column({ type: "varchar", length: 30, nullable: true })
+    company_phone_number: string | null;
+
+    @Column({ type: "text", nullable: true })
+    notes: string | null;
+
     @Column({
         type: "enum",
         enum: RespondToEnquiriesRequestStatus,

package/src/models/FollowUpReportItemModel.ts

@@ -44,4 +44,16 @@ export class FollowUpReportItem extends BaseModel {
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   delay_period: string | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  file_url: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  file_name: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  file_type: string | null;
+
+  @Column({ type: 'bigint', nullable: true })
+  file_size: number | null;
 }

package/src/models/FollowUpReportRequestModel.ts

@@ -8,8 +8,17 @@ export enum FollowUpReportSubjectClassification {
   CONFIDENTIAL = 'Confidential',
   INFORMATIONAL = 'Informational',
   NORMAL = 'Normal',
+  IMPORTANT = 'Important',
+  HIGHLY_CONFIDENTIAL = 'Highly Confidential',
+  RESTRICTED = 'Restricted',
+  LIMITED = 'Limited',
 }
 
+/** Allowed API/DB values for follow-up report subject classification. */
+export const FOLLOW_UP_REPORT_SUBJECT_CLASSIFICATION_VALUES = Object.values(
+  FollowUpReportSubjectClassification,
+) as FollowUpReportSubjectClassification[];
+
 /** Concerned department under General Manager of Support Services */
 export enum FollowUpReportConcernedDepartment {
   IT = 'IT',

package/src/models/RespondToEnquiriesAttachmentModel.ts

@@ -30,6 +30,9 @@ export class RespondToEnquiriesRequestAttachment extends BaseModel {
     @Column({ type: "text", nullable: true })
     description: string;
 
+    @Column({ type: "varchar", length: 500, nullable: true })
+    document_name: string | null;
+
     constructor(
         request_id: number,
         uploaded_by: number,
@@ -39,7 +42,8 @@ export class RespondToEnquiriesRequestAttachment extends BaseModel {
         file_name?: string,
         file_type?: string,
         file_size?: number,
-        description?: string
+        description?: string,
+        document_name?: string
     ) {
         super();
         this.request_id = request_id;
@@ -51,5 +55,6 @@ export class RespondToEnquiriesRequestAttachment extends BaseModel {
         this.file_type = file_type || "";
         this.file_size = file_size || null;
         this.description = description || "";
+        this.document_name = document_name || null;
     }
 }