@platform-modules/civil-aviation-authority 2.3.259 → 2.3.261

package/dist/data-source.js

@@ -252,6 +252,7 @@ const MediaPublicationsChatModel_1 = require("./models/MediaPublicationsChatMode
 const MediaPublicationsWorkflowModel_1 = require("./models/MediaPublicationsWorkflowModel");
 const SlaRequestModel_1 = require("./models/SlaRequestModel");
 const SlaMyRequestsViewModel_1 = require("./models/SlaMyRequestsViewModel");
+const SlaApprovalsViewModel_1 = require("./models/SlaApprovalsViewModel");
 const ServiceSlaApprovalModel_1 = require("./models/ServiceSlaApprovalModel");
 const SlaConfigModel_1 = require("./models/SlaConfigModel");
 exports.AppDataSource = new typeorm_1.DataSource({
@@ -510,6 +511,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         MediaPublicationsWorkflowModel_1.MediaPublicationsWorkFlow,
         SlaRequestModel_1.SlaRequest,
         SlaMyRequestsViewModel_1.SlaMyRequestsView,
+        SlaApprovalsViewModel_1.SlaApprovalsView,
         ServiceSlaApprovalModel_1.ServiceSlaApproval,
         SlaConfigModel_1.SlaConfig,
     ],

package/dist/index.d.ts

@@ -402,6 +402,7 @@ export * from './models/ContractServiceRequestModel';
 export * from './models/SlaConfigModel';
 export * from './models/SlaRequestModel';
 export * from './models/SlaMyRequestsViewModel';
+export * from './models/SlaApprovalsViewModel';
 export * from './models/ServiceSlaApprovalModel';
 export * from './sla/sla-table-sync.service';
 export * from './sla/sla-approval-mirror';

package/dist/index.js

@@ -591,6 +591,7 @@ __exportStar(require("./models/ContractServiceRequestModel"), exports);
 __exportStar(require("./models/SlaConfigModel"), exports);
 __exportStar(require("./models/SlaRequestModel"), exports);
 __exportStar(require("./models/SlaMyRequestsViewModel"), exports);
+__exportStar(require("./models/SlaApprovalsViewModel"), exports);
 __exportStar(require("./models/ServiceSlaApprovalModel"), exports);
 __exportStar(require("./sla/sla-table-sync.service"), exports);
 __exportStar(require("./sla/sla-approval-mirror"), exports);

package/dist/models/SlaApprovalsViewModel.d.ts

@@ -1,26 +1,31 @@
+/**
+ * Read-only view for SLA approvals listings (TypeORM).
+ * Approver matching (`sla_approval_matches_user` semantics) is applied in Reports_Service queries.
+ */
 export declare class SlaApprovalsView {
     sla_approval_id: number;
     source_approval_id: number;
     request_id: number;
-    service_id: number | null;
-    sub_service_id: number | null;
+    service_id: number;
+    sub_service_id: number;
     service_name: string;
     sub_service_name: string;
+    approval_role_id: number;
+    approval_role_name: string;
+    approval_department_id: number;
+    approval_department_name: string;
+    approval_section_id: number;
+    approval_section_name: string;
     approval_status: string;
     request_status: string;
     level: number;
-    approver_user_id: number | null;
+    approver_user_id: number;
     approver_user_name: string;
-    delegate_user_id: number | null;
+    delegate_user_id: number;
     delegate_user_name: string;
-    approved_by: number | null;
+    approved_by: number;
     approved_by_name: string;
-    comment: string | null;
-    requester_user_id: number;
-    requester_name: string;
-    department_name: string;
-    section_name: string;
-    request_fields: Record<string, unknown>;
+    comment: string;
     created_at: Date;
     updated_at: Date;
 }

package/dist/models/SlaApprovalsViewModel.js

@@ -16,33 +16,28 @@ SELECT
     sa.id AS sla_approval_id,
     sa.source_approval_id,
     sa.request_id,
-    sa.service_id,
-    sa.sub_service_id,
+    sa.service_id AS service_id,
+    sa.sub_service_id AS sub_service_id,
     TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
     TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
-    sa.approval_status,
+    sa.approver_role_id AS approval_role_id,
+    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
+    sa.department_id AS approval_department_id,
+    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
+    sa.section_id AS approval_section_id,
+    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
+    sa.approval_status::TEXT AS approval_status,
     sr.status::TEXT AS request_status,
-    sa.level,
-    sa.approver_user_id,
+    sa.level AS level,
+    sa.approver_user_id AS approver_user_id,
     TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
-    sa.delegate_user_id,
+    sa.delegate_user_id AS delegate_user_id,
     TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
-    sa.approved_by,
+    sa.approved_by AS approved_by,
     TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
-    sa.comment,
-    sr.user_id AS requester_user_id,
-    TRIM(COALESCE(ru.employee_name, ''))::TEXT AS requester_name,
-    TRIM(COALESCE(dept.department_name, ''))::TEXT AS department_name,
-    TRIM(COALESCE(sec.section_name, ''))::TEXT AS section_name,
-    (
-        COALESCE(sr.request_obj, '{}'::jsonb)
-        - 'id' - 'status' - 'role_id' - 'user_id' - 'createdBy' - 'created_at'
-        - 'updated_by' - 'updated_at' - 'req_user_department_id' - 'workflow_execution_id'
-        - 'department_id' - 'req_user_section_id' - 'service_type_id' - 'service_type'
-        - 'created_by' - 'service_id' - 'sub_service_id' - 'attachments'
-    ) AS request_fields,
-    sa.created_at,
-    sa.updated_at
+    sa.comment::TEXT AS comment,
+    sa.created_at AS created_at,
+    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
@@ -50,19 +45,24 @@ LEFT JOIN caa_services svc
     ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
 LEFT JOIN caa_sub_services subsvc
     ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
-LEFT JOIN users au ON au.id = sa.approver_user_id
-LEFT JOIN users du ON du.id = sa.delegate_user_id
-LEFT JOIN users ab ON ab.id = sa.approved_by
-LEFT JOIN users ru
-    ON ru.id = sr.user_id AND COALESCE(ru.is_deleted, false) = false
-LEFT JOIN departments dept
-    ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
-LEFT JOIN sections sec
-    ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
+LEFT JOIN departments adpt
+    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
+LEFT JOIN sections asec
+    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
+LEFT JOIN role ar
+    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
+LEFT JOIN users au
+    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
+LEFT JOIN users du
+    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
+LEFT JOIN users ab
+    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
 WHERE COALESCE(sa.is_deleted, false) = false
-  AND (sa.service_id = sr.service_id OR sa.service_id IS NULL)
-  AND (sa.sub_service_id = sr.sub_service_id OR sa.sub_service_id IS NULL)
 `;
+/**
+ * Read-only view for SLA approvals listings (TypeORM).
+ * Approver matching (`sla_approval_matches_user` semantics) is applied in Reports_Service queries.
+ */
 let SlaApprovalsView = class SlaApprovalsView {
 };
 exports.SlaApprovalsView = SlaApprovalsView;
@@ -80,11 +80,11 @@ __decorate([
 ], SlaApprovalsView.prototype, "request_id", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", Object)
+    __metadata("design:type", Number)
 ], SlaApprovalsView.prototype, "service_id", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", Object)
+    __metadata("design:type", Number)
 ], SlaApprovalsView.prototype, "sub_service_id", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
@@ -96,64 +96,68 @@ __decorate([
 ], SlaApprovalsView.prototype, "sub_service_name", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", String)
-], SlaApprovalsView.prototype, "approval_status", void 0);
+    __metadata("design:type", Number)
+], SlaApprovalsView.prototype, "approval_role_id", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
-], SlaApprovalsView.prototype, "request_status", void 0);
+], SlaApprovalsView.prototype, "approval_role_name", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Number)
-], SlaApprovalsView.prototype, "level", void 0);
-__decorate([
-    (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", Object)
-], SlaApprovalsView.prototype, "approver_user_id", void 0);
+], SlaApprovalsView.prototype, "approval_department_id", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
-], SlaApprovalsView.prototype, "approver_user_name", void 0);
+], SlaApprovalsView.prototype, "approval_department_name", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", Object)
-], SlaApprovalsView.prototype, "delegate_user_id", void 0);
+    __metadata("design:type", Number)
+], SlaApprovalsView.prototype, "approval_section_id", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
-], SlaApprovalsView.prototype, "delegate_user_name", void 0);
+], SlaApprovalsView.prototype, "approval_section_name", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", Object)
-], SlaApprovalsView.prototype, "approved_by", void 0);
+    __metadata("design:type", String)
+], SlaApprovalsView.prototype, "approval_status", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
-], SlaApprovalsView.prototype, "approved_by_name", void 0);
+], SlaApprovalsView.prototype, "request_status", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", Object)
-], SlaApprovalsView.prototype, "comment", void 0);
+    __metadata("design:type", Number)
+], SlaApprovalsView.prototype, "level", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Number)
-], SlaApprovalsView.prototype, "requester_user_id", void 0);
+], SlaApprovalsView.prototype, "approver_user_id", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
-], SlaApprovalsView.prototype, "requester_name", void 0);
+], SlaApprovalsView.prototype, "approver_user_name", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], SlaApprovalsView.prototype, "delegate_user_id", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
-], SlaApprovalsView.prototype, "department_name", void 0);
+], SlaApprovalsView.prototype, "delegate_user_name", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", Number)
+], SlaApprovalsView.prototype, "approved_by", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
-], SlaApprovalsView.prototype, "section_name", void 0);
+], SlaApprovalsView.prototype, "approved_by_name", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", Object)
-], SlaApprovalsView.prototype, "request_fields", void 0);
+    __metadata("design:type", String)
+], SlaApprovalsView.prototype, "comment", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Date)

package/package.json

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

package/sql/vw_sla_approvals.sql

@@ -0,0 +1,54 @@
+-- SLA approvals read model: joined display names for approval routing.
+-- Approver-scope filtering is applied in Reports_Service (TypeORM), not in this view.
+-- Run once against the EmpPortal PostgreSQL database:
+--   psql -U <user> -d <database> -f sql/vw_sla_approvals.sql
+
+DROP VIEW IF EXISTS vw_sla_approvals CASCADE;
+
+CREATE VIEW vw_sla_approvals AS
+SELECT
+    sa.id AS sla_approval_id,
+    sa.source_approval_id,
+    sa.request_id,
+    sa.service_id AS service_id,
+    sa.sub_service_id AS sub_service_id,
+    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
+    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
+    sa.approver_role_id AS approval_role_id,
+    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
+    sa.department_id AS approval_department_id,
+    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
+    sa.section_id AS approval_section_id,
+    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
+    sa.approval_status::TEXT AS approval_status,
+    sr.status::TEXT AS request_status,
+    sa.level AS level,
+    sa.approver_user_id AS approver_user_id,
+    TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
+    sa.delegate_user_id AS delegate_user_id,
+    TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
+    sa.approved_by AS approved_by,
+    TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
+    sa.comment::TEXT AS comment,
+    sa.created_at AS created_at,
+    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
+LEFT JOIN caa_services svc
+    ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
+LEFT JOIN caa_sub_services subsvc
+    ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
+LEFT JOIN departments adpt
+    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
+LEFT JOIN sections asec
+    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
+LEFT JOIN role ar
+    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
+LEFT JOIN users au
+    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
+LEFT JOIN users du
+    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
+LEFT JOIN users ab
+    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
+WHERE COALESCE(sa.is_deleted, false) = false;

package/src/data-source.ts

@@ -250,6 +250,7 @@ import { MediaPublicationsChat } from './models/MediaPublicationsChatModel';
 import { MediaPublicationsWorkFlow } from './models/MediaPublicationsWorkflowModel';
 import { SlaRequest } from './models/SlaRequestModel';
 import { SlaMyRequestsView } from './models/SlaMyRequestsViewModel';
+import { SlaApprovalsView } from './models/SlaApprovalsViewModel';
 import { ServiceSlaApproval } from './models/ServiceSlaApprovalModel';
 import { SlaConfig } from './models/SlaConfigModel';
 
@@ -509,6 +510,7 @@ export const AppDataSource = new DataSource({
     MediaPublicationsWorkFlow,
     SlaRequest,
     SlaMyRequestsView,
+    SlaApprovalsView,
     ServiceSlaApproval,
     SlaConfig,
   ],

package/src/index.ts

@@ -490,6 +490,7 @@ export * from './models/RequestTenderAnalysisRequestModel';
 export * from './models/ContractServiceRequestModel';export * from './models/SlaConfigModel';
 export * from './models/SlaRequestModel';
 export * from './models/SlaMyRequestsViewModel';
+export * from './models/SlaApprovalsViewModel';
 export * from './models/ServiceSlaApprovalModel';
 export * from './sla/sla-table-sync.service';
 export * from './sla/sla-approval-mirror';

package/src/models/SlaApprovalsViewModel.ts

@@ -0,0 +1,135 @@
+import { ViewColumn, ViewEntity } from "typeorm";
+
+const VW_SLA_APPROVALS_SQL = `
+SELECT
+    sa.id AS sla_approval_id,
+    sa.source_approval_id,
+    sa.request_id,
+    sa.service_id AS service_id,
+    sa.sub_service_id AS sub_service_id,
+    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
+    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
+    sa.approver_role_id AS approval_role_id,
+    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
+    sa.department_id AS approval_department_id,
+    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
+    sa.section_id AS approval_section_id,
+    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
+    sa.approval_status::TEXT AS approval_status,
+    sr.status::TEXT AS request_status,
+    sa.level AS level,
+    sa.approver_user_id AS approver_user_id,
+    TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
+    sa.delegate_user_id AS delegate_user_id,
+    TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
+    sa.approved_by AS approved_by,
+    TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
+    sa.comment::TEXT AS comment,
+    sa.created_at AS created_at,
+    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
+LEFT JOIN caa_services svc
+    ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
+LEFT JOIN caa_sub_services subsvc
+    ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
+LEFT JOIN departments adpt
+    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
+LEFT JOIN sections asec
+    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
+LEFT JOIN role ar
+    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
+LEFT JOIN users au
+    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
+LEFT JOIN users du
+    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
+LEFT JOIN users ab
+    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
+WHERE COALESCE(sa.is_deleted, false) = false
+`;
+
+/**
+ * Read-only view for SLA approvals listings (TypeORM).
+ * Approver matching (`sla_approval_matches_user` semantics) is applied in Reports_Service queries.
+ */
+@ViewEntity({
+    name: "vw_sla_approvals",
+    expression: VW_SLA_APPROVALS_SQL,
+})
+export class SlaApprovalsView {
+    @ViewColumn()
+    sla_approval_id: number;
+
+    @ViewColumn()
+    source_approval_id: number;
+
+    @ViewColumn()
+    request_id: number;
+
+    @ViewColumn()
+    service_id: number;
+
+    @ViewColumn()
+    sub_service_id: number;
+
+    @ViewColumn()
+    service_name: string;
+
+    @ViewColumn()
+    sub_service_name: string;
+
+    @ViewColumn()
+    approval_role_id: number;
+
+    @ViewColumn()
+    approval_role_name: string;
+
+    @ViewColumn()
+    approval_department_id: number;
+
+    @ViewColumn()
+    approval_department_name: string;
+
+    @ViewColumn()
+    approval_section_id: number;
+
+    @ViewColumn()
+    approval_section_name: string;
+
+    @ViewColumn()
+    approval_status: string;
+
+    @ViewColumn()
+    request_status: string;
+
+    @ViewColumn()
+    level: number;
+
+    @ViewColumn()
+    approver_user_id: number;
+
+    @ViewColumn()
+    approver_user_name: string;
+
+    @ViewColumn()
+    delegate_user_id: number;
+
+    @ViewColumn()
+    delegate_user_name: string;
+
+    @ViewColumn()
+    approved_by: number;
+
+    @ViewColumn()
+    approved_by_name: string;
+
+    @ViewColumn()
+    comment: string;
+
+    @ViewColumn()
+    created_at: Date;
+
+    @ViewColumn()
+    updated_at: Date;
+}