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

package/sql/caa_api_payload_changes_2026_07.sql

@@ -30,3 +30,82 @@ 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';
+
+-- 7b. Repair failed TypeORM enum swap (items column can remain on _old type)
+DO $$
+BEGIN
+  IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'maintenance_subject_classification_en_old') THEN
+    IF EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_items'
+        AND column_name = 'subject_classification'
+        AND udt_name = 'maintenance_subject_classification_en_old'
+    ) THEN
+      ALTER TABLE followup_report_items
+        ALTER COLUMN subject_classification TYPE maintenance_subject_classification_en
+        USING subject_classification::text::maintenance_subject_classification_en;
+    END IF;
+
+    IF EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_requests'
+        AND column_name = 'subject_classification'
+        AND udt_name = 'maintenance_subject_classification_en_old'
+    ) THEN
+      ALTER TABLE followup_report_requests
+        ALTER COLUMN subject_classification TYPE maintenance_subject_classification_en
+        USING subject_classification::text::maintenance_subject_classification_en;
+    END IF;
+
+    DROP TYPE maintenance_subject_classification_en_old;
+  END IF;
+END $$;
+
+-- 7c. Report items use varchar (nullable) so TypeORM sync does not fight shared PG enum on two tables
+ALTER TABLE followup_report_items
+  ALTER COLUMN subject_classification TYPE VARCHAR(100)
+  USING subject_classification::text;
+
+-- 8. Contract service request: notes, company phone, contract documents table
+ALTER TABLE contract_service_requests
+  ADD COLUMN IF NOT EXISTS notes TEXT,
+  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/sql/fix_maintenance_subject_classification_enum_2026_07.sql

@@ -0,0 +1,48 @@
+-- Run this BEFORE shared_models synchronize if you see:
+--   cannot drop type maintenance_subject_classification_en_old because other objects depend on it
+--
+-- Safe to re-run.
+
+-- Add new enum values on the live type (no-op if already present)
+ALTER TYPE maintenance_subject_classification_en ADD VALUE IF NOT EXISTS 'Important';
+ALTER TYPE maintenance_subject_classification_en ADD VALUE IF NOT EXISTS 'Highly Confidential';
+ALTER TYPE maintenance_subject_classification_en ADD VALUE IF NOT EXISTS 'Restricted';
+ALTER TYPE maintenance_subject_classification_en ADD VALUE IF NOT EXISTS 'Limited';
+
+DO $$
+BEGIN
+  IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'maintenance_subject_classification_en_old') THEN
+    IF EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_items'
+        AND column_name = 'subject_classification'
+        AND udt_name = 'maintenance_subject_classification_en_old'
+    ) THEN
+      ALTER TABLE followup_report_items
+        ALTER COLUMN subject_classification TYPE maintenance_subject_classification_en
+        USING subject_classification::text::maintenance_subject_classification_en;
+    END IF;
+
+    IF EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_requests'
+        AND column_name = 'subject_classification'
+        AND udt_name = 'maintenance_subject_classification_en_old'
+    ) THEN
+      ALTER TABLE followup_report_requests
+        ALTER COLUMN subject_classification TYPE maintenance_subject_classification_en
+        USING subject_classification::text::maintenance_subject_classification_en;
+    END IF;
+
+    DROP TYPE maintenance_subject_classification_en_old;
+  END IF;
+END $$;
+
+-- Items column: varchar avoids TypeORM multi-table PG enum sync failures
+ALTER TABLE followup_report_items
+  ALTER COLUMN subject_classification TYPE VARCHAR(100)
+  USING subject_classification::text;

package/src/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

@@ -1,6 +1,5 @@
 import { Column, Entity } from 'typeorm';
 import { BaseModel } from './BaseModel';
-import { FollowUpReportSubjectClassification } from './FollowUpReportRequestModel';
 
 @Entity({ name: 'followup_report_items' })
 export class FollowUpReportItem extends BaseModel {
@@ -22,13 +21,8 @@ export class FollowUpReportItem extends BaseModel {
   @Column({ type: 'varchar', length: 500, nullable: true })
   subject: string | null;
 
-  @Column({
-    type: 'enum',
-    enum: FollowUpReportSubjectClassification,
-    enumName: 'maintenance_subject_classification_en',
-    nullable: true,
-  })
-  subject_classification: FollowUpReportSubjectClassification | null;
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  subject_classification: string | null;
 
   @Column({ type: 'varchar', length: 500, nullable: true })
   general_manager_comment: string | null;
@@ -44,4 +38,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;
     }
 }