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

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

@@ -20,9 +20,12 @@ 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;
+exports.buildUserEnteredChatPersistFields = buildUserEnteredChatPersistFields;
 exports.buildApprovalWorkflowContent = buildApprovalWorkflowContent;
 exports.buildHumanApprovalWorkflowContent = buildHumanApprovalWorkflowContent;
 exports.buildApprovalChatMessage = buildApprovalChatMessage;
@@ -49,6 +52,7 @@ exports.resolveChatStatusAr = resolveChatStatusAr;
 exports.extractBilingualActorsFromRecord = extractBilingualActorsFromRecord;
 exports.resolveWorkflowContentAr = resolveWorkflowContentAr;
 exports.resolveChatMessageAr = resolveChatMessageAr;
+exports.isSystemGeneratedChatMessage = isSystemGeneratedChatMessage;
 exports.enrichWorkflowLog = enrichWorkflowLog;
 exports.enrichChatMessage = enrichChatMessage;
 /**
@@ -231,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';
@@ -274,6 +342,15 @@ function toChatPersistFields(bilingual, status) {
         status_ar: resolveChatStatusAr(status),
     };
 }
+/** User-typed chat — never auto-translate; message_ar stays null. */
+function buildUserEnteredChatPersistFields(message, status) {
+    return {
+        message,
+        message_ar: null,
+        status,
+        status_ar: resolveChatStatusAr(status),
+    };
+}
 function buildApprovalWorkflowContent(params) {
     const status = params.status;
     let action;
@@ -505,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: '' };
@@ -579,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': {
@@ -681,22 +774,124 @@ 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, '\\$&');
+}
+/** Match a templated EN message and extract placeholder values (full-structure match). */
+function matchTemplateMessage(templateEn, message) {
+    if (!/\{\{\w+\}\}/.test(templateEn))
+        return null;
+    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];
+        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));
+    const match = message.match(new RegExp(`^${regexBody}$`, 's'));
+    if (!match)
+        return null;
+    const params = {};
+    captures.forEach(({ key, groupIndex: idx }) => {
+        params[key] = match[idx] ?? '';
+    });
+    return params;
+}
+function buildArabicChatTemplateParams(params, actors) {
+    const arParams = { ...params };
+    if (params.roleName !== undefined) {
+        arParams.roleName = resolveArabicChatRoleName(actors, params.roleName.trim());
+    }
+    if (params.userName !== undefined) {
+        arParams.userName = actors?.userName?.trim()
+            ? resolveBilingualName(actors.userName, actors.userArabicName)
+            : resolveBilingualName(params.userName.trim(), actors?.userArabicName);
+    }
+    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();
@@ -731,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) {
@@ -741,47 +958,67 @@ function resolveChatMessageAr(message, actors) {
         if (tpl.en === normalized)
             return tpl.ar;
     }
-    for (const tplKey of ['request_submitted_by', 'cancellation_submitted_by']) {
-        const submittedTpl = CHAT_TEMPLATES[tplKey];
-        if (!submittedTpl)
-            continue;
-        const prefix = submittedTpl.en.split('{{userName}}')[0];
-        if (!normalized.startsWith(prefix))
-            continue;
-        const afterPrefix = normalized.slice(prefix.length);
-        const parenMatch = afterPrefix.match(/^(.+?) \((.+)\)$/);
-        if (parenMatch) {
-            const userEn = parenMatch[1].trim();
-            const employeeId = parenMatch[2].trim();
-            const userAr = actors?.userName?.trim()
-                ? resolveBilingualName(actors.userName, actors.userArabicName)
-                : resolveBilingualName(userEn, actors?.userArabicName);
-            return interpolate(submittedTpl.ar, { userName: userAr, employeeId });
-        }
-    }
     for (const tpl of Object.values(CHAT_TEMPLATES)) {
-        if (!tpl.en.includes('{{roleName}}'))
+        if (!/\{\{\w+\}\}/.test(tpl.en))
             continue;
-        const prefix = tpl.en.split('{{roleName}}')[0];
-        if (!normalized.startsWith(prefix))
+        const params = matchTemplateMessage(tpl.en, normalized);
+        if (!params)
             continue;
-        const rest = normalized.slice(prefix.length);
-        const commentIdx = rest.lastIndexOf(' - ');
-        const roleNameEn = commentIdx >= 0 ? rest.slice(0, commentIdx) : rest;
-        const commentSuffix = commentIdx >= 0 ? rest.slice(commentIdx) : '';
-        const roleNameAr = resolveArabicChatRoleName(actors, roleNameEn.trim());
-        return interpolate(tpl.ar, { roleName: roleNameAr, comment: commentSuffix });
+        return interpolate(tpl.ar, buildArabicChatTemplateParams(params, actors));
     }
     return null;
 }
+/** True when message matches a known system chat template (safe to resolve message_ar). */
+function isSystemGeneratedChatMessage(message, actors) {
+    return resolveChatMessageAr(message, actors) != null;
+}
 /** 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 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

@@ -354,6 +354,7 @@ export * from './models/MaintenanceAttachmentModel';
 export * from './models/MaintenanceChatModel';
 export * from './models/MaintenanceWorkflowModel';
 export * from './models/FollowUpReportRequestModel';
+export * from './models/FollowUpReportItemModel';
 export * from './models/FollowUpReportApprovalModel';
 export * from './models/FollowUpReportAttachmentModel';
 export * from './models/FollowUpReportChatModel';
@@ -408,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

@@ -527,6 +527,7 @@ __exportStar(require("./models/MaintenanceAttachmentModel"), exports);
 __exportStar(require("./models/MaintenanceChatModel"), exports);
 __exportStar(require("./models/MaintenanceWorkflowModel"), exports);
 __exportStar(require("./models/FollowUpReportRequestModel"), exports);
+__exportStar(require("./models/FollowUpReportItemModel"), exports);
 __exportStar(require("./models/FollowUpReportApprovalModel"), exports);
 __exportStar(require("./models/FollowUpReportAttachmentModel"), exports);
 __exportStar(require("./models/FollowUpReportChatModel"), exports);
@@ -597,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

@@ -0,0 +1,20 @@
+import { BaseModel } from './BaseModel';
+import { FollowUpReportSubjectClassification } from './FollowUpReportRequestModel';
+export declare class FollowUpReportItem extends BaseModel {
+    request_id: number;
+    service_id: number | null;
+    sub_service_id: number | null;
+    reference_type: string | null;
+    letter_date: Date | null;
+    subject: string | null;
+    subject_classification: FollowUpReportSubjectClassification | null;
+    general_manager_comment: string | null;
+    response_date_target: string | null;
+    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

@@ -0,0 +1,90 @@
+"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.FollowUpReportItem = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const FollowUpReportRequestModel_1 = require("./FollowUpReportRequestModel");
+let FollowUpReportItem = class FollowUpReportItem extends BaseModel_1.BaseModel {
+};
+exports.FollowUpReportItem = FollowUpReportItem;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], FollowUpReportItem.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "reference_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "letter_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "subject", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: 'enum',
+        enum: FollowUpReportRequestModel_1.FollowUpReportSubjectClassification,
+        enumName: 'maintenance_subject_classification_en',
+        nullable: true,
+    }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "subject_classification", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "general_manager_comment", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "response_date_target", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "action_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "action_taken", void 0);
+__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",
@@ -36,6 +42,11 @@ export declare class FollowUpReportRequests extends BaseModel {
     concerned_department: FollowUpReportConcernedDepartment;
     date_from: Date;
     date_to: Date;
+    general_manager_comment: string | null;
+    response_date_target: string | null;
+    action_status: string | null;
+    action_taken: string | null;
+    delay_period: string | null;
     request_submission_date: Date;
     status: FollowUpReportRequestStatus;
     workflow_execution_id: string | null;