@platform-modules/civil-aviation-authority 2.0.80 → 2.0.82

package/dist/models/Workflows.js

@@ -0,0 +1,31 @@
+"use strict";
+// import { Column, Entity, Unique } from "typeorm";
+// import { BaseModel } from './BaseModel';
+// @Entity({ name: 'workflows' })
+// @Unique(['service_id', 'sub_service_id', 'request_for'])
+// export class Workflows extends BaseModel {
+//     @Column({ type: 'varchar', length: 100, nullable: false })
+//     name: string;
+//     @Column({ type: 'bigint', nullable: false })
+//     service_id: number;
+//     @Column({ type: 'bigint', nullable: false })
+//     sub_service_id: number;
+//     @Column({ type: 'varchar', length: 20, nullable: false })
+//     request_for: string; // 'Self' | 'Behalf of' | 'Internal'
+//     @Column({ type: 'int', nullable: false })
+//     levels: number;
+//     constructor(
+//         name: string,
+//         service_id: number,
+//         sub_service_id: number,
+//         request_for: string,
+//         levels: number,
+//     ) {
+//         super();
+//         this.name = name;
+//         this.service_id = service_id;
+//         this.sub_service_id = sub_service_id;
+//         this.request_for = request_for;
+//         this.levels = levels;
+//     }
+// }

package/dist/models/user.d.ts

@@ -42,5 +42,6 @@ export declare class User extends BaseModel {
     children1_name?: string;
     children2_name?: string;
     address?: string;
-    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?: number, manpower_id?: number, 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;
+    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?: number, manpower_id?: number, 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);
 }

package/dist/models/user.js

@@ -13,7 +13,7 @@ exports.User = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let User = class User extends BaseModel_1.BaseModel {
-    constructor(employee_id, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name, passport_number, personal_email, extension_number, fax_number, diplomatic_name, avatar, father_name, spouse_name, children1_name, children2_name, address) {
+    constructor(employee_id, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name, passport_number, personal_email, extension_number, fax_number, diplomatic_name, avatar, father_name, spouse_name, children1_name, children2_name, address, religion) {
         super();
         this.employee_id = employee_id;
         this.civil_employee_id = civil_employee_id;
@@ -56,6 +56,7 @@ let User = class User extends BaseModel_1.BaseModel {
         this.children1_name = children1_name;
         this.children2_name = children2_name;
         this.address = address;
+        this.religion = religion;
     }
 };
 exports.User = User;
@@ -227,7 +228,11 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "address", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "religion", void 0);
 exports.User = User = __decorate([
     (0, typeorm_1.Entity)({ name: 'users' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, Number, String, String, Number, Number, String, Number, String, Number, String, String, String, Number, String, String, String, String, String, String, String, String])
+    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, Number, String, String, Number, Number, String, Number, String, Number, String, String, String, Number, String, String, String, String, String, String, String, String, String])
 ], User);

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.0.80",
+  "version": "2.0.82",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/data-source.ts

@@ -47,6 +47,11 @@ import { VpnWorkFlow } from './models/VpnWorkflowModel';
 import { VpnRequestAttachment } from './models/VpnRequestAttachmentModel';
 import { VpnRequestChat } from './models/VpnRequestChatModel';
 
+import { HotelReservation } from './models/HotelreservationModel'
+import { HotelApprovalDetails } from './models/HotelApprovalModel';
+import { HotelWorkFlow } from './models/HotelWorkFlowModel';
+import { HotelRequestChat } from './models/HotelChatModel';
+import { HotelRequestAttachment } from './models/HotelAttachedModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -100,6 +105,11 @@ export const AppDataSource = new DataSource({
     VpnApprovalDetails,
     VpnWorkFlow,
     VpnRequestAttachment,
-    VpnRequestChat
+    VpnRequestChat,
+    HotelReservation,
+    HotelApprovalDetails,
+    HotelWorkFlow,
+    HotelRequestChat,
+    HotelRequestAttachment
   ],
 });

package/src/index.ts

@@ -42,3 +42,8 @@ export * from './models/VpnApprovalModel';
 export * from './models/VpnWorkflowModel';
 export * from './models/VpnRequestChatModel';
 export * from './models/VpnRequestAttachmentModel';
+export * from './models/HotelreservationModel';
+export * from './models/HotelApprovalModel';
+export * from './models/HotelWorkFlowModel';
+export * from './models/HotelChatModel';
+export * from './models/HotelAttachedModel';

package/src/models/HotelApprovalModel.ts

@@ -0,0 +1,79 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+export enum HotelApprovalStatus {
+  PENDING = "Pending",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: 'hotelapprovals' })
+
+export  class HotelApprovalDetails 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 })
+  level: number;
+
+  @Column({ type: 'integer', nullable: false })
+  approver_role_id: number;
+
+  @Column({ type: 'integer', nullable: true })
+  department_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  section_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  approver_user_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  delegate_user_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  approved_by: number | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true, default: '' })
+  comment: string;
+
+  @Column({ type: 'enum', enum: HotelApprovalStatus,default: HotelApprovalStatus.PENDING, nullable: false })
+  approval_status: HotelApprovalStatus;
+
+    constructor(
+      request_id: number, 
+      approver_role_id: number, 
+      comment: string, 
+      approval_status: HotelApprovalStatus, 
+      level: number,
+      department_id?: number | null,
+      section_id?: number | null,
+      approver_user_id?: number | null,
+      delegate_user_id?: number | null,
+      approved_by?: number | null,
+      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.approver_role_id = approver_role_id;
+    this.comment = comment;
+    this.approval_status = approval_status;
+    this.level = level;
+    this.department_id = department_id || null;
+    this.section_id = section_id || null;
+    this.approver_user_id = approver_user_id || null;
+    this.delegate_user_id = delegate_user_id || null;
+    this.approved_by = approved_by || null;
+  }
+}

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,161 @@
+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: '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: false })
+    visitor_name: string;
+
+    @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,
+        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;
+    }
+}

package/src/models/ITHelpDeskModel.ts

@@ -50,18 +50,6 @@ export class ITHelpDeskRequests extends BaseModel {
     @Column({ nullable: false })
     contact_num: string;
 
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    email: string | null;
-
-    @Column({ type: 'varchar', length: 30, nullable: true })
-    request_type: string;
-
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    person_name: string | null;
-
-    @Column({ type: 'varchar', length: 20, nullable: true })
-    person_contact_number: string | null;
-
     @Column({ type: "date", nullable: false })
     request_date: Date;
 
@@ -93,11 +81,7 @@ export class ITHelpDeskRequests extends BaseModel {
         workflow_execution_id?: string,
         req_user_department_id?: number | null,
         req_user_section_id?: number | null,
-        service_type_id?: number | null,
-        person_name?: string | null,
-        person_contact_number?: string | null,
-        email?: string | null,
-        request_type?: string
+        service_type_id?: number | null
     ) {
         super();     
         this.service_id = service_id;
@@ -107,10 +91,6 @@ export class ITHelpDeskRequests extends BaseModel {
         this.description = description;
         this.extn_num = extn_num;
         this.contact_num = contact_num;
-        this.email = email || null;
-        this.request_type = request_type || 'internal';
-        this.person_name = person_name || null;
-        this.person_contact_number = person_contact_number || null;
         this.request_date = request_date;
         this.status = status;
         this.workflow_execution_id = workflow_execution_id || null;

package/src/models/ITRequestAttachmentModel.ts

@@ -13,12 +13,6 @@ export class ITRequestAttachment extends BaseModel {
     @JoinColumn({ name: 'request_id' })
     request: ITHelpDeskRequests;
 
-    @Column({ type: 'integer', nullable: true })
-    service_id: number | null;
-
-    @Column({ type: 'integer', nullable: true })
-    sub_service_id: number | null;
-
     @Column({ type: 'integer', nullable: false })
     uploaded_by: number;
 
@@ -48,9 +42,7 @@ export class ITRequestAttachment extends BaseModel {
         file_name?: string,
         file_type?: string,
         file_size?: number,
-        description?: string,
-        service_id?: number | null,
-        sub_service_id?: number | null
+        description?: string
     ) {
         super();
         this.request_id = request_id;
@@ -60,8 +52,6 @@ export class ITRequestAttachment extends BaseModel {
         this.file_type = file_type || '';
         this.file_size = file_size || null;
         this.description = description || '';
-        this.service_id = service_id ?? null;
-        this.sub_service_id = sub_service_id ?? null;
     }
 }
 

package/src/models/ItApprovalsModel.ts

@@ -13,12 +13,6 @@ export class ItApprovalDetails 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 })
   level: number;
 
@@ -52,9 +46,7 @@ export class ItApprovalDetails extends BaseModel {
       level: number,
       department_id?: number | null,
       section_id?: number | null,
-      approved_by?: number | null,
-      service_id?: number | null,
-      sub_service_id?: number | null
+      approved_by?: number | null
     ) {
     super();
     this.request_id = request_id;
@@ -66,7 +58,5 @@ export class ItApprovalDetails extends BaseModel {
     this.department_id = department_id || null;
     this.section_id = section_id || null;
     this.approved_by = approved_by || null;
-    this.service_id = service_id ?? null;
-    this.sub_service_id = sub_service_id ?? null;
   }
 }

package/src/models/ItWorkflowModel.ts

@@ -13,12 +13,6 @@ export class ItWorkFlow extends BaseModel {
   @Column({ type: 'int', nullable: false })
   request_id: number;
 
-  @Column({ type: 'int', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  sub_service_id: number | null;
-
   @Column({ type: 'int', nullable: true })
   order: number | null;
 
@@ -28,13 +22,11 @@ export class ItWorkFlow extends BaseModel {
   @Column({ type: 'enum', enum: workFlowStatus, default: workFlowStatus.NOT_YET_STARTED, nullable: false })
   status: workFlowStatus;
 
-  constructor(request_id: number, content: string, status: workFlowStatus, order?: number, service_id?: number | null, sub_service_id?: number | null) {
+  constructor(request_id: number, content: string, status: workFlowStatus, order?: number) {
     super();
     this.request_id = request_id;
     this.content = content;
     this.status = status;
     this.order = order || null;
-    this.service_id = service_id ?? null;
-    this.sub_service_id = sub_service_id ?? null;
   }
 }