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

package/src/models/SlaApprovalsViewModel.ts

@@ -1,135 +1,142 @@
-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;
-}
+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.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
+`;
+
+/**
+ * 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;
+}

package/src/models/SlaMyRequestsViewModel.ts

@@ -62,8 +62,13 @@ SELECT
         - 'is_deleted'
         - 'sla_request'
         - 'sla_request_id'
-    ) AS request_fields
+    ) 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
@@ -129,6 +134,15 @@ export class SlaMyRequestsView {
     /** Remaining `request_obj` keys after excluding workflow/common duplicates. */
     @ViewColumn()
     request_fields: Record<string, unknown>;
+
+    @ViewColumn()
+    req_user_arabicname: string;
+
+    @ViewColumn()
+    req_user_department_arabicname: string;
+
+    @ViewColumn()
+    req_user_section_arabicname: string;
 }
 
 /** Flatten view row: fixed columns plus each entry in `request_fields`. */
@@ -144,6 +158,9 @@ export function flattenSlaMyRequestsViewRow(
         created_at,
         req_user_department_id,
         req_user_section_id,
+        req_user_arabicname,
+        req_user_department_arabicname,
+        req_user_section_arabicname,
         service_name,
         sub_service_name,
         status,
@@ -160,6 +177,9 @@ export function flattenSlaMyRequestsViewRow(
         created_at,
         req_user_department_id,
         req_user_section_id,
+        req_user_arabicname,
+        req_user_department_arabicname,
+        req_user_section_arabicname,
         service_name,
         sub_service_name,
         status,

package/src/models/StudyLeaveRequestModel.ts

@@ -1,144 +1,144 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum StudyLeaveRequestStatus {
-  PENDING = "Pending",
-  IN_PROGRESS = "In Progress",
-  COMPLETED = "Completed",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-@Entity({ name: "study_leave_requests" })
-export class StudyLeaveRequest extends BaseModel {
-  @Column({ type: "integer", nullable: true })
-  req_user_department_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  req_user_section_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  req_user_position_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  service_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: "integer", nullable: false })
-  user_id: number;
-
-  @Column({ type: "varchar", length: 255, nullable: false })
-  course_name: string;
-
-  @Column({ type: "varchar", length: 255, nullable: false })
-  institute_name: string;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  duration_of_course: string | null;
-
-  @Column({ type: "date", nullable: false })
-  course_start_date: Date;
-
-  @Column({ type: "date", nullable: false })
-  course_end_date: Date;
-
-  @Column({ type: "varchar", length: 255, nullable: false })
-  location: string;
-
-  @Column({ type: "text", nullable: false })
-  description: string;
-
-  @Column({
-    type: "enum",
-    enum: StudyLeaveRequestStatus,
-    default: StudyLeaveRequestStatus.PENDING,
-    nullable: false
-  })
-  status: StudyLeaveRequestStatus;
-
-  @Column({ type: "integer", nullable: true })
-  reviewer_user_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  assigned_to_user_id: number | null;
-
-  @Column({ type: "timestamp", nullable: true })
-  assigned_at: Date | null;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  workflow_execution_id: string | null;
-
-  @Column({ type: "boolean", default: false, nullable: true })
-  already_submitted_in_ministry_of_education_system: boolean | null;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  area_name: string | null;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  country_name: string | null;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  qualification_required: string | null;
-
-  @Column({ type: "boolean", default: false, nullable: true })
-  have_you_ever_received_authority: boolean | null;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  scholarship: string | null;
-
-  constructor(
-    user_id: number,
-    course_name: string,
-    institute_name: string,
-    course_start_date: Date,
-    course_end_date: Date,
-    location: string,
-    description: string,
-    status: StudyLeaveRequestStatus = StudyLeaveRequestStatus.PENDING,
-    service_id?: number | null,
-    sub_service_id?: number | null,
-    req_user_department_id?: number | null,
-    req_user_section_id?: number | null,
-    req_user_position_id?: number | null,
-    duration_of_course?: string | null,
-    reviewer_user_id?: number | null,
-    assigned_to_user_id?: number | null,
-    assigned_at?: Date | null,
-    workflow_execution_id?: string | null,
-    already_submitted_in_ministry_of_education_system?: boolean | null,
-    area_name?: string | null,
-    country_name?: string | null,
-    qualification_required?: string | null,
-    have_you_ever_received_authority?: boolean | null,
-    scholarship?: string | null
-  ) {
-    super();
-    this.user_id = user_id;
-    this.course_name = course_name;
-    this.institute_name = institute_name;
-    this.course_start_date = course_start_date;
-    this.course_end_date = course_end_date;
-    this.location = location;
-    this.description = description;
-    this.status = status;
-    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.req_user_position_id = req_user_position_id || null;
-    this.duration_of_course = duration_of_course || null;
-    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.already_submitted_in_ministry_of_education_system = already_submitted_in_ministry_of_education_system ?? null;
-    this.area_name = area_name ?? null;
-    this.country_name = country_name ?? null;
-    this.qualification_required = qualification_required ?? null;
-    this.have_you_ever_received_authority = have_you_ever_received_authority ?? null;
-    this.scholarship = scholarship ?? null;
-  }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum StudyLeaveRequestStatus {
+  PENDING = "Pending",
+  IN_PROGRESS = "In Progress",
+  COMPLETED = "Completed",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: "study_leave_requests" })
+export class StudyLeaveRequest extends BaseModel {
+  @Column({ type: "integer", nullable: true })
+  req_user_department_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  req_user_section_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  req_user_position_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  service_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: "integer", nullable: false })
+  user_id: number;
+
+  @Column({ type: "varchar", length: 255, nullable: false })
+  course_name: string;
+
+  @Column({ type: "varchar", length: 255, nullable: false })
+  institute_name: string;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  duration_of_course: string | null;
+
+  @Column({ type: "date", nullable: false })
+  course_start_date: Date;
+
+  @Column({ type: "date", nullable: false })
+  course_end_date: Date;
+
+  @Column({ type: "varchar", length: 255, nullable: false })
+  location: string;
+
+  @Column({ type: "text", nullable: false })
+  description: string;
+
+  @Column({
+    type: "enum",
+    enum: StudyLeaveRequestStatus,
+    default: StudyLeaveRequestStatus.PENDING,
+    nullable: false
+  })
+  status: StudyLeaveRequestStatus;
+
+  @Column({ type: "integer", nullable: true })
+  reviewer_user_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  assigned_to_user_id: number | null;
+
+  @Column({ type: "timestamp", nullable: true })
+  assigned_at: Date | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  workflow_execution_id: string | null;
+
+  @Column({ type: "boolean", default: false, nullable: true })
+  already_submitted_in_ministry_of_education_system: boolean | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  area_name: string | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  country_name: string | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  qualification_required: string | null;
+
+  @Column({ type: "boolean", default: false, nullable: true })
+  have_you_ever_received_authority: boolean | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  scholarship: string | null;
+
+  constructor(
+    user_id: number,
+    course_name: string,
+    institute_name: string,
+    course_start_date: Date,
+    course_end_date: Date,
+    location: string,
+    description: string,
+    status: StudyLeaveRequestStatus = StudyLeaveRequestStatus.PENDING,
+    service_id?: number | null,
+    sub_service_id?: number | null,
+    req_user_department_id?: number | null,
+    req_user_section_id?: number | null,
+    req_user_position_id?: number | null,
+    duration_of_course?: string | null,
+    reviewer_user_id?: number | null,
+    assigned_to_user_id?: number | null,
+    assigned_at?: Date | null,
+    workflow_execution_id?: string | null,
+    already_submitted_in_ministry_of_education_system?: boolean | null,
+    area_name?: string | null,
+    country_name?: string | null,
+    qualification_required?: string | null,
+    have_you_ever_received_authority?: boolean | null,
+    scholarship?: string | null
+  ) {
+    super();
+    this.user_id = user_id;
+    this.course_name = course_name;
+    this.institute_name = institute_name;
+    this.course_start_date = course_start_date;
+    this.course_end_date = course_end_date;
+    this.location = location;
+    this.description = description;
+    this.status = status;
+    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.req_user_position_id = req_user_position_id || null;
+    this.duration_of_course = duration_of_course || null;
+    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.already_submitted_in_ministry_of_education_system = already_submitted_in_ministry_of_education_system ?? null;
+    this.area_name = area_name ?? null;
+    this.country_name = country_name ?? null;
+    this.qualification_required = qualification_required ?? null;
+    this.have_you_ever_received_authority = have_you_ever_received_authority ?? null;
+    this.scholarship = scholarship ?? null;
+  }
+}
+