@platform-modules/civil-aviation-authority 2.3.211 → 2.3.213

package/src/models/HrServiceRequestModel.ts

@@ -1,193 +1,193 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum HrServiceRequestStatus {
-    PENDING = "Pending",
-    ASSIGNED = "Assigned",
-    IN_PROGRESS = "In Progress",
-    COMPLETED = "Completed",
-    APPROVED = "Approved",
-    REJECTED = "Rejected"
-}
-
-@Entity({ name: "hr_service_requests" })
-export class HrServiceRequest 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: "text", nullable: true })
-    description: string | null;
-
-    @Column({ type: "enum", enum: HrServiceRequestStatus, default: HrServiceRequestStatus.PENDING, nullable: false })
-    status: HrServiceRequestStatus;
-
-    @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;
-
-    // Assignment Decision specific fields
-    @Column({ type: "varchar", length: 255, nullable: false })
-    assigned_employee_name: string;
-
-    @Column({ type: "varchar", length: 50, nullable: true })
-    civil_id_card_number: string | null;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    employee_id: string;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    current_job_position: string;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    assigned_job_position: string;
-
-    @Column({ type: "date", nullable: false })
-    start_date: Date;
-
-    @Column({ type: "date", nullable: false })
-    end_date: Date;
-
-    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
-    assignment_allowance: number | null; // 0-100 percentage
-
-    @Column({ type: "varchar", length: 20, nullable: false })
-    phone_number: string;
-
-    @Column({ type: "text", nullable: false })
-    reason_for_request: string;
-
-    // Replacement tracking fields - Store REPLACEMENT details (ORIGINAL details above remain unchanged)
-    @Column({ type: "boolean", default: false, nullable: false })
-    is_replaced: boolean;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    replacement_employee_name: string | null;
-
-    @Column({ type: "varchar", length: 100, nullable: true })
-    replacement_employee_id: string | null;
-
-    @Column({ type: "varchar", length: 50, nullable: true })
-    replacement_civil_id_card_number: string | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    replacement_current_job_position: string | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    replacement_assigned_job_position: string | null;
-
-    @Column({ type: "date", nullable: true })
-    replacement_start_date: Date | null;
-
-    @Column({ type: "date", nullable: true })
-    replacement_end_date: Date | null;
-
-    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
-    replacement_assignment_allowance: number | null;
-
-    @Column({ type: "text", nullable: true })
-    replacement_reason: string | null;
-
-    @Column({ type: "integer", nullable: true })
-    replaced_by_user_id: number | null;
-
-    @Column({ type: "timestamp", nullable: true })
-    replaced_at: Date | null;
-
-    constructor(
-        user_id: number,
-        status: HrServiceRequestStatus = HrServiceRequestStatus.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,
-        description?: string | null,
-        reviewer_user_id?: number | null,
-        assigned_to_user_id?: number | null,
-        assigned_at?: Date | null,
-        workflow_execution_id?: string | null,
-        assigned_employee_name?: string,
-        civil_id_card_number?: string | null,
-        employee_id?: string,
-        current_job_position?: string,
-        assigned_job_position?: string,
-        start_date?: Date,
-        end_date?: Date,
-        assignment_allowance?: number | null,
-        phone_number?: string,
-        reason_for_request?: string,
-        is_replaced?: boolean,
-        replacement_employee_name?: string | null,
-        replacement_employee_id?: string | null,
-        replacement_civil_id_card_number?: string | null,
-        replacement_current_job_position?: string | null,
-        replacement_assigned_job_position?: string | null,
-        replacement_start_date?: Date | null,
-        replacement_end_date?: Date | null,
-        replacement_assignment_allowance?: number | null,
-        replacement_reason?: string | null,
-        replaced_by_user_id?: number | null,
-        replaced_at?: Date | null
-    ) {
-        super();
-        this.user_id = user_id;
-        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.description = description || 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.assigned_employee_name = assigned_employee_name || "";
-        this.civil_id_card_number = civil_id_card_number || null;
-        this.employee_id = employee_id || "";
-        this.current_job_position = current_job_position || "";
-        this.assigned_job_position = assigned_job_position || "";
-        this.start_date = start_date || new Date();
-        this.end_date = end_date || new Date();
-        this.assignment_allowance = assignment_allowance || null;
-        this.phone_number = phone_number || "";
-        this.reason_for_request = reason_for_request || "";
-        // Replacement fields initialization
-        this.is_replaced = is_replaced || false;
-        this.replacement_employee_name = replacement_employee_name || null;
-        this.replacement_employee_id = replacement_employee_id || null;
-        this.replacement_civil_id_card_number = replacement_civil_id_card_number || null;
-        this.replacement_current_job_position = replacement_current_job_position || null;
-        this.replacement_assigned_job_position = replacement_assigned_job_position || null;
-        this.replacement_start_date = replacement_start_date || null;
-        this.replacement_end_date = replacement_end_date || null;
-        this.replacement_assignment_allowance = replacement_assignment_allowance || null;
-        this.replacement_reason = replacement_reason || null;
-        this.replaced_by_user_id = replaced_by_user_id || null;
-        this.replaced_at = replaced_at || null;
-    }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum HrServiceRequestStatus {
+    PENDING = "Pending",
+    ASSIGNED = "Assigned",
+    IN_PROGRESS = "In Progress",
+    COMPLETED = "Completed",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+
+@Entity({ name: "hr_service_requests" })
+export class HrServiceRequest 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: "text", nullable: true })
+    description: string | null;
+
+    @Column({ type: "enum", enum: HrServiceRequestStatus, default: HrServiceRequestStatus.PENDING, nullable: false })
+    status: HrServiceRequestStatus;
+
+    @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;
+
+    // Assignment Decision specific fields
+    @Column({ type: "varchar", length: 255, nullable: false })
+    assigned_employee_name: string;
+
+    @Column({ type: "varchar", length: 50, nullable: true })
+    civil_id_card_number: string | null;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    employee_id: string;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    current_job_position: string;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    assigned_job_position: string;
+
+    @Column({ type: "date", nullable: false })
+    start_date: Date;
+
+    @Column({ type: "date", nullable: false })
+    end_date: Date;
+
+    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
+    assignment_allowance: number | null; // 0-100 percentage
+
+    @Column({ type: "varchar", length: 20, nullable: false })
+    phone_number: string;
+
+    @Column({ type: "text", nullable: false })
+    reason_for_request: string;
+
+    // Replacement tracking fields - Store REPLACEMENT details (ORIGINAL details above remain unchanged)
+    @Column({ type: "boolean", default: false, nullable: false })
+    is_replaced: boolean;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    replacement_employee_name: string | null;
+
+    @Column({ type: "varchar", length: 100, nullable: true })
+    replacement_employee_id: string | null;
+
+    @Column({ type: "varchar", length: 50, nullable: true })
+    replacement_civil_id_card_number: string | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    replacement_current_job_position: string | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    replacement_assigned_job_position: string | null;
+
+    @Column({ type: "date", nullable: true })
+    replacement_start_date: Date | null;
+
+    @Column({ type: "date", nullable: true })
+    replacement_end_date: Date | null;
+
+    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
+    replacement_assignment_allowance: number | null;
+
+    @Column({ type: "text", nullable: true })
+    replacement_reason: string | null;
+
+    @Column({ type: "integer", nullable: true })
+    replaced_by_user_id: number | null;
+
+    @Column({ type: "timestamp", nullable: true })
+    replaced_at: Date | null;
+
+    constructor(
+        user_id: number,
+        status: HrServiceRequestStatus = HrServiceRequestStatus.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,
+        description?: string | null,
+        reviewer_user_id?: number | null,
+        assigned_to_user_id?: number | null,
+        assigned_at?: Date | null,
+        workflow_execution_id?: string | null,
+        assigned_employee_name?: string,
+        civil_id_card_number?: string | null,
+        employee_id?: string,
+        current_job_position?: string,
+        assigned_job_position?: string,
+        start_date?: Date,
+        end_date?: Date,
+        assignment_allowance?: number | null,
+        phone_number?: string,
+        reason_for_request?: string,
+        is_replaced?: boolean,
+        replacement_employee_name?: string | null,
+        replacement_employee_id?: string | null,
+        replacement_civil_id_card_number?: string | null,
+        replacement_current_job_position?: string | null,
+        replacement_assigned_job_position?: string | null,
+        replacement_start_date?: Date | null,
+        replacement_end_date?: Date | null,
+        replacement_assignment_allowance?: number | null,
+        replacement_reason?: string | null,
+        replaced_by_user_id?: number | null,
+        replaced_at?: Date | null
+    ) {
+        super();
+        this.user_id = user_id;
+        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.description = description || 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.assigned_employee_name = assigned_employee_name || "";
+        this.civil_id_card_number = civil_id_card_number || null;
+        this.employee_id = employee_id || "";
+        this.current_job_position = current_job_position || "";
+        this.assigned_job_position = assigned_job_position || "";
+        this.start_date = start_date || new Date();
+        this.end_date = end_date || new Date();
+        this.assignment_allowance = assignment_allowance || null;
+        this.phone_number = phone_number || "";
+        this.reason_for_request = reason_for_request || "";
+        // Replacement fields initialization
+        this.is_replaced = is_replaced || false;
+        this.replacement_employee_name = replacement_employee_name || null;
+        this.replacement_employee_id = replacement_employee_id || null;
+        this.replacement_civil_id_card_number = replacement_civil_id_card_number || null;
+        this.replacement_current_job_position = replacement_current_job_position || null;
+        this.replacement_assigned_job_position = replacement_assigned_job_position || null;
+        this.replacement_start_date = replacement_start_date || null;
+        this.replacement_end_date = replacement_end_date || null;
+        this.replacement_assignment_allowance = replacement_assignment_allowance || null;
+        this.replacement_reason = replacement_reason || null;
+        this.replaced_by_user_id = replaced_by_user_id || null;
+        this.replaced_at = replaced_at || null;
+    }
+}
+

package/src/models/MaintenanceApprovalModel.ts

@@ -1,7 +1,7 @@
 import { Column, Entity } from 'typeorm';
 import { BaseModel } from './BaseModel';
 
-export enum MaintenanceApprovalStatus {
+export enum AssetMaintenanceApprovalStatus {
   PENDING = 'Pending',
   IN_PROGRESS = 'In Progress',
   APPROVED = 'Approved',
@@ -9,7 +9,7 @@ export enum MaintenanceApprovalStatus {
 }
 
 @Entity({ name: 'maintenance_approvals' })
-export class MaintenanceApprovalDetails extends BaseModel {
+export class AssetMaintenanceApprovalDetails extends BaseModel {
   @Column({ type: 'integer', nullable: false })
   request_id: number;
 
@@ -23,7 +23,7 @@ export class MaintenanceApprovalDetails extends BaseModel {
   level: number;
 
   @Column({ type: 'integer', nullable: true })
-  approver_role_id: number;
+  approver_role_id: number | null;
 
   @Column({ type: 'integer', nullable: true })
   department_id: number | null;
@@ -45,11 +45,11 @@ export class MaintenanceApprovalDetails extends BaseModel {
 
   @Column({
     type: 'enum',
-    enum: MaintenanceApprovalStatus,
-    default: MaintenanceApprovalStatus.PENDING,
+    enum: AssetMaintenanceApprovalStatus,
+    default: AssetMaintenanceApprovalStatus.PENDING,
     nullable: false,
   })
-  approval_status: MaintenanceApprovalStatus;
+  approval_status: AssetMaintenanceApprovalStatus;
 
   @Column({ type: 'boolean', default: true, nullable: false })
   is_allowed: boolean;

package/src/models/MaintenanceAttachmentModel.ts

@@ -2,7 +2,7 @@ import { Column, Entity } from 'typeorm';
 import { BaseModel } from './BaseModel';
 
 @Entity({ name: 'maintenance_attachments' })
-export class MaintenanceAttachment extends BaseModel {
+export class AssetMaintenanceAttachment extends BaseModel {
   @Column({ type: 'integer', nullable: false })
   request_id: number;
 

package/src/models/MaintenanceChatModel.ts

@@ -1,7 +1,7 @@
 import { Column, Entity } from 'typeorm';
 import { BaseModel } from './BaseModel';
 
-export enum MaintenanceMessageType {
+export enum AssetMaintenanceMessageType {
   TEXT = 'text',
   IMAGE = 'image',
   VIDEO = 'video',
@@ -10,7 +10,7 @@ export enum MaintenanceMessageType {
 }
 
 @Entity({ name: 'maintenance_chats' })
-export class MaintenanceChat extends BaseModel {
+export class AssetMaintenanceChat extends BaseModel {
   @Column({ type: 'integer', nullable: false })
   request_id: number;
 
@@ -24,19 +24,19 @@ export class MaintenanceChat extends BaseModel {
   user_id: number;
 
   @Column({ type: 'integer', nullable: true })
-  role_id: number;
+  role_id: number | null;
 
   @Column({ type: 'text', nullable: false })
   message: string;
 
   @Column({
     type: 'enum',
-    enum: MaintenanceMessageType,
-    default: MaintenanceMessageType.TEXT,
+    enum: AssetMaintenanceMessageType,
+    default: AssetMaintenanceMessageType.TEXT,
     nullable: false,
   })
-  messageType: MaintenanceMessageType;
+  messageType: AssetMaintenanceMessageType;
 
   @Column({ type: 'text', nullable: true })
-  status: string;
+  status: string | null;
 }

package/src/models/MaintenanceRequestModel.ts

@@ -1,25 +1,22 @@
 import { Column, Entity } from 'typeorm';
 import { BaseModel } from './BaseModel';
 
-/** Subject / handling priority classification */
-export enum MaintenanceSubjectClassification {
-  URGENT = 'Urgent',
-  VERY_URGENT = 'Very Urgent',
-  CONFIDENTIAL = 'Confidential',
-  INFORMATIONAL = 'Informational',
-  NORMAL = 'Normal',
+export enum AssetMaintenanceCategory {
+  BUILDING = 'Building',
+  EQUIPMENT = 'Equipment',
+  RESIDENTIAL = 'Residential',
 }
 
-/** Concerned department under General Manager of Support Services */
-export enum MaintenanceConcernedDepartment {
-  IT = 'IT',
-  HR = 'HR',
-  TRAINING = 'Training',
-  FINANCE = 'Finance',
-  PROJECTS_AND_MAINTENANCE = 'Projects & Maintenance',
+export enum AssetMaintenanceSubCategory {
+  ELECTRICAL = 'Electrical',
+  PLUMBING = 'Plumbing',
+  HVAC = 'HVAC',
+  CIVIL = 'Civil',
+  CLEANING = 'Cleaning',
+  OTHER = 'Other',
 }
 
-export enum MaintenanceRequestStatus {
+export enum AssetMaintenanceRequestStatus {
   PENDING = 'Pending',
   ASSIGNED = 'Assigned',
   IN_PROGRESS = 'In Progress',
@@ -28,66 +25,60 @@ export enum MaintenanceRequestStatus {
 }
 
 @Entity({ name: 'maintenance_requests' })
-export class MaintenanceRequests extends BaseModel {
+export class AssetMaintenanceRequests 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({ nullable: true })
-  service_id: number;
+  @Column({ type: 'integer', nullable: true })
+  service_id: number | null;
 
-  @Column({ nullable: true })
-  sub_service_id: number;
+  @Column({ type: 'integer', nullable: true })
+  sub_service_id: number | null;
 
-  @Column({ nullable: false })
+  @Column({ type: 'integer', nullable: false })
   user_id: number;
 
-  @Column({ type: 'varchar', length: 500, nullable: false })
-  sent_by: string;
-
-  @Column({ type: 'date', nullable: false })
-  letter_date: Date;
-
-  @Column({ type: 'varchar', length: 500, nullable: false })
-  subject: string;
-
   @Column({
     type: 'enum',
-    enum: MaintenanceSubjectClassification,
-    enumName: 'maintenance_subject_classification_en',
+    enum: AssetMaintenanceCategory,
+    enumName: 'asset_maintenance_category_en',
     nullable: false,
   })
-  subject_classification: MaintenanceSubjectClassification;
-
-  @Column({ type: 'text', nullable: false })
-  topic: string;
+  category: AssetMaintenanceCategory;
 
   @Column({
     type: 'enum',
-    enum: MaintenanceConcernedDepartment,
-    enumName: 'maintenance_concerned_department_en',
+    enum: AssetMaintenanceSubCategory,
+    enumName: 'asset_maintenance_sub_category_en',
     nullable: false,
   })
-  concerned_department: MaintenanceConcernedDepartment;
+  sub_category: AssetMaintenanceSubCategory;
+
+  @Column({ type: 'boolean', nullable: false, default: false })
+  emergency_maintenance_support: boolean;
 
-  @Column({ type: 'date', nullable: false })
-  date_from: Date;
+  @Column({ type: 'varchar', length: 500, nullable: false })
+  location: string;
+
+  @Column({ type: 'text', nullable: false })
+  reason_for_maintenance: string;
 
-  @Column({ type: 'date', nullable: false })
-  date_to: Date;
+  @Column({ type: 'text', nullable: true })
+  description: string | null;
 
-  @Column({ type: 'date', nullable: false, default: () => 'CURRENT_DATE' })
-  request_submission_date: Date;
+  @Column({ type: 'date', nullable: true })
+  completion_date: Date | null;
 
   @Column({
     type: 'enum',
-    enum: MaintenanceRequestStatus,
-    default: MaintenanceRequestStatus.PENDING,
+    enum: AssetMaintenanceRequestStatus,
+    default: AssetMaintenanceRequestStatus.PENDING,
     nullable: false,
   })
-  status: MaintenanceRequestStatus;
+  status: AssetMaintenanceRequestStatus;
 
   @Column({ type: 'varchar', nullable: true })
   workflow_execution_id: string | null;

package/src/models/MaintenanceWorkflowModel.ts

@@ -1,14 +1,14 @@
 import { Column, Entity } from 'typeorm';
 import { BaseModel } from './BaseModel';
 
-export enum MaintenanceWorkFlowStatus {
+export enum AssetMaintenanceWorkflowStatus {
   COMPLETED = 'Completed',
   NOT_YET_STARTED = 'Not Yet Started',
   PENDING = 'Pending',
 }
 
 @Entity({ name: 'maintenance_workflows' })
-export class MaintenanceWorkFlow extends BaseModel {
+export class AssetMaintenanceWorkflow extends BaseModel {
   @Column({ type: 'integer', nullable: false })
   request_id: number;
 
@@ -23,11 +23,11 @@ export class MaintenanceWorkFlow extends BaseModel {
 
   @Column({
     type: 'enum',
-    enum: MaintenanceWorkFlowStatus,
-    default: MaintenanceWorkFlowStatus.NOT_YET_STARTED,
+    enum: AssetMaintenanceWorkflowStatus,
+    default: AssetMaintenanceWorkflowStatus.NOT_YET_STARTED,
     nullable: false,
   })
-  status: MaintenanceWorkFlowStatus;
+  status: AssetMaintenanceWorkflowStatus;
 
   @Column({ type: 'integer', nullable: true })
   user_id: number | null;