@platform-modules/civil-aviation-authority 2.0.85 → 2.0.86

package/src/models/HotelAttachedModel.ts

@@ -0,0 +1,64 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+@Entity({ name: 'hotel_request_attachments' })
+export  class HotelRequestAttachment 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: 'varchar', length: 500, nullable: false })
+    file_url: string;
+
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    file_name: string;
+
+    @Column({ type: 'varchar', length: 100, nullable: true })
+    file_type: string;
+
+    @Column({ type: 'bigint', nullable: true })
+    file_size: number | null;
+
+    @Column({ type: 'integer', nullable: true })
+    chat_id: number | null;
+
+    @Column({ type: "integer", nullable: false })
+  uploaded_by: number;
+
+  @Column({ type: "text", nullable: true })
+  description: string;
+
+
+    constructor(
+        request_id: number,
+        uploaded_by: number,
+        file_url: string,
+        file_name?: string,
+        file_type?: string,
+        file_size?: number,
+        service_id?: number,
+        sub_service_id?: number,
+        chat_id?: number,
+        description?: string
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.file_url = file_url;
+        this.file_name = file_name || '';
+        this.file_type = file_type || '';
+        this.file_size = file_size || null;
+        this.chat_id = chat_id || null;
+        this.uploaded_by = uploaded_by;
+        this.description = description || '';
+    }
+}
+

package/src/models/HotelChatModel.ts

@@ -0,0 +1,55 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum HotelMessageTypes {
+  TEXT = "text",
+  IMAGE = "image",
+  VIDEO = "video",
+  FILE = "file",
+  LINK = "link"
+}
+
+@Entity({ name: 'Hotel_request_chat' })
+export class HotelRequestChat 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 })
+    user_id: number;
+
+    @Column({ type: 'text', nullable: false })
+    message: string;
+
+    @Column({ 
+        type: 'enum', 
+        enum: HotelMessageTypes, 
+        default: HotelMessageTypes.TEXT,
+        nullable: false
+    })
+    messageType: HotelMessageTypes;
+
+    constructor(
+        request_id: number,
+        user_id: number,
+        message: string,
+        service_id?: number,
+        sub_service_id?: number,
+        messageType?: HotelMessageTypes
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.user_id = user_id;
+        this.message = message;
+        this.messageType = messageType || HotelMessageTypes.TEXT;
+    }
+}
+

package/src/models/HotelWorkFlowModel.ts

@@ -0,0 +1,42 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum HotelWorkFlowStatus {
+    COMPLETED = "Completed",
+    NOT_YET_STARTED = "Not Yet Started",
+    PENDING = "Pending"
+  }
+
+//This model is used to store the logistics workflow status and activity logs
+@Entity({ name: 'hotel_workflows' })
+export class HotelWorkFlow 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: 'varchar', length: 500, nullable: false })
+  content: string;
+
+  @Column({ type: 'enum', enum: HotelWorkFlowStatus, default: HotelWorkFlowStatus.NOT_YET_STARTED, nullable: false })
+  status: HotelWorkFlowStatus;
+
+  constructor(
+    request_id: number, 
+    content: string, 
+    status: HotelWorkFlowStatus,
+    service_id?: number,
+    sub_service_id?: number
+  ) {
+    super();
+    this.request_id = request_id;
+    this.service_id = service_id || null;
+    this.sub_service_id = sub_service_id || null;
+    this.content = content;
+    this.status = status;
+  }
+}

package/src/models/HotelreservationModel.ts

@@ -0,0 +1,166 @@
+import { Entity, Column } from 'typeorm';
+import { BaseModel } from './BaseModel';
+
+export enum MealType {
+    BREAKFAST = "Breakfast",
+    LUNCH = "Lunch",
+    DINNER = "Dinner",
+}
+
+export enum ServiceTypes {
+    LAUNDRY = "Laundry",
+    TELEPHONE = "Telephone Service",
+}
+
+export enum HotelReservationStatus {
+    PENDING = "Pending",
+    APPROVED = "Approved",
+    REJECTED = "Rejected",
+    IN_PROGRESS = "In Progress"
+}
+
+@Entity({ name:'hotelreservations'})
+export class HotelReservation extends BaseModel {
+    // Workflow fields (similar to IT Help Desk)
+    @Column({ type: 'int', nullable: true })
+    req_user_department_id: number | null;
+
+    @Column({ type: 'int', nullable: true })
+    req_user_section_id: number | null;
+
+    @Column({ type: 'int', nullable: true })
+    service_id: number | null;
+
+    @Column({ type: 'int', nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: 'varchar', length: 20, nullable: true })
+    service_type: string | null; // 'internal' or 'external'
+
+    @Column({ type: 'varchar', nullable: true })
+    workflow_execution_id: string | null;
+
+    @Column({
+        type: "enum",
+        enum: HotelReservationStatus,
+        default: HotelReservationStatus.PENDING,
+        nullable: false,
+    })
+    status: HotelReservationStatus;
+
+    @Column({ nullable: false })
+    user_id: number;
+
+    // Hotel reservation specific fields
+    @Column({ type: 'varchar', length: 50 })
+    type_of_accommodation: string;
+
+    @Column({ type: 'decimal', precision: 10, scale: 2, nullable: false })
+    price: number;
+
+    @Column({ type: 'enum', enum: MealType, nullable: false, })
+    meal: MealType;
+
+    @Column({ type: 'enum', enum: ServiceTypes, nullable: false, })
+    service: ServiceTypes;
+
+    @Column({ type: 'timestamptz', nullable: false })
+    date_of_request: Date;
+
+    @Column({ type: 'varchar', length: 100, nullable: false })
+    hotel_name: string;
+
+    @Column({ type: 'date', nullable: false })
+    check_in_date: Date;
+
+    @Column({ type: 'time', nullable: false })
+    check_in_time: string;
+
+    @Column({ type: 'date', nullable: false })
+    check_out_date: Date;
+    
+    @Column({ type: 'date', nullable: true })
+    booking_date: Date | null;
+
+    @Column({ type: 'time', nullable: false })
+    check_out_time: string;
+
+    @Column({ type: 'int', nullable: false })
+    number_of_guests: number;
+
+    @Column({ type: 'text', nullable: true })
+    description: string;
+
+    @Column({ type: 'text', nullable: true })
+    attachment_url: string | null;
+
+    @Column({ type: 'varchar', length: 100, nullable: false })
+    requested_by: string;
+
+    @Column({ type: 'varchar', length: 100, nullable: true })
+    visitor_name: string | null;
+
+    @Column({ type: 'boolean', default: false })
+    hr_approval: boolean;
+
+    @Column({ type: 'boolean', default: false })
+    pr_approval: boolean;
+
+
+    constructor(
+        type_of_accommodation: string,
+        price: number,
+        meal: MealType,
+        service: ServiceTypes,
+        date_of_request: Date,
+        hotel_name: string,
+        check_in_date: Date,
+        booking_date: Date | null,
+        check_in_time: string,
+        check_out_date: Date,
+        check_out_time: string,
+        number_of_guests: number,
+        description: string,
+        requested_by: string,
+        visitor_name: string,
+        user_id: number,
+        status: HotelReservationStatus = HotelReservationStatus.PENDING,
+        hr_approval: boolean = false,
+        pr_approval: boolean = false,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        service_type?: string | null,
+        workflow_execution_id?: string | null,
+        req_user_department_id?: number | null,
+        req_user_section_id?: number | null,
+        attachment_url?: string | null
+    ) {
+        super();
+        this.type_of_accommodation = type_of_accommodation;
+        this.price = price;
+        this.meal = meal;
+        this.service = service;
+        this.date_of_request = date_of_request;
+        this.hotel_name = hotel_name;
+        this.check_in_date = check_in_date;
+        this.check_in_time = check_in_time;
+        this.check_out_date = check_out_date;
+        this.check_out_time = check_out_time;
+        this.number_of_guests = number_of_guests;
+        this.description = description;
+        this.requested_by = requested_by;
+        this.visitor_name = visitor_name;
+        this.user_id = user_id;
+        this.status = status;
+        this.hr_approval = hr_approval;
+        this.pr_approval = pr_approval;
+        this.service_id = service_id ?? null;
+        this.sub_service_id = sub_service_id ?? null;
+        this.service_type = service_type ?? null;
+        this.workflow_execution_id = workflow_execution_id ?? null;
+        this.req_user_department_id = req_user_department_id ?? null;
+        this.req_user_section_id = req_user_section_id ?? null;
+        this.attachment_url = attachment_url ?? null;
+        this.booking_date = booking_date ?? null;
+    }
+}

package/src/models/ItApprovalsModel.ts

@@ -25,6 +25,9 @@ export class ItApprovalDetails extends BaseModel {
   @Column({ type: 'integer', nullable: true })
   approver_user_id: number | null;
 
+  @Column({ type: 'integer', nullable: true })
+  delegation_user_id: number | null;
+
   @Column({ type: 'integer', nullable: false })
   approver_role_id: number | null;
 
@@ -54,7 +57,8 @@ export class ItApprovalDetails extends BaseModel {
       section_id?: number | null,
       approved_by?: number | null,
       service_id?: number | null,
-      sub_service_id?: number | null
+      sub_service_id?: number | null,
+      delegation_user_id?: number | null
     ) {
     super();
     this.request_id = request_id;
@@ -68,5 +72,6 @@ export class ItApprovalDetails extends BaseModel {
     this.approved_by = approved_by || null;
     this.service_id = service_id ?? null;
     this.sub_service_id = sub_service_id ?? null;
+    this.delegation_user_id = delegation_user_id || null;
   }
 }

package/src/models/ServiceTypeModel.ts

@@ -2,6 +2,8 @@ import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
 import { CAAServices } from './CAAServices';
 import { CAASubServices } from './CAASubServices';
+import { Departments } from './DepartmentsModel';
+import { Sections } from './SectionModel';
 
 @Entity({ name: 'service_types' })
 export class ServiceType extends BaseModel {
@@ -26,6 +28,20 @@ export class ServiceType extends BaseModel {
     @JoinColumn({ name: 'sub_service_id' })
     sub_service: CAASubServices;
 
+    @Column({ type: 'bigint', nullable: true })
+    department_id: number | null;
+
+    @ManyToOne(() => Departments)
+    @JoinColumn({ name: 'department_id' })
+    department: Departments;
+
+    @Column({ type: 'bigint', nullable: true })
+    section_id: number | null;
+
+    @ManyToOne(() => Sections)
+    @JoinColumn({ name: 'section_id' })
+    section: Sections;
+
     @Column({ nullable: true })
     description: string;
 
@@ -38,7 +54,9 @@ export class ServiceType extends BaseModel {
         service_id: number,
         sub_service_id: number,
         description?: string,
-        is_active?: boolean
+        is_active?: boolean,
+        department_id?: number | null,
+        section_id?: number | null
     ) {
         super();
         this.name = name;
@@ -47,6 +65,8 @@ export class ServiceType extends BaseModel {
         this.sub_service_id = sub_service_id;
         this.description = description || '';
         this.is_active = is_active !== undefined ? is_active : true;
+        this.department_id = department_id || null;
+        this.section_id = section_id || null;
     }
 }
 

package/src/models/WorkflowHierarchy.ts

@@ -39,21 +39,6 @@ export class WorkflowHierarchy extends BaseModel {
     @Column({ type: 'varchar',length: 255, nullable:true })
     task_type: string | null;
 
-    @Column({ type: 'varchar', length: 50, nullable: true })
-    decision_path: string | null; // 'true', 'false', or null for non-decision tasks (legacy support)
-
-    @Column({ type: 'integer', nullable: true })
-    parent_decision_step_order: number | null; // References step_order of the DECISION task (legacy support)
-
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    parent_task: string | null; // Name of the previous task in the flow
-
-    @Column({ type: 'text', nullable: true })
-    condition_expression: string | null; // Logical condition for when this task should execute (e.g., "createdByRole == true")
-
-    @Column({ type: 'boolean', default: false, nullable: false })
-    is_decision_task: boolean; // Whether this task represents a decision node
-
     @ManyToOne(() => WorkflowDefinitions, { onDelete: 'CASCADE' })
     @JoinColumn({ name: 'workflow_definition_id' })
     workflow_definition: WorkflowDefinitions;
@@ -69,12 +54,7 @@ export class WorkflowHierarchy extends BaseModel {
         taskname?: string,
         status?: string,
         task?: any,
-        task_type?: string,
-        decision_path?: string | null,
-        parent_decision_step_order?: number | null,
-        parent_task?: string | null,
-        condition_expression?: string | null,
-        is_decision_task?: boolean
+        task_type?:string
     ) {
         super();
         this.workflow_definition_id = workflow_definition_id;
@@ -88,10 +68,5 @@ export class WorkflowHierarchy extends BaseModel {
         this.status = status || null;
         this.task = task || null;
         this.task_type = task_type || null;
-        this.decision_path = decision_path || null;
-        this.parent_decision_step_order = parent_decision_step_order || null;
-        this.parent_task = parent_task || null;
-        this.condition_expression = condition_expression || null;
-        this.is_decision_task = is_decision_task !== undefined ? is_decision_task : false;
     }
 }