@platform-modules/civil-aviation-authority 2.3.127 → 2.3.128

package/src/models/DocumentFolderModel.ts

@@ -1,45 +1,45 @@
-import { Column, Entity, ManyToOne, JoinColumn, OneToMany } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { Departments } from './DepartmentsModel';
-import { Document } from './DocumentModel';
-import { DocumentDrive } from './DocumentDriveModel';
-
-@Entity({ name: 'document_folders' })
-export class DocumentFolder extends BaseModel {
-  
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  name: string;
-
-  @Column({ type: 'integer', nullable: false })
-  department_id: number;
-
-  @Column({ type: 'integer', nullable: true })
-  drive_id: number | null;
-
-  @ManyToOne(() => DocumentDrive, (d) => d.folders, { nullable: true })
-  @JoinColumn({ name: 'drive_id' })
-  drive?: DocumentDrive;
-
-  @Column({ type: 'integer', nullable: true })
-  parent_folder_id?: number;
-
-  @Column({ type: 'text', nullable: true })
-  description?: string;
-
-  @Column({ type: 'boolean', nullable: false, default: true })
-  is_active: boolean;
-
-  @ManyToOne(() => Departments)
-  @JoinColumn({ name: 'department_id' })
-  department?: Departments;
-
-  @ManyToOne(() => DocumentFolder, { nullable: true })
-  @JoinColumn({ name: 'parent_folder_id' })
-  parentFolder?: DocumentFolder;
-
-  @OneToMany(() => DocumentFolder, folder => folder.parentFolder)
-  subFolders?: DocumentFolder[];
-
-  @OneToMany(() => Document, document => document.folder)
-  documents?: Document[];
-}
+import { Column, Entity, ManyToOne, JoinColumn, OneToMany } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { Departments } from './DepartmentsModel';
+import { Document } from './DocumentModel';
+import { DocumentDrive } from './DocumentDriveModel';
+
+@Entity({ name: 'document_folders' })
+export class DocumentFolder extends BaseModel {
+  
+  @Column({ type: 'varchar', length: 100, nullable: false })
+  name: string;
+
+  @Column({ type: 'integer', nullable: false })
+  department_id: number;
+
+  @Column({ type: 'integer', nullable: true })
+  drive_id: number | null;
+
+  @ManyToOne(() => DocumentDrive, (d) => d.folders, { nullable: true })
+  @JoinColumn({ name: 'drive_id' })
+  drive?: DocumentDrive;
+
+  @Column({ type: 'integer', nullable: true })
+  parent_folder_id?: number;
+
+  @Column({ type: 'text', nullable: true })
+  description?: string;
+
+  @Column({ type: 'boolean', nullable: false, default: true })
+  is_active: boolean;
+
+  @ManyToOne(() => Departments)
+  @JoinColumn({ name: 'department_id' })
+  department?: Departments;
+
+  @ManyToOne(() => DocumentFolder, { nullable: true })
+  @JoinColumn({ name: 'parent_folder_id' })
+  parentFolder?: DocumentFolder;
+
+  @OneToMany(() => DocumentFolder, folder => folder.parentFolder)
+  subFolders?: DocumentFolder[];
+
+  @OneToMany(() => Document, document => document.folder)
+  documents?: Document[];
+}

package/src/models/HousingContractCancelChatModel.ts

@@ -9,6 +9,14 @@ export enum HousingContractCancelMessageType {
   link = 'link'
 }
 
+export enum HousingContractCancelChatStatus {
+  Pending = 'Pending',
+  Received = 'Received',
+  Approved = 'Approved',
+  Rejected = 'Rejected',
+  InProgress = 'In Progress',
+}
+
 @Entity({ name: 'housing_contract_cancel_chat' })
 export class HousingContractCancelChat extends BaseModel {
 
@@ -21,9 +29,18 @@ export class HousingContractCancelChat extends BaseModel {
   @Column({ type: 'int', nullable: false })
   sub_service_id: number;
 
+  @Column({ type: 'int', nullable: false })
+  user_id: number;
+
   @Column({ type: 'text', nullable: false })
   message: string;
 
+  @Column({ type: 'int', nullable: true })
+  approver_role_id: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: false, default: 'Pending' })
+  status: string;
+
   @Column({ type: 'varchar', length: 20, nullable: false })
   message_type: string;
 

package/src/models/HousingContractRenewalChatModel.ts

@@ -9,6 +9,15 @@ export enum HousingContractRenewalMessageType {
   link = 'link'
 }
 
+/** Aligns with request-for-coverage / accommodation chat `status` usage */
+export enum HousingContractRenewalChatStatus {
+  Pending = 'Pending',
+  Received = 'Received',
+  Approved = 'Approved',
+  Rejected = 'Rejected',
+  InProgress = 'In Progress',
+}
+
 @Entity({ name: 'housing_contract_renewal_chat' })
 export class HousingContractRenewalChat extends BaseModel {
 
@@ -21,9 +30,20 @@ export class HousingContractRenewalChat extends BaseModel {
   @Column({ type: 'int', nullable: false })
   sub_service_id: number;
 
+  /** Message author (same pattern as request_for_coverage_request_chat.user_id) */
+  @Column({ type: 'int', nullable: false })
+  user_id: number;
+
   @Column({ type: 'text', nullable: false })
   message: string;
 
+  /** Role context for the chat line (e.g. active role when message was posted) */
+  @Column({ type: 'int', nullable: true })
+  approver_role_id: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: false, default: 'Pending' })
+  status: string;
+
   @Column({ type: 'varchar', length: 20, nullable: false })
   message_type: string;
 

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;
+    }
+}
+