@platform-modules/civil-aviation-authority 2.3.260 → 2.3.262

package/dist/models/MultiPurposeHallRequestModel.d.ts

@@ -39,6 +39,7 @@ export declare class MultiPurposeHallRequests extends BaseModel {
     project_maintenance_support_required: boolean;
     number_of_guests: number | null;
     special_requirements: string | null;
+    duration: string | null;
     status: MultiPurposeHallRequestStatus;
     workflow_execution_id: string | null;
 }

package/dist/models/MultiPurposeHallRequestModel.js

@@ -130,6 +130,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "text", nullable: true }),
     __metadata("design:type", Object)
 ], MultiPurposeHallRequests.prototype, "special_requirements", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], MultiPurposeHallRequests.prototype, "duration", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",

package/dist/models/SlaApprovalsViewModel.d.ts

@@ -1,5 +1,3 @@
-/** Reuse the same `request_obj` key exclusions as my-requests. */
-export declare const SLA_APPROVALS_REQUEST_OBJ_EXCLUDED_KEYS: readonly ["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", "is_deleted", "sla_request", "sla_request_id"];
 /**
  * Read-only view for SLA approvals listings (TypeORM).
  * Approver matching (`sla_approval_matches_user` semantics) is applied in Reports_Service queries.
@@ -12,12 +10,12 @@ export declare class SlaApprovalsView {
     sub_service_id: number;
     service_name: string;
     sub_service_name: string;
-    department_id: number;
-    department_name: string;
-    section_id: number;
-    section_name: string;
-    role_id: number;
-    role_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;
@@ -30,9 +28,4 @@ export declare class SlaApprovalsView {
     comment: string;
     created_at: Date;
     updated_at: Date;
-    requester_user_id: number;
-    requester_name: string;
-    req_user_department_name: string;
-    req_user_section_name: string;
-    request_fields: Record<string, unknown>;
 }

package/dist/models/SlaApprovalsViewModel.js

@@ -9,36 +9,8 @@ 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.SlaApprovalsView = exports.SLA_APPROVALS_REQUEST_OBJ_EXCLUDED_KEYS = void 0;
+exports.SlaApprovalsView = void 0;
 const typeorm_1 = require("typeorm");
-const SlaMyRequestsViewModel_1 = require("./SlaMyRequestsViewModel");
-/** Reuse the same `request_obj` key exclusions as my-requests. */
-exports.SLA_APPROVALS_REQUEST_OBJ_EXCLUDED_KEYS = SlaMyRequestsViewModel_1.SLA_MY_REQUESTS_REQUEST_OBJ_EXCLUDED_KEYS;
-const REQUEST_FIELDS_SQL = `
-    (
-        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'
-        - 'is_deleted'
-        - 'sla_request'
-        - 'sla_request_id'
-    ) AS request_fields`;
 const VW_SLA_APPROVALS_SQL = `
 SELECT
     sa.id AS sla_approval_id,
@@ -48,12 +20,12 @@ SELECT
     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.department_id AS department_id,
-    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS department_name,
-    sa.section_id AS section_id,
-    TRIM(COALESCE(asec.section_name, ''))::TEXT AS section_name,
-    sa.approver_role_id AS role_id,
-    TRIM(COALESCE(ar.name, ''))::TEXT AS role_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,
@@ -65,12 +37,7 @@ SELECT
     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,
-    sr.user_id AS requester_user_id,
-    TRIM(COALESCE(ru.employee_name, ''))::TEXT AS requester_name,
-    TRIM(COALESCE(rdept.department_name, ''))::TEXT AS req_user_department_name,
-    TRIM(COALESCE(rsec.section_name, ''))::TEXT AS req_user_section_name,
-    ${REQUEST_FIELDS_SQL}
+    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
@@ -90,12 +57,6 @@ 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
-LEFT JOIN users ru
-    ON ru.id = sr.user_id AND COALESCE(ru.is_deleted, false) = false
-LEFT JOIN departments rdept
-    ON rdept.id = sr.req_user_department_id AND COALESCE(rdept.is_deleted, false) = false
-LEFT JOIN sections rsec
-    ON rsec.id = sr.req_user_section_id AND COALESCE(rsec.is_deleted, false) = false
 WHERE COALESCE(sa.is_deleted, false) = false
 `;
 /**
@@ -136,27 +97,27 @@ __decorate([
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Number)
-], SlaApprovalsView.prototype, "department_id", void 0);
+], SlaApprovalsView.prototype, "approval_role_id", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
-], SlaApprovalsView.prototype, "department_name", void 0);
+], SlaApprovalsView.prototype, "approval_role_name", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Number)
-], SlaApprovalsView.prototype, "section_id", void 0);
+], SlaApprovalsView.prototype, "approval_department_id", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
-], SlaApprovalsView.prototype, "section_name", void 0);
+], SlaApprovalsView.prototype, "approval_department_name", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Number)
-], SlaApprovalsView.prototype, "role_id", void 0);
+], SlaApprovalsView.prototype, "approval_section_id", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
-], SlaApprovalsView.prototype, "role_name", void 0);
+], SlaApprovalsView.prototype, "approval_section_name", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
@@ -205,26 +166,6 @@ __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Date)
 ], SlaApprovalsView.prototype, "updated_at", void 0);
-__decorate([
-    (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", Number)
-], SlaApprovalsView.prototype, "requester_user_id", void 0);
-__decorate([
-    (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", String)
-], SlaApprovalsView.prototype, "requester_name", void 0);
-__decorate([
-    (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", String)
-], SlaApprovalsView.prototype, "req_user_department_name", void 0);
-__decorate([
-    (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", String)
-], SlaApprovalsView.prototype, "req_user_section_name", void 0);
-__decorate([
-    (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", Object)
-], SlaApprovalsView.prototype, "request_fields", void 0);
 exports.SlaApprovalsView = SlaApprovalsView = __decorate([
     (0, typeorm_1.ViewEntity)({
         name: "vw_sla_approvals",

package/dist/models/VipHallRequestModel.d.ts

@@ -38,6 +38,7 @@ export declare class VipHallRequests extends BaseModel {
     project_maintenance_support_required: boolean;
     number_of_guests: number | null;
     special_requirements: string | null;
+    duration: string | null;
     status: VipHallRequestStatus;
     workflow_execution_id: string | null;
 }

package/dist/models/VipHallRequestModel.js

@@ -133,6 +133,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "text", nullable: true }),
     __metadata("design:type", Object)
 ], VipHallRequests.prototype, "special_requirements", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], VipHallRequests.prototype, "duration", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",

package/package.json

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

package/sql/vw_sla_approvals.sql

@@ -1,88 +1,54 @@
--- SLA approvals read model: joined display names + filtered request_obj payload.
--- 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.department_id AS department_id,
-    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS department_name,
-    sa.section_id AS section_id,
-    TRIM(COALESCE(asec.section_name, ''))::TEXT AS section_name,
-    sa.approver_role_id AS role_id,
-    TRIM(COALESCE(ar.name, ''))::TEXT AS role_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,
-    sr.user_id AS requester_user_id,
-    TRIM(COALESCE(ru.employee_name, ''))::TEXT AS requester_name,
-    TRIM(COALESCE(rdept.department_name, ''))::TEXT AS req_user_department_name,
-    TRIM(COALESCE(rsec.section_name, ''))::TEXT AS req_user_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'
-        - 'is_deleted'
-        - 'sla_request'
-        - 'sla_request_id'
-    ) AS request_fields
-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
-LEFT JOIN users ru
-    ON ru.id = sr.user_id AND COALESCE(ru.is_deleted, false) = false
-LEFT JOIN departments rdept
-    ON rdept.id = sr.req_user_department_id AND COALESCE(rdept.is_deleted, false) = false
-LEFT JOIN sections rsec
-    ON rsec.id = sr.req_user_section_id AND COALESCE(rsec.is_deleted, false) = false
-WHERE COALESCE(sa.is_deleted, false) = false;
+-- 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/models/MultiPurposeHallRequestModel.ts

@@ -100,6 +100,9 @@ export class MultiPurposeHallRequests extends BaseModel {
   @Column({ type: "text", nullable: true })
   special_requirements: string | null;
 
+  @Column({ type: "varchar", length: 100, nullable: true })
+  duration: string | null;
+
   @Column({
     type: "enum",
     enum: MultiPurposeHallRequestStatus,

package/src/models/SlaApprovalsViewModel.ts

@@ -1,34 +1,4 @@
 import { ViewColumn, ViewEntity } from "typeorm";
-import { SLA_MY_REQUESTS_REQUEST_OBJ_EXCLUDED_KEYS } from "./SlaMyRequestsViewModel";
-
-/** Reuse the same `request_obj` key exclusions as my-requests. */
-export const SLA_APPROVALS_REQUEST_OBJ_EXCLUDED_KEYS = SLA_MY_REQUESTS_REQUEST_OBJ_EXCLUDED_KEYS;
-
-const REQUEST_FIELDS_SQL = `
-    (
-        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'
-        - 'is_deleted'
-        - 'sla_request'
-        - 'sla_request_id'
-    ) AS request_fields`;
 
 const VW_SLA_APPROVALS_SQL = `
 SELECT
@@ -39,12 +9,12 @@ SELECT
     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.department_id AS department_id,
-    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS department_name,
-    sa.section_id AS section_id,
-    TRIM(COALESCE(asec.section_name, ''))::TEXT AS section_name,
-    sa.approver_role_id AS role_id,
-    TRIM(COALESCE(ar.name, ''))::TEXT AS role_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,
@@ -56,12 +26,7 @@ SELECT
     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,
-    sr.user_id AS requester_user_id,
-    TRIM(COALESCE(ru.employee_name, ''))::TEXT AS requester_name,
-    TRIM(COALESCE(rdept.department_name, ''))::TEXT AS req_user_department_name,
-    TRIM(COALESCE(rsec.section_name, ''))::TEXT AS req_user_section_name,
-    ${REQUEST_FIELDS_SQL}
+    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
@@ -81,12 +46,6 @@ 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
-LEFT JOIN users ru
-    ON ru.id = sr.user_id AND COALESCE(ru.is_deleted, false) = false
-LEFT JOIN departments rdept
-    ON rdept.id = sr.req_user_department_id AND COALESCE(rdept.is_deleted, false) = false
-LEFT JOIN sections rsec
-    ON rsec.id = sr.req_user_section_id AND COALESCE(rsec.is_deleted, false) = false
 WHERE COALESCE(sa.is_deleted, false) = false
 `;
 
@@ -121,22 +80,22 @@ export class SlaApprovalsView {
     sub_service_name: string;
 
     @ViewColumn()
-    department_id: number;
+    approval_role_id: number;
 
     @ViewColumn()
-    department_name: string;
+    approval_role_name: string;
 
     @ViewColumn()
-    section_id: number;
+    approval_department_id: number;
 
     @ViewColumn()
-    section_name: string;
+    approval_department_name: string;
 
     @ViewColumn()
-    role_id: number;
+    approval_section_id: number;
 
     @ViewColumn()
-    role_name: string;
+    approval_section_name: string;
 
     @ViewColumn()
     approval_status: string;
@@ -173,19 +132,4 @@ export class SlaApprovalsView {
 
     @ViewColumn()
     updated_at: Date;
-
-    @ViewColumn()
-    requester_user_id: number;
-
-    @ViewColumn()
-    requester_name: string;
-
-    @ViewColumn()
-    req_user_department_name: string;
-
-    @ViewColumn()
-    req_user_section_name: string;
-
-    @ViewColumn()
-    request_fields: Record<string, unknown>;
 }

package/src/models/VipHallRequestModel.ts

@@ -101,6 +101,9 @@ export class VipHallRequests extends BaseModel {
   @Column({ type: "text", nullable: true })
   special_requirements: string | null;
 
+  @Column({ type: "varchar", length: 100, nullable: true })
+  duration: string | null;
+
   @Column({
     type: "enum",
     enum: VipHallRequestStatus,