@platform-modules/foreign-ministry 1.3.350 → 1.3.355

package/.env

@@ -1,5 +1,5 @@
-DB_HOST=10.0.1.74
+DB_HOST=169.58.34.60
 DB_PORT=5432
-DB_USER=appuser
-DB_PASS=hrms@fm1292
-DB_NAME=fm
+DB_USER=postgres_admin_user
+DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+DB_NAME=FM

package/dist/data-source.js

@@ -332,6 +332,7 @@ const EmbassyEvaluationAttachmentModel_1 = require("./models/EmbassyEvaluationAt
 const SlaRequestModel_1 = require("./models/SlaRequestModel");
 const ServiceSlaApprovalModel_1 = require("./models/ServiceSlaApprovalModel");
 const SlaConfigModel_1 = require("./models/SlaConfigModel");
+const ChatbotQnsAnsMappingModel_1 = require("./models/ChatbotQnsAnsMappingModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -670,5 +671,6 @@ exports.AppDataSource = new typeorm_1.DataSource({
         SlaRequestModel_1.SlaRequest,
         ServiceSlaApprovalModel_1.ServiceSlaApproval,
         SlaConfigModel_1.SlaConfig,
+        ChatbotQnsAnsMappingModel_1.ChatbotQnsAnsMapping,
     ],
 });

package/dist/index.d.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/dist/index.js

@@ -118,6 +118,7 @@ __exportStar(require("./models/UpdateAttendanceWorkflowModel"), exports);
 __exportStar(require("./models/SlaRequestModel"), exports);
 __exportStar(require("./models/ServiceSlaApprovalModel"), exports);
 __exportStar(require("./models/SlaConfigModel"), exports);
+__exportStar(require("./models/ChatbotQnsAnsMappingModel"), exports);
 __exportStar(require("./models/GeneralServiceRequestsModel"), exports);
 __exportStar(require("./models/GeneralServiceApprovalsModel"), exports);
 __exportStar(require("./models/GeneralServiceWorkFlowModel"), exports);

package/dist/models/ChatbotQnsAnsMappingModel.d.ts

@@ -0,0 +1,8 @@
+import { BaseModel } from "./BaseModel";
+export declare class ChatbotQnsAnsMapping extends BaseModel {
+    service_id: number;
+    sub_service_id: number;
+    question: Record<string, unknown> | unknown[];
+    answer: Record<string, unknown> | unknown[];
+    constructor();
+}

package/dist/models/ChatbotQnsAnsMappingModel.js

@@ -0,0 +1,40 @@
+"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.ChatbotQnsAnsMapping = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ChatbotQnsAnsMapping = class ChatbotQnsAnsMapping extends BaseModel_1.BaseModel {
+    constructor() {
+        super();
+    }
+};
+exports.ChatbotQnsAnsMapping = ChatbotQnsAnsMapping;
+__decorate([
+    (0, typeorm_1.Column)({ type: "int", nullable: false }),
+    __metadata("design:type", Number)
+], ChatbotQnsAnsMapping.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "int", nullable: false }),
+    __metadata("design:type", Number)
+], ChatbotQnsAnsMapping.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "jsonb", nullable: false }),
+    __metadata("design:type", Object)
+], ChatbotQnsAnsMapping.prototype, "question", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "jsonb", nullable: false }),
+    __metadata("design:type", Object)
+], ChatbotQnsAnsMapping.prototype, "answer", void 0);
+exports.ChatbotQnsAnsMapping = ChatbotQnsAnsMapping = __decorate([
+    (0, typeorm_1.Entity)({ name: "chatbot_qns_ans_mapping" }),
+    __metadata("design:paramtypes", [])
+], ChatbotQnsAnsMapping);

package/dist/models/SlaApprovalsViewModel.js

@@ -40,7 +40,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/dist/models/SlaMyRequestsViewModel.d.ts

@@ -24,6 +24,9 @@ export declare class SlaMyRequestsView {
     request_id: number;
     /** Remaining `request_obj` keys after excluding workflow/common duplicates. */
     request_fields: Record<string, unknown>;
+    req_user_department_arabicname: string;
+    req_user_section_arabicname: string;
+    req_user_arabicname: string;
 }
 /** Flatten view row: fixed columns plus each entry in `request_fields`. */
 export declare function flattenSlaMyRequestsViewRow(row: SlaMyRequestsView): Record<string, unknown>;

package/dist/models/SlaMyRequestsViewModel.js

@@ -73,8 +73,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
@@ -149,6 +154,18 @@ __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Object)
 ], SlaMyRequestsView.prototype, "request_fields", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], SlaMyRequestsView.prototype, "req_user_department_arabicname", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], SlaMyRequestsView.prototype, "req_user_section_arabicname", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], SlaMyRequestsView.prototype, "req_user_arabicname", void 0);
 exports.SlaMyRequestsView = SlaMyRequestsView = __decorate([
     (0, typeorm_1.ViewEntity)({
         name: "vw_sla_my_requests",
@@ -157,7 +174,7 @@ exports.SlaMyRequestsView = SlaMyRequestsView = __decorate([
 ], SlaMyRequestsView);
 /** Flatten view row: fixed columns plus each entry in `request_fields`. */
 function flattenSlaMyRequestsViewRow(row) {
-    const { sla_request_id, user_id, service_id, sub_service_id, created_by, created_at, req_user_department_id, req_user_section_id, service_name, sub_service_name, status, request_id, request_fields, } = row;
+    const { sla_request_id, user_id, service_id, sub_service_id, created_by, created_at, req_user_department_id, req_user_section_id, service_name, sub_service_name, status, request_id, request_fields, req_user_department_arabicname, req_user_section_arabicname, req_user_arabicname, } = row;
     return {
         sla_request_id,
         user_id,
@@ -171,6 +188,9 @@ function flattenSlaMyRequestsViewRow(row) {
         sub_service_name,
         status,
         request_id,
+        req_user_department_arabicname,
+        req_user_section_arabicname,
+        req_user_arabicname,
         ...(request_fields ?? {}),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/foreign-ministry",
- "version": "1.3.350",
+ "version": "1.3.355",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "exports": {

package/sql/create_chatbot_qns_ans_mapping.sql

@@ -0,0 +1,25 @@
+-- Chatbot Q&A mapping master table (User Service)
+-- PostgreSQL
+
+CREATE TABLE IF NOT EXISTS chatbot_qns_ans_mapping (
+    id SERIAL PRIMARY KEY,
+    service_id INTEGER NOT NULL,
+    sub_service_id INTEGER NOT NULL,
+    question JSONB NOT NULL,
+    answer JSONB NOT NULL,
+    created_by VARCHAR NULL,
+    created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
+    updated_by VARCHAR NULL,
+    updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
+    is_deleted BOOLEAN DEFAULT FALSE
+);
+
+CREATE INDEX IF NOT EXISTS idx_chatbot_qns_ans_mapping_service_sub_service
+    ON chatbot_qns_ans_mapping (service_id, sub_service_id)
+    WHERE is_deleted = FALSE;
+
+CREATE INDEX IF NOT EXISTS idx_chatbot_qns_ans_mapping_question_gin
+    ON chatbot_qns_ans_mapping USING GIN (question);
+
+CREATE INDEX IF NOT EXISTS idx_chatbot_qns_ans_mapping_answer_gin
+    ON chatbot_qns_ans_mapping USING GIN (answer);

package/sql/sla_reports_admin_procedures.sql

@@ -19,13 +19,15 @@ $$;
 -- Admin list views: served by Reports_Service TypeORM (sla-my-requests-view.query.ts, sla-approvals-view.query.ts)
 
 -- ---------------------------------------------------------------------------
--- ADMIN — my requests Excel (optional p_target_user_id)
+-- ADMIN — my requests Excel (optional p_target_user_ids INT[])
 -- Per sub-service Requests + Approvals sheets (same as user my-requests download)
 -- ---------------------------------------------------------------------------
 DROP FUNCTION IF EXISTS sp_sla_admin_my_requests_excel_export(INT, INT[], INT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS sp_sla_admin_my_requests_excel_export(INT, INT[], INT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT, TEXT);
+DROP FUNCTION IF EXISTS sp_sla_admin_my_requests_excel_export(INT[], INT[], INT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT, TEXT);
 
 CREATE OR REPLACE FUNCTION sp_sla_admin_my_requests_excel_export(
-  p_target_user_id    INT      DEFAULT NULL,
+  p_target_user_ids   INT[]    DEFAULT NULL,
   p_service_ids       INT[]    DEFAULT NULL,
   p_sub_service_ids   INT[]    DEFAULT NULL,
   p_statuses          TEXT[]   DEFAULT ARRAY['Pending','In Progress','Approved','Rejected'],
@@ -65,10 +67,20 @@ DECLARE
   v_k                 TEXT;
   v_sheet_order       INT := 0;
   v_user_filter       TEXT;
+  v_user_scope        TEXT;
 BEGIN
+  IF p_target_user_ids IS NULL OR cardinality(p_target_user_ids) = 0 THEN
+    v_user_scope := 'TRUE';
+  ELSE
+    v_user_scope := format(
+      'v.user_id = ANY (ARRAY[%s]::int[])',
+      array_to_string(p_target_user_ids, ',')
+    );
+  END IF;
+
   v_user_filter := format(
     '(%s) AND (%s)',
-    CASE WHEN p_target_user_id IS NULL THEN 'TRUE' ELSE format('v.user_id = %s', p_target_user_id) END,
+    v_user_scope,
     COALESCE(NULLIF(trim(p_extra_filter_sql), ''), 'TRUE')
   );
 
@@ -256,15 +268,21 @@ $$;
 
 -- ---------------------------------------------------------------------------
 -- ADMIN — approvals Excel
--- Per sub-service Requests + Approvals; optional approver_user_id (NULL = all queues)
+-- Per sub-service Requests + Approvals; optional approver user id(s) (NULL/empty = all queues)
 -- Does not exclude own requests (unlike user approvals download)
 -- ---------------------------------------------------------------------------
 DROP FUNCTION IF EXISTS sp_sla_admin_approvals_excel_export(
   INT, INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT
 );
+DROP FUNCTION IF EXISTS sp_sla_admin_approvals_excel_export(
+  INT, INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT, TEXT
+);
+DROP FUNCTION IF EXISTS sp_sla_admin_approvals_excel_export(
+  INT[], INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT, TEXT
+);
 
 CREATE OR REPLACE FUNCTION sp_sla_admin_approvals_excel_export(
-  p_target_approver_user_id INT      DEFAULT NULL,
+  p_target_approver_user_ids INT[]   DEFAULT NULL,
   p_service_ids             INT[]    DEFAULT NULL,
   p_sub_service_ids         INT[]    DEFAULT NULL,
   p_request_statuses        TEXT[]   DEFAULT ARRAY['Pending','In Progress','Approved','Rejected'],
@@ -283,7 +301,7 @@ LANGUAGE plpgsql
 STABLE
 AS $$
 DECLARE
-  v_exists TEXT := sla_approval_queue_exists_sql_optional(p_target_approver_user_id);
+  v_exists TEXT := sla_approval_queue_exists_sql_any(p_target_approver_user_ids);
   v_own    TEXT := COALESCE(NULLIF(trim(p_extra_filter_sql), ''), 'TRUE');
 BEGIN
   RETURN QUERY

package/sql/sla_reports_approvals_workbook.sql

@@ -96,6 +96,53 @@ AS $$
   END;
 $$;
 
+-- Admin: any of multiple approver user ids (NULL/empty = all queues)
+CREATE OR REPLACE FUNCTION sla_approval_queue_exists_sql_any(p_user_ids INT[])
+RETURNS TEXT
+LANGUAGE plpgsql
+STABLE
+AS $$
+DECLARE
+  v_id INT;
+  v_parts TEXT[] := ARRAY[]::TEXT[];
+  v_match TEXT;
+BEGIN
+  IF p_user_ids IS NULL OR cardinality(p_user_ids) = 0 THEN
+    RETURN sla_approval_queue_exists_sql_optional(NULL);
+  END IF;
+
+  IF cardinality(p_user_ids) = 1 THEN
+    RETURN sla_approval_queue_exists_sql(p_user_ids[1]);
+  END IF;
+
+  FOREACH v_id IN ARRAY p_user_ids LOOP
+    IF v_id IS NOT NULL AND v_id > 0 THEN
+      v_parts := array_append(v_parts, '(' || sla_approval_matches_user('appr', v_id) || ')');
+    END IF;
+  END LOOP;
+
+  IF cardinality(v_parts) = 0 THEN
+    RETURN sla_approval_queue_exists_sql_optional(NULL);
+  END IF;
+
+  v_match := array_to_string(v_parts, ' OR ');
+
+  RETURN format(
+    'EXISTS (
+      SELECT 1
+      FROM sla_approval appr
+      WHERE appr.request_id = sr.request_id
+        AND COALESCE(appr.is_deleted, false) = false
+        AND (appr.service_id = sr.service_id OR appr.service_id IS NULL)
+        AND (appr.sub_service_id = sr.sub_service_id OR appr.sub_service_id IS NULL)
+        AND (%s)
+        AND (appr.approval_status = ANY($1) OR appr.approval_status IS NULL)
+    )',
+    v_match
+  );
+END;
+$$;
+
 DROP FUNCTION IF EXISTS sp_sla_approvals_workbook_excel_export(
   TEXT, TEXT, INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT
 );

package/sql/vw_sla_approvals.sql

@@ -70,7 +70,14 @@ 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
 

package/sql/vw_sla_my_requests.sql

@@ -38,8 +38,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