@platform-modules/foreign-ministry 1.3.350 → 1.3.355

package/src/index.ts

@@ -98,6 +98,7 @@ export * from './models/UpdateAttendanceWorkflowModel';
 export * from './models/SlaRequestModel';
 export * from './models/ServiceSlaApprovalModel';
 export * from './models/SlaConfigModel';
+export * from './models/ChatbotQnsAnsMappingModel';
 export * from './models/GeneralServiceRequestsModel';
 export * from './models/GeneralServiceApprovalsModel';
 export * from './models/GeneralServiceWorkFlowModel';

package/src/models/ChatbotQnsAnsMappingModel.ts

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

package/src/models/SlaApprovalsViewModel.ts

@@ -29,7 +29,14 @@ SELECT
     sa.updated_at AS updated_at
 FROM sla_approval sa
 INNER JOIN sla_requests sr
-    ON sr.request_id = sa.request_id AND COALESCE(sr.is_deleted, false) = false
+    ON sr.id = (
+        SELECT MIN(sr2.id)
+        FROM sla_requests sr2
+        WHERE sr2.request_id = sa.request_id
+          AND COALESCE(sr2.is_deleted, false) = false
+          AND (sa.service_id IS NULL OR sr2.service_id = sa.service_id)
+          AND (sa.sub_service_id IS NULL OR sr2.sub_service_id = sa.sub_service_id)
+    )
 LEFT JOIN fm_services svc
     ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
 LEFT JOIN fm_sub_services subsvc

package/src/models/SlaMyRequestsViewModel.ts

@@ -63,8 +63,13 @@ SELECT
         - 'is_deleted'
         - 'sla_request'
         - 'sla_request_id'
-    ) AS request_fields
+    ) AS request_fields,
+    TRIM(COALESCE(dept.department_arabic_name, ''))::TEXT AS req_user_department_arabicname,
+    TRIM(COALESCE(sec.section_arabic_name, ''))::TEXT AS req_user_section_arabicname,
+    TRIM(COALESCE(req_user.employee_arabic_name, ''))::TEXT AS req_user_arabicname
 FROM sla_requests sr
+LEFT JOIN users req_user
+    ON req_user.id = sr.user_id AND COALESCE(req_user.is_deleted, false) = false
 LEFT JOIN users creator
     ON sr.created_by ~ '^[0-9]+$'
     AND creator.id = sr.created_by::integer
@@ -132,6 +137,15 @@ export class SlaMyRequestsView {
     /** Remaining `request_obj` keys after excluding workflow/common duplicates. */
     @ViewColumn()
     request_fields: Record<string, unknown>;
+
+    @ViewColumn()
+    req_user_department_arabicname: string;
+
+    @ViewColumn()
+    req_user_section_arabicname: string;
+
+    @ViewColumn()
+    req_user_arabicname: string;
 }
 
 /** Flatten view row: fixed columns plus each entry in `request_fields`. */
@@ -152,6 +166,9 @@ export function flattenSlaMyRequestsViewRow(
         status,
         request_id,
         request_fields,
+        req_user_department_arabicname,
+        req_user_section_arabicname,
+        req_user_arabicname,
     } = row;
 
     return {
@@ -167,6 +184,9 @@ export function flattenSlaMyRequestsViewRow(
         sub_service_name,
         status,
         request_id,
+        req_user_department_arabicname,
+        req_user_section_arabicname,
+        req_user_arabicname,
         ...(request_fields ?? {}),
     };
 }