@platform-modules/civil-aviation-authority 2.3.240 → 2.3.241

package/src/models/user.ts

@@ -1,234 +1,234 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'users' })
-export class User extends BaseModel {
-  
-    @Column({ type: 'bigint', nullable: true })
-    employee_id?: number;
-
-    @Column({ type: 'bigint', nullable: true })
-    civil_employee_id?: number;
-
-    @Column({ nullable: true })
-    employee_name?: string;
-
-    @Column({ nullable: true })
-    employee_arabic_name?: string;
-
-    @Column({ nullable: true })
-    person_type?: string;
-
-    @Column({ nullable: true })
-    date_of_birth?: string;
-
-    @Column({ nullable: true })
-    region_of_birth?: string;
-
-    @Column({ nullable: true })
-    country_of_birth?: string;
-
-    @Column({ nullable: true })
-    date_of_joining?: string;
-
-    @Column({ nullable: true })
-    last_promotion_date?: string;
-
-    @Column({ nullable: true })
-    gender?: string;
-
-    @Column({ nullable: true })
-    qualification?: string;
-
-    @Column({ nullable: true })
-    marital_status?: string;
-
-    @Column({ nullable: true })
-    nationality?: string;
-
-    @Column({ nullable: true })
-    email?: string;
-
-    @Column({ nullable: true })
-    blood_type?: string;
-
-    @Column({ type: 'varchar', length: 100, nullable: true })
-    national_id?: string;
-
-    @Column({ type: 'varchar', length: 100, nullable: true })
-    manpower_id?: string;
-
-    @Column({ nullable: true })
-    mobile?: string;
-
-    @Column({ nullable: true })
-    office_number?: string;
-
-    @Column({ nullable: true })
-    department?: number;
-
-    @Column({ type: "enum", enum: ["CAA", "Embassy"], nullable: false, default: "CAA" })
-    category: "CAA" | "Embassy"; // Mandatory
-
-    @Column({ nullable: true })
-    directorate?: string;
-
-    @Column({ nullable: true })
-    section?: number;
-
-    @Column({ nullable: true })
-    position?: number;
-
-    @Column({ nullable: true })
-    arabic_position?: string;
-
-    @Column({ nullable: true })
-    grade?: number;
-
-    @Column({ nullable: true })
-    location?: string;
-
-    @Column({ type: 'bigint', nullable: true })
-    supervisor_emp_id?: number;
-
-    @Column({ nullable: true })
-    supervisor_emp_name?: string;
-
-    @Column({ nullable: true , default: false})
-    is_admin?: boolean;
-
-    @Column({ nullable: true })
-    passport_number?: string;
-
-    @Column({ nullable: true })
-    personal_email?: string;
-
-    @Column({ nullable: true })
-    extension_number?: number;
-
-    @Column({ type: "varchar", length: 20, nullable: true })
-    fax_number?: string; // Optional
-
-    @Column({ nullable: true })
-    diplomatic_name?: string;
-
-    @Column({ nullable: true })
-    avatar?: string;
-
-    @Column({ nullable: true })
-    father_name?: string;
-
-    @Column({ nullable: true })
-    spouse_name?: string;
-    
-    @Column({ nullable: true })
-    children1_name?: string;
- 
-    @Column({ nullable: true })
-    children2_name?: string;
-
-    @Column({ nullable: true })
-    address?: string;
-
-    @Column({ nullable: true })
-    religion?: string;
-
-    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
-    current_basic_salary: number;
-
-    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
-    previous_basic_salary: number;
-    
-    constructor(     
-        employee_id?: number,
-        civil_employee_id?: number,
-        employee_name?: string,
-        employee_arabic_name?: string,
-        person_type?: string,
-        date_of_birth?: string,
-        region_of_birth?: string,
-        country_of_birth?: string,
-        date_of_joining?: string,
-        last_promotion_date?: string,
-        gender?: string,
-        qualification?: string,
-        marital_status?: string,
-        nationality?: string,
-        email?: string,
-        blood_type?: string,
-        national_id?: string,
-        manpower_id?: string,
-        mobile?: string,
-        office_number?: string,
-        department?: number,
-        category?: "CAA" | "Embassy",
-        directorate?: string,
-        section?: number,
-        position?: number,
-        arabic_position?: string,
-        grade?: number,
-        location?: string,
-        supervisor_emp_id?: number,
-        supervisor_emp_name?: string,
-        passport_number?: string,
-        personal_email?: string,
-        extension_number?: number,
-        fax_number?: string,
-        diplomatic_name?: string,
-        avatar?: string,
-        father_name?: string,
-        spouse_name?: string,
-        children1_name?: string,
-        children2_name?: string,
-        address?: string,
-        religion?: string,
-        current_basic_salary?: number,
-        previous_basic_salary?: number
-    ) {
-        super();     
-        this.employee_id = employee_id;
-        this.civil_employee_id = civil_employee_id;
-        this.employee_name = employee_name;
-        this.employee_arabic_name = employee_arabic_name;
-        this.person_type = person_type;
-        this.date_of_birth = date_of_birth;
-        this.region_of_birth = region_of_birth;
-        this.country_of_birth = country_of_birth;
-        this.date_of_joining = date_of_joining;
-        this.last_promotion_date = last_promotion_date;
-        this.gender = gender;
-        this.qualification = qualification;
-        this.marital_status = marital_status;
-        this.nationality = nationality;
-        this.email = email;
-        this.blood_type = blood_type;
-        this.national_id = national_id;
-        this.manpower_id = manpower_id;
-        this.mobile = mobile;
-        this.office_number = office_number;
-        this.department = department;
-        this.category = category || "CAA";
-        this.directorate = directorate;
-        this.section = section;
-        this.position = position;
-        this.arabic_position = arabic_position;
-        this.grade = grade;
-        this.location = location;
-        this.supervisor_emp_id = supervisor_emp_id;
-        this.supervisor_emp_name = supervisor_emp_name;
-        this.passport_number = passport_number;
-        this.personal_email = personal_email;
-        this.extension_number = extension_number;
-        this.fax_number = fax_number;
-        this.diplomatic_name = diplomatic_name;
-        this.avatar = avatar;
-        this.father_name = father_name;
-        this.spouse_name = spouse_name;
-        this.children1_name = children1_name;
-        this.children2_name = children2_name;
-        this.address = address;
-        this.religion = religion;
-        this.current_basic_salary = current_basic_salary || 0;
-        this.previous_basic_salary = previous_basic_salary || 0;
-    }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'users' })
+export class User extends BaseModel {
+  
+    @Column({ type: 'bigint', nullable: true })
+    employee_id?: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    civil_employee_id?: number;
+
+    @Column({ nullable: true })
+    employee_name?: string;
+
+    @Column({ nullable: true })
+    employee_arabic_name?: string;
+
+    @Column({ nullable: true })
+    person_type?: string;
+
+    @Column({ nullable: true })
+    date_of_birth?: string;
+
+    @Column({ nullable: true })
+    region_of_birth?: string;
+
+    @Column({ nullable: true })
+    country_of_birth?: string;
+
+    @Column({ nullable: true })
+    date_of_joining?: string;
+
+    @Column({ nullable: true })
+    last_promotion_date?: string;
+
+    @Column({ nullable: true })
+    gender?: string;
+
+    @Column({ nullable: true })
+    qualification?: string;
+
+    @Column({ nullable: true })
+    marital_status?: string;
+
+    @Column({ nullable: true })
+    nationality?: string;
+
+    @Column({ nullable: true })
+    email?: string;
+
+    @Column({ nullable: true })
+    blood_type?: string;
+
+    @Column({ type: 'varchar', length: 100, nullable: true })
+    national_id?: string;
+
+    @Column({ type: 'varchar', length: 100, nullable: true })
+    manpower_id?: string;
+
+    @Column({ nullable: true })
+    mobile?: string;
+
+    @Column({ nullable: true })
+    office_number?: string;
+
+    @Column({ nullable: true })
+    department?: number;
+
+    @Column({ type: "enum", enum: ["CAA", "Embassy"], nullable: false, default: "CAA" })
+    category: "CAA" | "Embassy"; // Mandatory
+
+    @Column({ nullable: true })
+    directorate?: string;
+
+    @Column({ nullable: true })
+    section?: number;
+
+    @Column({ nullable: true })
+    position?: number;
+
+    @Column({ nullable: true })
+    arabic_position?: string;
+
+    @Column({ nullable: true })
+    grade?: number;
+
+    @Column({ nullable: true })
+    location?: string;
+
+    @Column({ type: 'bigint', nullable: true })
+    supervisor_emp_id?: number;
+
+    @Column({ nullable: true })
+    supervisor_emp_name?: string;
+
+    @Column({ nullable: true , default: false})
+    is_admin?: boolean;
+
+    @Column({ nullable: true })
+    passport_number?: string;
+
+    @Column({ nullable: true })
+    personal_email?: string;
+
+    @Column({ nullable: true })
+    extension_number?: number;
+
+    @Column({ type: "varchar", length: 20, nullable: true })
+    fax_number?: string; // Optional
+
+    @Column({ nullable: true })
+    diplomatic_name?: string;
+
+    @Column({ nullable: true })
+    avatar?: string;
+
+    @Column({ nullable: true })
+    father_name?: string;
+
+    @Column({ nullable: true })
+    spouse_name?: string;
+    
+    @Column({ nullable: true })
+    children1_name?: string;
+ 
+    @Column({ nullable: true })
+    children2_name?: string;
+
+    @Column({ nullable: true })
+    address?: string;
+
+    @Column({ nullable: true })
+    religion?: string;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    current_basic_salary: number;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    previous_basic_salary: number;
+    
+    constructor(     
+        employee_id?: number,
+        civil_employee_id?: number,
+        employee_name?: string,
+        employee_arabic_name?: string,
+        person_type?: string,
+        date_of_birth?: string,
+        region_of_birth?: string,
+        country_of_birth?: string,
+        date_of_joining?: string,
+        last_promotion_date?: string,
+        gender?: string,
+        qualification?: string,
+        marital_status?: string,
+        nationality?: string,
+        email?: string,
+        blood_type?: string,
+        national_id?: string,
+        manpower_id?: string,
+        mobile?: string,
+        office_number?: string,
+        department?: number,
+        category?: "CAA" | "Embassy",
+        directorate?: string,
+        section?: number,
+        position?: number,
+        arabic_position?: string,
+        grade?: number,
+        location?: string,
+        supervisor_emp_id?: number,
+        supervisor_emp_name?: string,
+        passport_number?: string,
+        personal_email?: string,
+        extension_number?: number,
+        fax_number?: string,
+        diplomatic_name?: string,
+        avatar?: string,
+        father_name?: string,
+        spouse_name?: string,
+        children1_name?: string,
+        children2_name?: string,
+        address?: string,
+        religion?: string,
+        current_basic_salary?: number,
+        previous_basic_salary?: number
+    ) {
+        super();     
+        this.employee_id = employee_id;
+        this.civil_employee_id = civil_employee_id;
+        this.employee_name = employee_name;
+        this.employee_arabic_name = employee_arabic_name;
+        this.person_type = person_type;
+        this.date_of_birth = date_of_birth;
+        this.region_of_birth = region_of_birth;
+        this.country_of_birth = country_of_birth;
+        this.date_of_joining = date_of_joining;
+        this.last_promotion_date = last_promotion_date;
+        this.gender = gender;
+        this.qualification = qualification;
+        this.marital_status = marital_status;
+        this.nationality = nationality;
+        this.email = email;
+        this.blood_type = blood_type;
+        this.national_id = national_id;
+        this.manpower_id = manpower_id;
+        this.mobile = mobile;
+        this.office_number = office_number;
+        this.department = department;
+        this.category = category || "CAA";
+        this.directorate = directorate;
+        this.section = section;
+        this.position = position;
+        this.arabic_position = arabic_position;
+        this.grade = grade;
+        this.location = location;
+        this.supervisor_emp_id = supervisor_emp_id;
+        this.supervisor_emp_name = supervisor_emp_name;
+        this.passport_number = passport_number;
+        this.personal_email = personal_email;
+        this.extension_number = extension_number;
+        this.fax_number = fax_number;
+        this.diplomatic_name = diplomatic_name;
+        this.avatar = avatar;
+        this.father_name = father_name;
+        this.spouse_name = spouse_name;
+        this.children1_name = children1_name;
+        this.children2_name = children2_name;
+        this.address = address;
+        this.religion = religion;
+        this.current_basic_salary = current_basic_salary || 0;
+        this.previous_basic_salary = previous_basic_salary || 0;
+    }
 }

package/src/sla/sla-table-sync.service.ts

@@ -1,87 +1,87 @@
-import { EntityManager } from "typeorm";
-import { ServiceSlaApproval } from "../models/ServiceSlaApprovalModel";
-import { SlaRequest, SlaRequestStatus } from "../models/SlaRequestModel";
-
-export type PatchSlaApprovalTableInput = Partial<{
-    approval_status: string;
-    approver_user_id: number | null;
-    approver_role_id: number | null;
-    department_id: number | null;
-    section_id: number | null;
-    level: number;
-}>;
-
-export type PatchSlaRequestTableInput = Partial<{
-    status: SlaRequestStatus | string;
-    workflow_execution_id: string | null;
-}>;
-
-function stripUndefined<T extends Record<string, unknown>>(obj: T): Partial<T> {
-    const out: Partial<T> = {};
-    for (const key of Object.keys(obj)) {
-        const v = obj[key];
-        if (v !== undefined) {
-            (out as Record<string, unknown>)[key] = v;
-        }
-    }
-    return out;
-}
-
-/**
- * TypeORM patches for `sla_approval` and `sla_requests` by the keys used at insert time
- * (`source_approval_id` and native `request_id`). Safe to call from any service that shares the DB;
- * failures are swallowed so missing SLA rows never block business transactions.
- */
-export class SlaTableSyncService {
-    static async patchSlaApprovalBySourceApprovalId(
-        manager: EntityManager,
-        sourceApprovalId: number,
-        patch: PatchSlaApprovalTableInput,
-        updatedBy?: number | null
-    ): Promise<void> {
-        if (!Number.isFinite(sourceApprovalId)) {
-            return;
-        }
-        try {
-            const setPayload: Record<string, unknown> = {
-                ...stripUndefined(patch as Record<string, unknown>),
-                updated_at: new Date()
-            };
-            if (updatedBy != null) {
-                setPayload.updated_by = updatedBy;
-            }
-            await manager.getRepository(ServiceSlaApproval).update(
-                { source_approval_id: sourceApprovalId, is_deleted: false },
-                setPayload as any
-            );
-        } catch {
-            // non-fatal
-        }
-    }
-
-    static async patchSlaRequestByNativeRequestId(
-        manager: EntityManager,
-        nativeRequestId: number,
-        patch: PatchSlaRequestTableInput,
-        updatedBy?: number | null
-    ): Promise<void> {
-        if (!Number.isFinite(nativeRequestId) || nativeRequestId < 1) {
-            return;
-        }
-        try {
-            const setPayload: Record<string, unknown> = {
-                ...stripUndefined(patch as Record<string, unknown>),
-                updated_at: new Date()
-            };
-            if (updatedBy != null) {
-                setPayload.updated_by = updatedBy;
-            }
-            await manager.getRepository(SlaRequest).update(
-                { request_id: nativeRequestId, is_deleted: false },
-                setPayload as any
-            );
-        } catch {
-            // non-fatal
-        }
-    }
-}
+import { EntityManager } from "typeorm";
+import { ServiceSlaApproval } from "../models/ServiceSlaApprovalModel";
+import { SlaRequest, SlaRequestStatus } from "../models/SlaRequestModel";
+
+export type PatchSlaApprovalTableInput = Partial<{
+    approval_status: string;
+    approver_user_id: number | null;
+    approver_role_id: number | null;
+    department_id: number | null;
+    section_id: number | null;
+    level: number;
+}>;
+
+export type PatchSlaRequestTableInput = Partial<{
+    status: SlaRequestStatus | string;
+    workflow_execution_id: string | null;
+}>;
+
+function stripUndefined<T extends Record<string, unknown>>(obj: T): Partial<T> {
+    const out: Partial<T> = {};
+    for (const key of Object.keys(obj)) {
+        const v = obj[key];
+        if (v !== undefined) {
+            (out as Record<string, unknown>)[key] = v;
+        }
+    }
+    return out;
+}
+
+/**
+ * TypeORM patches for `sla_approval` and `sla_requests` by the keys used at insert time
+ * (`source_approval_id` and native `request_id`). Safe to call from any service that shares the DB;
+ * failures are swallowed so missing SLA rows never block business transactions.
+ */
+export class SlaTableSyncService {
+    static async patchSlaApprovalBySourceApprovalId(
+        manager: EntityManager,
+        sourceApprovalId: number,
+        patch: PatchSlaApprovalTableInput,
+        updatedBy?: number | null
+    ): Promise<void> {
+        if (!Number.isFinite(sourceApprovalId)) {
+            return;
+        }
+        try {
+            const setPayload: Record<string, unknown> = {
+                ...stripUndefined(patch as Record<string, unknown>),
+                updated_at: new Date()
+            };
+            if (updatedBy != null) {
+                setPayload.updated_by = updatedBy;
+            }
+            await manager.getRepository(ServiceSlaApproval).update(
+                { source_approval_id: sourceApprovalId, is_deleted: false },
+                setPayload as any
+            );
+        } catch {
+            // non-fatal
+        }
+    }
+
+    static async patchSlaRequestByNativeRequestId(
+        manager: EntityManager,
+        nativeRequestId: number,
+        patch: PatchSlaRequestTableInput,
+        updatedBy?: number | null
+    ): Promise<void> {
+        if (!Number.isFinite(nativeRequestId) || nativeRequestId < 1) {
+            return;
+        }
+        try {
+            const setPayload: Record<string, unknown> = {
+                ...stripUndefined(patch as Record<string, unknown>),
+                updated_at: new Date()
+            };
+            if (updatedBy != null) {
+                setPayload.updated_by = updatedBy;
+            }
+            await manager.getRepository(SlaRequest).update(
+                { request_id: nativeRequestId, is_deleted: false },
+                setPayload as any
+            );
+        } catch {
+            // non-fatal
+        }
+    }
+}