@platform-modules/civil-aviation-authority 2.3.305 → 2.3.307

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

@@ -214,6 +214,10 @@
       "en": "Request Received",
       "ar": "تم استلام الطلب"
     },
+    "request_received_by_role": {
+      "en": "Request Received by {{roleName}}",
+      "ar": "تم استلام الطلب من قبل {{roleName}}"
+    },
     "request_assigned_by_role": {
       "en": "Request assigned by {{roleName}}{{comment}}",
       "ar": "تم تعيين الطلب من قبل {{roleName}}{{comment}}"

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

@@ -80,6 +80,17 @@ export declare function buildSynchronizedWorkflowMessage(ctx: WorkflowMessageCon
  * Use for every chat insert/update across all CAA modules.
  */
 export declare function buildSynchronizedChatMessage(ctx: ChatMessageContext): BilingualText;
+/** Chat row: "Request Received by {{roleName}}" with Arabic role name when available. */
+export declare function buildRequestReceivedByRoleChatMessage(params: {
+    roleName: string;
+    roleArabicName?: string | null;
+}): BilingualText;
+/** Chat row: "Request assigned by {{roleName}}" with optional ". Comment: ..." suffix. */
+export declare function buildAssignmentByRoleChatMessage(params: {
+    roleName: string;
+    roleArabicName?: string | null;
+    comment?: string | null;
+}): BilingualText;
 export type RequestApprovedAssignedWorkflowParams = {
     assignedUserName: string;
     roleName: string;

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

@@ -24,6 +24,8 @@ exports.buildAssignTasksEmpPendingWorkflowFields = buildAssignTasksEmpPendingWor
 exports.chatTemplate = chatTemplate;
 exports.buildSynchronizedWorkflowMessage = buildSynchronizedWorkflowMessage;
 exports.buildSynchronizedChatMessage = buildSynchronizedChatMessage;
+exports.buildRequestReceivedByRoleChatMessage = buildRequestReceivedByRoleChatMessage;
+exports.buildAssignmentByRoleChatMessage = buildAssignmentByRoleChatMessage;
 exports.tryParseRequestAssignedComment = tryParseRequestAssignedComment;
 exports.buildRequestApprovedAssignedWorkflowFields = buildRequestApprovedAssignedWorkflowFields;
 exports.buildWorkflowLogUpdateFields = buildWorkflowLogUpdateFields;
@@ -315,6 +317,19 @@ function buildSynchronizedChatMessage(ctx) {
             return chatTemplate('request_received');
     }
 }
+/** Chat row: "Request Received by {{roleName}}" with Arabic role name when available. */
+function buildRequestReceivedByRoleChatMessage(params) {
+    const roleEn = params.roleName?.trim() || 'Approver';
+    const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+    return renderSynchronizedChatMessage('request_received_by_role', { roleName: roleEn }, { roleName: roleAr });
+}
+/** Chat row: "Request assigned by {{roleName}}" with optional ". Comment: ..." suffix. */
+function buildAssignmentByRoleChatMessage(params) {
+    const roleEn = params.roleName?.trim() || 'Unknown Role';
+    const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+    const commentSuffix = params.comment?.trim() ? `. Comment: ${params.comment.trim()}` : '';
+    return renderSynchronizedChatMessage('request_assigned_by_role', { roleName: roleEn, comment: commentSuffix }, { roleName: roleAr, comment: commentSuffix });
+}
 /** Parse legacy English-only assignment comments used as workflow log suffixes. */
 function parseRequestAssignedCommentText(text) {
     const normalized = text.trim();
@@ -1392,6 +1407,14 @@ function resolveChatMessageAr(message, actors) {
             continue;
         return interpolate(tpl.ar, buildArabicChatTemplateParams(params, actors));
     }
+    const receivedByPrefix = 'Request Received by ';
+    if (normalized.startsWith(receivedByPrefix)) {
+        const rolePartEn = normalized.slice(receivedByPrefix.length).trim();
+        if (rolePartEn) {
+            const roleAr = resolveBilingualName(rolePartEn, actors?.roleArabicName);
+            return renderSynchronizedChatMessage('request_received_by_role', { roleName: rolePartEn }, { roleName: roleAr }).ar;
+        }
+    }
     return null;
 }
 /** True when message matches a known system chat template (safe to resolve message_ar). */

package/dist/models/FollowUpReportRequestModel.d.ts

@@ -40,6 +40,7 @@ export declare class FollowUpReportRequests extends BaseModel {
     subject_classification: FollowUpReportSubjectClassification;
     topic: string;
     concerned_department: FollowUpReportConcernedDepartment;
+    relevant_department: string | null;
     date_from: Date;
     date_to: Date;
     general_manager_comment: string | null;

package/dist/models/FollowUpReportRequestModel.js

@@ -101,6 +101,10 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], FollowUpReportRequests.prototype, "concerned_department", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportRequests.prototype, "relevant_department", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: false }),
     __metadata("design:type", Date)

package/package.json

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

package/sql/caa_api_payload_changes_2026_07.sql

@@ -143,3 +143,7 @@ ALTER TABLE followup_report_items
 -- 10. Departments: optional parent DG department reference (self FK to departments.id)
 ALTER TABLE departments
   ADD COLUMN IF NOT EXISTS "DG_department_id" INTEGER NULL;
+
+-- 11. Follow-up report requests: optional relevant department
+ALTER TABLE followup_report_requests
+  ADD COLUMN IF NOT EXISTS relevant_department VARCHAR(255) NULL;

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

@@ -214,6 +214,10 @@
       "en": "Request Received",
       "ar": "تم استلام الطلب"
     },
+    "request_received_by_role": {
+      "en": "Request Received by {{roleName}}",
+      "ar": "تم استلام الطلب من قبل {{roleName}}"
+    },
     "request_assigned_by_role": {
       "en": "Request assigned by {{roleName}}{{comment}}",
       "ar": "تم تعيين الطلب من قبل {{roleName}}{{comment}}"

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

@@ -456,6 +456,36 @@ export function buildSynchronizedChatMessage(ctx: ChatMessageContext): Bilingual
   }
 }
 
+/** Chat row: "Request Received by {{roleName}}" with Arabic role name when available. */
+export function buildRequestReceivedByRoleChatMessage(params: {
+  roleName: string;
+  roleArabicName?: string | null;
+}): BilingualText {
+  const roleEn = params.roleName?.trim() || 'Approver';
+  const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+  return renderSynchronizedChatMessage(
+    'request_received_by_role',
+    { roleName: roleEn },
+    { roleName: roleAr },
+  );
+}
+
+/** Chat row: "Request assigned by {{roleName}}" with optional ". Comment: ..." suffix. */
+export function buildAssignmentByRoleChatMessage(params: {
+  roleName: string;
+  roleArabicName?: string | null;
+  comment?: string | null;
+}): BilingualText {
+  const roleEn = params.roleName?.trim() || 'Unknown Role';
+  const roleAr = resolveBilingualName(roleEn, params.roleArabicName);
+  const commentSuffix = params.comment?.trim() ? `. Comment: ${params.comment.trim()}` : '';
+  return renderSynchronizedChatMessage(
+    'request_assigned_by_role',
+    { roleName: roleEn, comment: commentSuffix },
+    { roleName: roleAr, comment: commentSuffix },
+  );
+}
+
 // ─── Backward-compatible aliases used by Cancellation pilot ───────────────────
 
 export type RequestApprovedAssignedWorkflowParams = {
@@ -2044,6 +2074,19 @@ export function resolveChatMessageAr(
     return interpolate(tpl.ar, buildArabicChatTemplateParams(params, actors));
   }
 
+  const receivedByPrefix = 'Request Received by ';
+  if (normalized.startsWith(receivedByPrefix)) {
+    const rolePartEn = normalized.slice(receivedByPrefix.length).trim();
+    if (rolePartEn) {
+      const roleAr = resolveBilingualName(rolePartEn, actors?.roleArabicName);
+      return renderSynchronizedChatMessage(
+        'request_received_by_role',
+        { roleName: rolePartEn },
+        { roleName: roleAr },
+      ).ar;
+    }
+  }
+
   return null;
 }
 

package/src/models/FollowUpReportRequestModel.ts

@@ -81,6 +81,9 @@ export class FollowUpReportRequests extends BaseModel {
   })
   concerned_department: FollowUpReportConcernedDepartment;
 
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  relevant_department: string | null;
+
   @Column({ type: 'date', nullable: false })
   date_from: Date;