@platform-modules/civil-aviation-authority 2.3.311 → 2.3.312

package/sql/vw_sla_approvals.sql

@@ -1,108 +1,115 @@
--- 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;
-
+-- 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.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 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/sql/vw_sla_my_requests.sql

@@ -1,53 +1,58 @@
--- SLA "my requests" read model: joined display names + filtered request_obj payload.
--- Applied via: npm run sync:sla-sql (shared_models)
-
-CREATE OR REPLACE VIEW vw_sla_my_requests AS
-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;
+-- SLA "my requests" read model: joined display names + filtered request_obj payload.
+-- Applied via: npm run sync:sla-sql (shared_models)
+
+CREATE OR REPLACE VIEW vw_sla_my_requests AS
+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,
+    TRIM(COALESCE(req_owner.employee_arabic_name, ''))::TEXT AS req_user_arabicname,
+    TRIM(COALESCE(dept.department_arabic_name, ''))::TEXT AS req_user_department_arabicname,
+    TRIM(COALESCE(sec.section_arabic_name, ''))::TEXT AS req_user_section_arabicname
+FROM sla_requests sr
+LEFT JOIN users req_owner
+    ON req_owner.id = sr.user_id AND COALESCE(req_owner.is_deleted, false) = false
+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;

package/src/models/AccessCardRequestModel.ts

@@ -1,135 +1,135 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum AccessCardRequestFor {
-  SELF = "Self",
-  BEHALF = "Behalf"
-}
-
-export enum AccessCardRequestType {
-  NEW = "New",
-  RENEWAL = "Renewal"
-}
-
-export enum AccessCardCategory {
-  TRAINEE = "Trainee",
-  WORKER = "Workers",
-  EMPLOYEE = "Employees",
-  CONTRACTOR = "Contractors"
-}
-
-export enum AccessCardRequestStatus {
-  PENDING = "Pending",
-  IN_PROGRESS = "In Progress",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-@Entity({ name: "access_card_requests" })
-export class AccessCardRequest extends BaseModel {
-  @Column({ type: "int", nullable: true })
-  req_user_department_id: number | null;
-
-  @Column({ type: "int", nullable: true })
-  req_user_section_id: number | null;
-
-  @Column({ type: "int", nullable: true })
-  service_id: number | null;
-
-  @Column({ type: "int", nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: "int", nullable: false })
-  user_id: number;
-
-  @Column({ type: "enum", enum: AccessCardRequestFor, nullable: false })
-  request_for: AccessCardRequestFor;
-
-  @Column({ type: "varchar", length: 255, nullable: false })
-  name: string;
-
-  @Column({ type: "varchar", length: 100, nullable: false })
-  id_number: string;
-
-  @Column({ type: "varchar", length: 50, nullable: false })
-  phone_number: string;
-
-  @Column({ type: "varchar", length: 255, nullable: false })
-  email_id: string;
-
-  @Column({ type: "enum", enum: AccessCardRequestType, nullable: false })
-  request_type: AccessCardRequestType;
-
-  @Column({ type: "enum", enum: AccessCardCategory, nullable: false })
-  category: AccessCardCategory;
-
-  @Column({ type: "varchar", length: 50, nullable: true })
-  approval_route: string | null;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  organization: string | null;
-
-  @Column({ type: "varchar", length: 100, nullable: true })
-  access_card_no: string | null;
-
-  @Column({ type: "text", nullable: false })
-  reason: string;
-
-  @Column({ type: "date", nullable: true })
-  request_date: Date;
-
-  @Column({
-    type: "enum",
-    enum: AccessCardRequestStatus,
-    default: AccessCardRequestStatus.PENDING,
-    nullable: false
-  })
-  status: AccessCardRequestStatus;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  workflow_execution_id: string | null;
-
-  constructor(
-    request_for: AccessCardRequestFor,
-    name: string,
-    id_number: string,
-    phone_number: string,
-    email_id: string,
-    request_type: AccessCardRequestType,
-    category: AccessCardCategory,
-    organization: string | null,
-    reason: string,
-    request_date: Date,
-    user_id: number,
-    status: AccessCardRequestStatus = AccessCardRequestStatus.PENDING,
-    approval_route?: string | null,
-    service_id?: number,
-    sub_service_id?: number,
-    req_user_department_id?: number,
-    req_user_section_id?: number,
-    access_card_no?: string | null,
-    workflow_execution_id?: string | null
-  ) {
-    super();
-    this.request_for = request_for;
-    this.name = name;
-    this.id_number = id_number;
-    this.phone_number = phone_number;
-    this.email_id = email_id;
-    this.request_type = request_type;
-    this.category = category;
-    this.organization = organization ?? null;
-    this.reason = reason;
-    this.request_date = request_date;
-    this.user_id = user_id;
-    this.status = status;
-    this.approval_route = approval_route ?? null;
-    this.service_id = service_id ?? null;
-    this.sub_service_id = sub_service_id ?? null;
-    this.req_user_department_id = req_user_department_id ?? null;
-    this.req_user_section_id = req_user_section_id ?? null;
-    this.access_card_no = access_card_no ?? null;
-    this.workflow_execution_id = workflow_execution_id ?? null;
-  }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum AccessCardRequestFor {
+  SELF = "Self",
+  BEHALF = "Behalf"
+}
+
+export enum AccessCardRequestType {
+  NEW = "New",
+  RENEWAL = "Renewal"
+}
+
+export enum AccessCardCategory {
+  TRAINEE = "Trainee",
+  WORKER = "Workers",
+  EMPLOYEE = "Employees",
+  CONTRACTOR = "Contractors"
+}
+
+export enum AccessCardRequestStatus {
+  PENDING = "Pending",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: "access_card_requests" })
+export class AccessCardRequest extends BaseModel {
+  @Column({ type: "int", nullable: true })
+  req_user_department_id: number | null;
+
+  @Column({ type: "int", nullable: true })
+  req_user_section_id: number | null;
+
+  @Column({ type: "int", nullable: true })
+  service_id: number | null;
+
+  @Column({ type: "int", nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: "int", nullable: false })
+  user_id: number;
+
+  @Column({ type: "enum", enum: AccessCardRequestFor, nullable: false })
+  request_for: AccessCardRequestFor;
+
+  @Column({ type: "varchar", length: 255, nullable: false })
+  name: string;
+
+  @Column({ type: "varchar", length: 100, nullable: false })
+  id_number: string;
+
+  @Column({ type: "varchar", length: 50, nullable: false })
+  phone_number: string;
+
+  @Column({ type: "varchar", length: 255, nullable: false })
+  email_id: string;
+
+  @Column({ type: "enum", enum: AccessCardRequestType, nullable: false })
+  request_type: AccessCardRequestType;
+
+  @Column({ type: "enum", enum: AccessCardCategory, nullable: false })
+  category: AccessCardCategory;
+
+  @Column({ type: "varchar", length: 50, nullable: true })
+  approval_route: string | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  organization: string | null;
+
+  @Column({ type: "varchar", length: 100, nullable: true })
+  access_card_no: string | null;
+
+  @Column({ type: "text", nullable: false })
+  reason: string;
+
+  @Column({ type: "date", nullable: true })
+  request_date: Date;
+
+  @Column({
+    type: "enum",
+    enum: AccessCardRequestStatus,
+    default: AccessCardRequestStatus.PENDING,
+    nullable: false
+  })
+  status: AccessCardRequestStatus;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  workflow_execution_id: string | null;
+
+  constructor(
+    request_for: AccessCardRequestFor,
+    name: string,
+    id_number: string,
+    phone_number: string,
+    email_id: string,
+    request_type: AccessCardRequestType,
+    category: AccessCardCategory,
+    organization: string | null,
+    reason: string,
+    request_date: Date,
+    user_id: number,
+    status: AccessCardRequestStatus = AccessCardRequestStatus.PENDING,
+    approval_route?: string | null,
+    service_id?: number,
+    sub_service_id?: number,
+    req_user_department_id?: number,
+    req_user_section_id?: number,
+    access_card_no?: string | null,
+    workflow_execution_id?: string | null
+  ) {
+    super();
+    this.request_for = request_for;
+    this.name = name;
+    this.id_number = id_number;
+    this.phone_number = phone_number;
+    this.email_id = email_id;
+    this.request_type = request_type;
+    this.category = category;
+    this.organization = organization ?? null;
+    this.reason = reason;
+    this.request_date = request_date;
+    this.user_id = user_id;
+    this.status = status;
+    this.approval_route = approval_route ?? null;
+    this.service_id = service_id ?? null;
+    this.sub_service_id = sub_service_id ?? null;
+    this.req_user_department_id = req_user_department_id ?? null;
+    this.req_user_section_id = req_user_section_id ?? null;
+    this.access_card_no = access_card_no ?? null;
+    this.workflow_execution_id = workflow_execution_id ?? null;
+  }
+}
+