@platform-modules/civil-aviation-authority 2.3.250 → 2.3.256

package/src/models/ServiceExtensionAfter60ApprovalModel.ts

@@ -1,87 +1,87 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum ServiceExtensionAfter60ApprovalStatus {
-  PENDING = "Pending",
-  IN_PROGRESS = "In Progress",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-@Entity({ name: "service_extension_after_60_approvals" })
-export class ServiceExtensionAfter60Approval extends BaseModel {
-  @Column({ type: "integer", nullable: false })
-  request_id: number;
-
-  @Column({ type: "integer", nullable: true })
-  service_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: "integer", nullable: false })
-  level: number;
-
-  @Column({ type: "integer", nullable: true })
-  approver_role_id: number;
-
-  @Column({ type: "integer", nullable: true })
-  department_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  section_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  approver_user_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  delegate_user_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  approved_by: number | null;
-
-  @Column({ type: "varchar", length: 500, nullable: true, default: "" })
-  comment: string;
-
-  @Column({
-    type: "enum",
-    enum: ServiceExtensionAfter60ApprovalStatus,
-    default: ServiceExtensionAfter60ApprovalStatus.PENDING,
-    nullable: false
-  })
-  approval_status: ServiceExtensionAfter60ApprovalStatus;
-
-  @Column({ type: "boolean", default: true, nullable: false })
-  is_allowed: boolean;
-
-  constructor(
-    request_id: number,
-    approver_role_id: number,
-    level: number,
-    comment: string,
-    approval_status: ServiceExtensionAfter60ApprovalStatus,
-    service_id?: number,
-    sub_service_id?: number,
-    department_id?: number | null,
-    section_id?: number | null,
-    approver_user_id?: number | null,
-    delegate_user_id?: number | null,
-    approved_by?: number | null,
-    is_allowed?: boolean
-  ) {
-    super();
-    this.request_id = request_id;
-    this.service_id = service_id ?? null;
-    this.sub_service_id = sub_service_id ?? null;
-    this.level = level;
-    this.approver_role_id = approver_role_id;
-    this.department_id = department_id ?? null;
-    this.section_id = section_id ?? null;
-    this.approver_user_id = approver_user_id ?? null;
-    this.delegate_user_id = delegate_user_id ?? null;
-    this.approved_by = approved_by ?? null;
-    this.comment = comment;
-    this.approval_status = approval_status;
-    this.is_allowed = is_allowed !== undefined ? is_allowed : true;
-  }
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum ServiceExtensionAfter60ApprovalStatus {
+  PENDING = "Pending",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: "service_extension_after_60_approvals" })
+export class ServiceExtensionAfter60Approval extends BaseModel {
+  @Column({ type: "integer", nullable: false })
+  request_id: number;
+
+  @Column({ type: "integer", nullable: true })
+  service_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: "integer", nullable: false })
+  level: number;
+
+  @Column({ type: "integer", nullable: true })
+  approver_role_id: number;
+
+  @Column({ type: "integer", nullable: true })
+  department_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  section_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  approver_user_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  delegate_user_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  approved_by: number | null;
+
+  @Column({ type: "varchar", length: 500, nullable: true, default: "" })
+  comment: string;
+
+  @Column({
+    type: "enum",
+    enum: ServiceExtensionAfter60ApprovalStatus,
+    default: ServiceExtensionAfter60ApprovalStatus.PENDING,
+    nullable: false
+  })
+  approval_status: ServiceExtensionAfter60ApprovalStatus;
+
+  @Column({ type: "boolean", default: true, nullable: false })
+  is_allowed: boolean;
+
+  constructor(
+    request_id: number,
+    approver_role_id: number,
+    level: number,
+    comment: string,
+    approval_status: ServiceExtensionAfter60ApprovalStatus,
+    service_id?: number,
+    sub_service_id?: number,
+    department_id?: number | null,
+    section_id?: number | null,
+    approver_user_id?: number | null,
+    delegate_user_id?: number | null,
+    approved_by?: number | null,
+    is_allowed?: boolean
+  ) {
+    super();
+    this.request_id = request_id;
+    this.service_id = service_id ?? null;
+    this.sub_service_id = sub_service_id ?? null;
+    this.level = level;
+    this.approver_role_id = approver_role_id;
+    this.department_id = department_id ?? null;
+    this.section_id = section_id ?? null;
+    this.approver_user_id = approver_user_id ?? null;
+    this.delegate_user_id = delegate_user_id ?? null;
+    this.approved_by = approved_by ?? null;
+    this.comment = comment;
+    this.approval_status = approval_status;
+    this.is_allowed = is_allowed !== undefined ? is_allowed : true;
+  }
+}

package/src/models/ServiceSlaApprovalModel.ts

@@ -1,64 +1,64 @@
-import { Column, Entity, Index } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-/**
- * Cross-service SLA tracking row for any microservice (HR, IT, Tender, …).
- * Segregated by service_id, sub_service_id, request_id.
- * source_approval_id = native approval row PK in the owning service (e.g. hr_service_approvals.id, vpn_approvals.id); not a DB FK.
- */
-@Entity({ name: "sla_approval" })
-@Index("idx_sla_approval_request_id", ["request_id"])
-@Index("idx_sla_approval_source_approval_id", ["source_approval_id"])
-@Index("idx_sla_approval_service_subservice", ["service_id", "sub_service_id"])
-@Index("idx_sla_approval_approval_status", ["approval_status"])
-@Index("idx_sla_approval_level", ["level"])
-@Index("idx_sla_approval_approver_user_id", ["approver_user_id"])
-@Index("idx_sla_approval_request_level", ["request_id", "level"])
-@Index("idx_sla_approval_svc_sub_status", ["service_id", "sub_service_id", "approval_status"])
-export class ServiceSlaApproval extends BaseModel {
-    @Column({ type: "int" })
-    request_id: number;
-
-    @Column({ type: "int" })
-    source_approval_id: number;
-
-    @Column({ type: "int", nullable: true })
-    service_id: number | null;
-
-    @Column({ type: "int", nullable: true })
-    sub_service_id: number | null;
-
-    @Column({ type: "varchar", length: 64 })
-    approval_status: string;
-
-    @Column({ type: "int" })
-    level: number;
-
-    @Column({ type: "int", nullable: true })
-    approver_user_id: number | null;
-
-    @Column({ type: "int", nullable: true })
-    approver_role_id: number | null;
-
-    @Column({ type: "int", nullable: true })
-    department_id: number | null;
-
-    @Column({ type: "int", nullable: true })
-    section_id: number | null;
-
-    /** Mirrors native approval `delegate_user_id` (IT master tables may use `delegation_user_id`). */
-    @Column({ type: "int", nullable: true })
-    delegate_user_id: number | null;
-
-    /** Mirrors native approval `approved_by` (acting user when status was last resolved). */
-    @Column({ type: "int", nullable: true })
-    approved_by: number | null;
-
-    /** Mirrors native approval comment / rejection reason. */
-    @Column({ type: "varchar", length: 255, nullable: true })
-    comment: string | null;
-
-    constructor() {
-        super();
-    }
-}
+import { Column, Entity, Index } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+/**
+ * Cross-service SLA tracking row for any microservice (HR, IT, Tender, …).
+ * Segregated by service_id, sub_service_id, request_id.
+ * source_approval_id = native approval row PK in the owning service (e.g. hr_service_approvals.id, vpn_approvals.id); not a DB FK.
+ */
+@Entity({ name: "sla_approval" })
+@Index("idx_sla_approval_request_id", ["request_id"])
+@Index("idx_sla_approval_source_approval_id", ["source_approval_id"])
+@Index("idx_sla_approval_service_subservice", ["service_id", "sub_service_id"])
+@Index("idx_sla_approval_approval_status", ["approval_status"])
+@Index("idx_sla_approval_level", ["level"])
+@Index("idx_sla_approval_approver_user_id", ["approver_user_id"])
+@Index("idx_sla_approval_request_level", ["request_id", "level"])
+@Index("idx_sla_approval_svc_sub_status", ["service_id", "sub_service_id", "approval_status"])
+export class ServiceSlaApproval extends BaseModel {
+    @Column({ type: "int" })
+    request_id: number;
+
+    @Column({ type: "int" })
+    source_approval_id: number;
+
+    @Column({ type: "int", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "int", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "varchar", length: 64 })
+    approval_status: string;
+
+    @Column({ type: "int" })
+    level: number;
+
+    @Column({ type: "int", nullable: true })
+    approver_user_id: number | null;
+
+    @Column({ type: "int", nullable: true })
+    approver_role_id: number | null;
+
+    @Column({ type: "int", nullable: true })
+    department_id: number | null;
+
+    @Column({ type: "int", nullable: true })
+    section_id: number | null;
+
+    /** Mirrors native approval `delegate_user_id` (IT master tables may use `delegation_user_id`). */
+    @Column({ type: "int", nullable: true })
+    delegate_user_id: number | null;
+
+    /** Mirrors native approval `approved_by` (acting user when status was last resolved). */
+    @Column({ type: "int", nullable: true })
+    approved_by: number | null;
+
+    /** Mirrors native approval comment / rejection reason. */
+    @Column({ type: "varchar", length: 255, nullable: true })
+    comment: string | null;
+
+    constructor() {
+        super();
+    }
+}

package/src/models/ServicesNotificationConfigModel.ts

@@ -1,55 +1,55 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum ServicesNotificationTriggerType {
-  FINAL_APPROVAL = "final_approval",
-  EVERY_APPROVAL = "every_approval"
-}
-
-@Entity({ name: "services_notification_configs" })
-export class ServicesNotificationConfigs extends BaseModel {
-  @Column({ type: "integer", nullable: false })
-  service_id: number;
-
-  @Column({ type: "integer", nullable: false })
-  sub_service_id: number;
-
-  @Column({ type: "integer", nullable: false })
-  department_id: number;
-
-  @Column({ type: "integer", nullable: true })
-  section_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  role_id: number | null;
-
-  @Column({ 
-    type: "enum", 
-    enum: ServicesNotificationTriggerType, 
-    nullable: false, 
-    default: ServicesNotificationTriggerType.FINAL_APPROVAL 
-  })
-  trigger: ServicesNotificationTriggerType;
-
-  @Column({ type: "boolean", nullable: false, default: true })
-  is_active: boolean;
-  
-  constructor(
-    service_id: number,
-    sub_service_id: number,
-    department_id: number,
-    section_id: number | null = null,
-    role_id: number | null = null,
-    trigger: ServicesNotificationTriggerType = ServicesNotificationTriggerType.FINAL_APPROVAL,
-    is_active: boolean = true
-  ) {
-    super();
-    this.service_id = service_id;
-    this.sub_service_id = sub_service_id;
-    this.department_id = department_id;
-    this.section_id = section_id;
-    this.role_id = role_id;
-    this.trigger = trigger;
-    this.is_active = is_active;
-  }
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum ServicesNotificationTriggerType {
+  FINAL_APPROVAL = "final_approval",
+  EVERY_APPROVAL = "every_approval"
+}
+
+@Entity({ name: "services_notification_configs" })
+export class ServicesNotificationConfigs extends BaseModel {
+  @Column({ type: "integer", nullable: false })
+  service_id: number;
+
+  @Column({ type: "integer", nullable: false })
+  sub_service_id: number;
+
+  @Column({ type: "integer", nullable: false })
+  department_id: number;
+
+  @Column({ type: "integer", nullable: true })
+  section_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  role_id: number | null;
+
+  @Column({ 
+    type: "enum", 
+    enum: ServicesNotificationTriggerType, 
+    nullable: false, 
+    default: ServicesNotificationTriggerType.FINAL_APPROVAL 
+  })
+  trigger: ServicesNotificationTriggerType;
+
+  @Column({ type: "boolean", nullable: false, default: true })
+  is_active: boolean;
+  
+  constructor(
+    service_id: number,
+    sub_service_id: number,
+    department_id: number,
+    section_id: number | null = null,
+    role_id: number | null = null,
+    trigger: ServicesNotificationTriggerType = ServicesNotificationTriggerType.FINAL_APPROVAL,
+    is_active: boolean = true
+  ) {
+    super();
+    this.service_id = service_id;
+    this.sub_service_id = sub_service_id;
+    this.department_id = department_id;
+    this.section_id = section_id;
+    this.role_id = role_id;
+    this.trigger = trigger;
+    this.is_active = is_active;
+  }
+}

package/src/models/SkillsEnhancementRequestModel.ts

@@ -68,8 +68,8 @@ export class SkillsEnhancementRequest extends BaseModel {
     @Column({ type: "varchar", length: 255, nullable: false })
     issuing_authority: string;
 
-    @Column({ type: "text", nullable: true })
-    skill_summary: string | null;
+    @Column({ type: "text", nullable: true })
+    skill_summary: string | null;
 
     @Column({ type: "text", nullable: true })
     additional_info_requested: string | null;
@@ -86,13 +86,13 @@ export class SkillsEnhancementRequest extends BaseModel {
         reviewer_user_id?: number | null,
         assigned_to_user_id?: number | null,
         assigned_at?: Date | null,
-        workflow_execution_id?: string | null,
-        certification_title?: string,
-        skill_category?: SkillCategory,
-        issuing_authority?: string,
-        skill_summary?: string | null,
-        additional_info_requested?: string | null
-    ) {
+        workflow_execution_id?: string | null,
+        certification_title?: string,
+        skill_category?: SkillCategory,
+        issuing_authority?: string,
+        skill_summary?: string | null,
+        additional_info_requested?: string | null
+    ) {
         super();
         this.user_id = user_id;
         this.status = status;
@@ -105,11 +105,11 @@ export class SkillsEnhancementRequest extends BaseModel {
         this.reviewer_user_id = reviewer_user_id || null;
         this.assigned_to_user_id = assigned_to_user_id || null;
         this.assigned_at = assigned_at || null;
-        this.workflow_execution_id = workflow_execution_id || null;
-        this.certification_title = certification_title || "";
-        this.skill_category = skill_category || SkillCategory.TECHNICAL;
-        this.issuing_authority = issuing_authority || "";
-        this.skill_summary = skill_summary || null;
-        this.additional_info_requested = additional_info_requested || null;
-    }
-}
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.certification_title = certification_title || "";
+        this.skill_category = skill_category || SkillCategory.TECHNICAL;
+        this.issuing_authority = issuing_authority || "";
+        this.skill_summary = skill_summary || null;
+        this.additional_info_requested = additional_info_requested || null;
+    }
+}

package/src/models/SlaMyRequestsViewModel.ts

@@ -0,0 +1,142 @@
+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",
+] 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'
+    ) 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 ?? {}),
+    };
+}