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

package/src/models/SlaApprovalsViewModel.ts

@@ -0,0 +1,191 @@
+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
+    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,
+    ${REQUEST_FIELDS_SQL}
+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
+`;
+
+/**
+ * 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()
+    department_id: number;
+
+    @ViewColumn()
+    department_name: string;
+
+    @ViewColumn()
+    section_id: number;
+
+    @ViewColumn()
+    section_name: string;
+
+    @ViewColumn()
+    role_id: number;
+
+    @ViewColumn()
+    role_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;
+
+    @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/SlaMyRequestsViewModel.ts

@@ -1,150 +1,170 @@
-import { ViewColumn, ViewEntity } from "typeorm";
-import { SlaRequestStatus } from "./SlaRequestModel";
-
-/** Top-level `request_obj` keys omitted from `request_fields` (see sql/vw_sla_my_requests.sql). */
-export const SLA_MY_REQUESTS_REQUEST_OBJ_EXCLUDED_KEYS = [
-    "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 const;
-
-const VW_SLA_MY_REQUESTS_SQL = `
-SELECT
-    sr.id AS sla_request_id,
-    sr.user_id,
-    TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
-    sr.created_at,
-    TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
-    TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
-    TRIM(COALESCE(svc.name, ''))::TEXT AS service_id,
-    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_id,
-    sr.status::TEXT AS status,
-    sr.request_id,
-    (
-        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
-FROM sla_requests sr
-LEFT JOIN users creator
-    ON creator.id = sr.created_by AND COALESCE(creator.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 caa_services svc
-    ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
-LEFT JOIN caa_sub_services subsvc
-    ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
-WHERE COALESCE(sr.is_deleted, false) = false
-`;
-
-/**
- * Read-only view for SLA "my requests" listings.
- * Display-name columns reuse sla_requests field names; values come from joined lookup tables.
- * Service-specific payload keys live in `request_fields` (filtered `request_obj`).
- */
-@ViewEntity({
-    name: "vw_sla_my_requests",
-    expression: VW_SLA_MY_REQUESTS_SQL,
-})
-export class SlaMyRequestsView {
-    @ViewColumn()
-    sla_request_id: number;
-
-    /** Request owner (`sla_requests.user_id`) — filter with WHERE user_id = :userId for "my requests". */
-    @ViewColumn()
-    user_id: number;
-
-    @ViewColumn()
-    created_by: string;
-
-    @ViewColumn()
-    created_at: Date;
-
-    @ViewColumn()
-    req_user_department_id: string;
-
-    @ViewColumn()
-    req_user_section_id: string;
-
-    @ViewColumn()
-    service_id: string;
-
-    @ViewColumn()
-    sub_service_id: string;
-
-    @ViewColumn()
-    status: SlaRequestStatus | string;
-
-    @ViewColumn()
-    request_id: number;
-
-    /** Remaining `request_obj` keys after excluding workflow/common duplicates. */
-    @ViewColumn()
-    request_fields: Record<string, unknown>;
-}
-
-/** Flatten view row: fixed columns plus each entry in `request_fields`. */
-export function flattenSlaMyRequestsViewRow(
-    row: SlaMyRequestsView
-): Record<string, unknown> {
-    const {
-        sla_request_id,
-        user_id,
-        created_by,
-        created_at,
-        req_user_department_id,
-        req_user_section_id,
-        service_id,
-        sub_service_id,
-        status,
-        request_id,
-        request_fields,
-    } = row;
-
-    return {
-        sla_request_id,
-        user_id,
-        created_by,
-        created_at,
-        req_user_department_id,
-        req_user_section_id,
-        service_id,
-        sub_service_id,
-        status,
-        request_id,
-        ...(request_fields ?? {}),
-    };
-}
+import { ViewColumn, ViewEntity } from "typeorm";
+import { SlaRequestStatus } from "./SlaRequestModel";
+
+/** Top-level `request_obj` keys omitted from `request_fields` (see sql/vw_sla_my_requests.sql). */
+export const SLA_MY_REQUESTS_REQUEST_OBJ_EXCLUDED_KEYS = [
+    "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 const;
+
+const VW_SLA_MY_REQUESTS_SQL = `
+SELECT
+    sr.id AS sla_request_id,
+    sr.user_id,
+    sr.service_id AS service_id,
+    sr.sub_service_id AS sub_service_id,
+    TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
+    sr.created_at,
+    TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
+    TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
+    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
+    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
+    sr.status::TEXT AS status,
+    sr.request_id,
+    (
+        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_requests sr
+LEFT JOIN users creator
+    ON creator.id = sr.created_by AND COALESCE(creator.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 caa_services svc
+    ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
+LEFT JOIN caa_sub_services subsvc
+    ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
+WHERE COALESCE(sr.is_deleted, false) = false
+`;
+
+/**
+ * Read-only view for SLA "my requests" listings.
+ * Display-name columns reuse sla_requests field names; values come from joined lookup tables.
+ * Service-specific payload keys live in `request_fields` (filtered `request_obj`).
+ */
+@ViewEntity({
+    name: "vw_sla_my_requests",
+    expression: VW_SLA_MY_REQUESTS_SQL,
+})
+export class SlaMyRequestsView {
+    @ViewColumn()
+    sla_request_id: number;
+
+    /** Request owner (`sla_requests.user_id`) — filter with WHERE user_id = :userId for "my requests". */
+    @ViewColumn()
+    user_id: number;
+
+    /** Numeric caa_services.id used for filtering. */
+    @ViewColumn()
+    service_id: number;
+
+    /** Numeric caa_sub_services.id used for filtering. */
+    @ViewColumn()
+    sub_service_id: number;
+
+    @ViewColumn()
+    created_by: string;
+
+    @ViewColumn()
+    created_at: Date;
+
+    @ViewColumn()
+    req_user_department_id: string;
+
+    @ViewColumn()
+    req_user_section_id: string;
+
+    @ViewColumn()
+    service_name: string;
+
+    @ViewColumn()
+    sub_service_name: string;
+
+    @ViewColumn()
+    status: SlaRequestStatus | string;
+
+    @ViewColumn()
+    request_id: number;
+
+    /** Remaining `request_obj` keys after excluding workflow/common duplicates. */
+    @ViewColumn()
+    request_fields: Record<string, unknown>;
+}
+
+/** Flatten view row: fixed columns plus each entry in `request_fields`. */
+export function flattenSlaMyRequestsViewRow(
+    row: SlaMyRequestsView
+): Record<string, unknown> {
+    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;
+
+    return {
+        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 ?? {}),
+    };
+}