@platform-modules/civil-aviation-authority 2.0.58 → 2.0.60

package/dist/data-source.js

@@ -49,11 +49,6 @@ const VpnApprovalModel_1 = require("./models/VpnApprovalModel");
 const VpnWorkflowModel_1 = require("./models/VpnWorkflowModel");
 const VpnRequestAttachmentModel_1 = require("./models/VpnRequestAttachmentModel");
 const VpnRequestChatModel_1 = require("./models/VpnRequestChatModel");
-const HotelreservationModel_1 = require("./models/HotelreservationModel");
-const HotelApprovalModel_1 = require("./models/HotelApprovalModel");
-const HotelWorkFlowModel_1 = require("./models/HotelWorkFlowModel");
-const HotelChatModel_1 = require("./models/HotelChatModel");
-const HotelAttachedModel_1 = require("./models/HotelAttachedModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -106,11 +101,6 @@ exports.AppDataSource = new typeorm_1.DataSource({
         VpnApprovalModel_1.VpnApprovalDetails,
         VpnWorkflowModel_1.VpnWorkFlow,
         VpnRequestAttachmentModel_1.VpnRequestAttachment,
-        VpnRequestChatModel_1.VpnRequestChat,
-        HotelreservationModel_1.HotelReservation,
-        HotelApprovalModel_1.HotelApprovalDetails,
-        HotelWorkFlowModel_1.HotelWorkFlow,
-        HotelChatModel_1.HotelRequestChat,
-        HotelAttachedModel_1.HotelRequestAttachment
+        VpnRequestChatModel_1.VpnRequestChat
     ],
 });

package/dist/index.d.ts

@@ -38,8 +38,3 @@ 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/dist/index.js

@@ -58,8 +58,3 @@ __exportStar(require("./models/VpnApprovalModel"), exports);
 __exportStar(require("./models/VpnWorkflowModel"), exports);
 __exportStar(require("./models/VpnRequestChatModel"), exports);
 __exportStar(require("./models/VpnRequestAttachmentModel"), exports);
-__exportStar(require("./models/HotelreservationModel"), exports);
-__exportStar(require("./models/HotelApprovalModel"), exports);
-__exportStar(require("./models/HotelWorkFlowModel"), exports);
-__exportStar(require("./models/HotelChatModel"), exports);
-__exportStar(require("./models/HotelAttachedModel"), exports);

package/dist/models/ITHelpDeskModel.d.ts

@@ -21,9 +21,11 @@ export declare class ITHelpDeskRequests extends BaseModel {
     description: string;
     extn_num: string;
     contact_num: string;
+    person_name: string | null;
+    person_contact_number: string | null;
     request_date: Date;
     user_id: number;
     status: status;
     workflow_execution_id: string | null;
-    constructor(service_id: number, sub_service_id: number, problem: string, request_for: ContactFor, description: string, extn_num: string, contact_num: string, request_date: Date, status: status, workflow_execution_id?: string, req_user_department_id?: number | null, req_user_section_id?: number | null, service_type_id?: number | null);
+    constructor(service_id: number, sub_service_id: number, problem: string, request_for: ContactFor, description: string, extn_num: string, contact_num: string, request_date: Date, status: status, 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);
 }

package/dist/models/ITHelpDeskModel.js

@@ -26,7 +26,7 @@ var status;
     status["REJECTED"] = "Rejected";
 })(status || (exports.status = status = {}));
 let ITHelpDeskRequests = class ITHelpDeskRequests extends BaseModel_1.BaseModel {
-    constructor(service_id, sub_service_id, problem, request_for, description, extn_num, contact_num, request_date, status, workflow_execution_id, req_user_department_id, req_user_section_id, service_type_id) {
+    constructor(service_id, sub_service_id, problem, request_for, description, extn_num, contact_num, request_date, status, workflow_execution_id, req_user_department_id, req_user_section_id, service_type_id, person_name, person_contact_number) {
         super();
         this.service_id = service_id;
         this.sub_service_id = sub_service_id;
@@ -35,6 +35,8 @@ let ITHelpDeskRequests = class ITHelpDeskRequests extends BaseModel_1.BaseModel
         this.description = description;
         this.extn_num = extn_num;
         this.contact_num = contact_num;
+        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;
@@ -89,6 +91,14 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: false }),
     __metadata("design:type", String)
 ], ITHelpDeskRequests.prototype, "contact_num", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], ITHelpDeskRequests.prototype, "person_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 20, nullable: true }),
+    __metadata("design:type", Object)
+], ITHelpDeskRequests.prototype, "person_contact_number", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "date", nullable: false }),
     __metadata("design:type", Date)
@@ -112,5 +122,5 @@ __decorate([
 ], ITHelpDeskRequests.prototype, "workflow_execution_id", void 0);
 exports.ITHelpDeskRequests = ITHelpDeskRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'it_help_desk_requests' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, Date, String, String, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, Date, String, String, Object, Object, Object, Object, Object])
 ], ITHelpDeskRequests);

package/dist/models/ITRequestAttachmentModel.d.ts

@@ -4,6 +4,8 @@ import { User } from './user';
 export declare class ITRequestAttachment extends BaseModel {
     request_id: number;
     request: ITHelpDeskRequests;
+    service_id: number | null;
+    sub_service_id: number | null;
     uploaded_by: number;
     user: User;
     file_url: string;
@@ -11,5 +13,5 @@ export declare class ITRequestAttachment extends BaseModel {
     file_type: string;
     file_size: number | null;
     description: string;
-    constructor(request_id: number, uploaded_by: number, file_url: string, file_name?: string, file_type?: string, file_size?: number, description?: string);
+    constructor(request_id: number, uploaded_by: number, file_url: string, file_name?: string, file_type?: string, file_size?: number, description?: string, service_id?: number | null, sub_service_id?: number | null);
 }

package/dist/models/ITRequestAttachmentModel.js

@@ -15,7 +15,7 @@ const BaseModel_1 = require("./BaseModel");
 const ITHelpDeskModel_1 = require("./ITHelpDeskModel");
 const user_1 = require("./user");
 let ITRequestAttachment = class ITRequestAttachment extends BaseModel_1.BaseModel {
-    constructor(request_id, uploaded_by, file_url, file_name, file_type, file_size, description) {
+    constructor(request_id, uploaded_by, file_url, file_name, file_type, file_size, description, service_id, sub_service_id) {
         super();
         this.request_id = request_id;
         this.uploaded_by = uploaded_by;
@@ -24,6 +24,8 @@ let ITRequestAttachment = class ITRequestAttachment extends BaseModel_1.BaseMode
         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;
     }
 };
 exports.ITRequestAttachment = ITRequestAttachment;
@@ -36,6 +38,14 @@ __decorate([
     (0, typeorm_1.JoinColumn)({ name: 'request_id' }),
     __metadata("design:type", ITHelpDeskModel_1.ITHelpDeskRequests)
 ], ITRequestAttachment.prototype, "request", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ITRequestAttachment.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ITRequestAttachment.prototype, "sub_service_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
@@ -67,5 +77,5 @@ __decorate([
 ], ITRequestAttachment.prototype, "description", void 0);
 exports.ITRequestAttachment = ITRequestAttachment = __decorate([
     (0, typeorm_1.Entity)({ name: 'it_request_attachments' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, String, Number, String])
+    __metadata("design:paramtypes", [Number, Number, String, String, String, Number, String, Object, Object])
 ], ITRequestAttachment);

package/dist/models/ItApprovalsModel.d.ts

@@ -6,6 +6,8 @@ export declare enum ApprovalStatus {
 }
 export declare class ItApprovalDetails extends BaseModel {
     request_id: number;
+    service_id: number | null;
+    sub_service_id: number | null;
     level: number;
     approver_user_id: number | null;
     approver_role_id: number | null;
@@ -14,5 +16,5 @@ export declare class ItApprovalDetails extends BaseModel {
     approved_by: number | null;
     comment: string;
     approval_status: ApprovalStatus;
-    constructor(request_id: number, approver_user_id: number | null, approver_role_id: number | null, comment: string, approval_status: ApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approved_by?: number | null);
+    constructor(request_id: number, approver_user_id: number | null, approver_role_id: number | null, comment: string, approval_status: ApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approved_by?: number | null, service_id?: number | null, sub_service_id?: number | null);
 }

package/dist/models/ItApprovalsModel.js

@@ -19,7 +19,7 @@ var ApprovalStatus;
     ApprovalStatus["REJECTED"] = "Rejected";
 })(ApprovalStatus || (exports.ApprovalStatus = ApprovalStatus = {}));
 let ItApprovalDetails = class ItApprovalDetails extends BaseModel_1.BaseModel {
-    constructor(request_id, approver_user_id, approver_role_id, comment, approval_status, level, department_id, section_id, approved_by) {
+    constructor(request_id, approver_user_id, approver_role_id, comment, approval_status, level, department_id, section_id, approved_by, service_id, sub_service_id) {
         super();
         this.request_id = request_id;
         this.approver_user_id = approver_user_id;
@@ -30,6 +30,8 @@ let ItApprovalDetails = class ItApprovalDetails extends BaseModel_1.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;
     }
 };
 exports.ItApprovalDetails = ItApprovalDetails;
@@ -37,6 +39,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
 ], ItApprovalDetails.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ItApprovalDetails.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ItApprovalDetails.prototype, "sub_service_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
@@ -71,5 +81,5 @@ __decorate([
 ], ItApprovalDetails.prototype, "approval_status", void 0);
 exports.ItApprovalDetails = ItApprovalDetails = __decorate([
     (0, typeorm_1.Entity)({ name: 'it_approvals' }),
-    __metadata("design:paramtypes", [Number, Object, Object, String, String, Number, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, Object, Object, String, String, Number, Object, Object, Object, Object, Object])
 ], ItApprovalDetails);

package/dist/models/ItWorkflowModel.d.ts

@@ -6,8 +6,10 @@ export declare enum workFlowStatus {
 }
 export declare class ItWorkFlow extends BaseModel {
     request_id: number;
+    service_id: number | null;
+    sub_service_id: number | null;
     order: number | null;
     content: string;
     status: workFlowStatus;
-    constructor(request_id: number, content: string, status: workFlowStatus, order?: number);
+    constructor(request_id: number, content: string, status: workFlowStatus, order?: number, service_id?: number | null, sub_service_id?: number | null);
 }

package/dist/models/ItWorkflowModel.js

@@ -20,12 +20,14 @@ var workFlowStatus;
 })(workFlowStatus || (exports.workFlowStatus = workFlowStatus = {}));
 //This model is used to store the store the leave apporval matrix(HOD, Manager, HR, Director) based on leave type along with the levels
 let ItWorkFlow = class ItWorkFlow extends BaseModel_1.BaseModel {
-    constructor(request_id, content, status, order) {
+    constructor(request_id, content, status, order, service_id, sub_service_id) {
         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;
     }
 };
 exports.ItWorkFlow = ItWorkFlow;
@@ -33,6 +35,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: false }),
     __metadata("design:type", Number)
 ], ItWorkFlow.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], ItWorkFlow.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], ItWorkFlow.prototype, "sub_service_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Object)
@@ -47,5 +57,5 @@ __decorate([
 ], ItWorkFlow.prototype, "status", void 0);
 exports.ItWorkFlow = ItWorkFlow = __decorate([
     (0, typeorm_1.Entity)({ name: 'it_work_flows' }),
-    __metadata("design:paramtypes", [Number, String, String, Number])
+    __metadata("design:paramtypes", [Number, String, String, Number, Object, Object])
 ], ItWorkFlow);

package/dist/models/VpnApprovalModel.d.ts

@@ -15,5 +15,6 @@ export declare class VpnApprovalDetails extends BaseModel {
     approved_by: number | null;
     comment: string;
     approval_status: VpnApprovalStatus;
-    constructor(request_id: number, approver_user_id: number | null, approver_role_id: number | null, comment: string, approval_status: VpnApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approved_by?: number | null);
+    is_manager: boolean;
+    constructor(request_id: number, approver_user_id: number | null, approver_role_id: number | null, comment: string, approval_status: VpnApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approved_by?: number | null, is_manager?: boolean);
 }

package/dist/models/VpnApprovalModel.js

@@ -20,7 +20,7 @@ var VpnApprovalStatus;
     VpnApprovalStatus["REJECTED"] = "Rejected";
 })(VpnApprovalStatus || (exports.VpnApprovalStatus = VpnApprovalStatus = {}));
 let VpnApprovalDetails = class VpnApprovalDetails extends BaseModel_1.BaseModel {
-    constructor(request_id, approver_user_id, approver_role_id, comment, approval_status, level, department_id, section_id, approved_by) {
+    constructor(request_id, approver_user_id, approver_role_id, comment, approval_status, level, department_id, section_id, approved_by, is_manager) {
         super();
         this.request_id = request_id;
         this.approver_user_id = approver_user_id;
@@ -31,6 +31,7 @@ let VpnApprovalDetails = class VpnApprovalDetails extends BaseModel_1.BaseModel
         this.department_id = department_id || null;
         this.section_id = section_id || null;
         this.approved_by = approved_by || null;
+        this.is_manager = is_manager ?? false;
     }
 };
 exports.VpnApprovalDetails = VpnApprovalDetails;
@@ -75,7 +76,11 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], VpnApprovalDetails.prototype, "approval_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "boolean", default: false, nullable: false }),
+    __metadata("design:type", Boolean)
+], VpnApprovalDetails.prototype, "is_manager", void 0);
 exports.VpnApprovalDetails = VpnApprovalDetails = __decorate([
     (0, typeorm_1.Entity)({ name: "vpn_approvals" }),
-    __metadata("design:paramtypes", [Number, Object, Object, String, String, Number, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, Object, Object, String, String, Number, Object, Object, Object, Boolean])
 ], VpnApprovalDetails);

package/dist/models/WorkflowTask.d.ts

@@ -4,7 +4,10 @@ import { CategoryType } from "./WorkflowTaskNames";
 export declare class WorkflowTask extends BaseModel {
     task_id: number;
     name: string;
+    service_id?: number | null;
+    sub_service_id?: number | null;
+    service_type?: string | null;
     task_type: TaskType;
     category: CategoryType;
-    constructor(name: string, task_id?: number, task_type?: TaskType, category?: CategoryType);
+    constructor(name: string, task_id?: number, task_type?: TaskType, category?: CategoryType, service_id?: number | null, sub_service_id?: number | null, service_type?: string | null);
 }

package/dist/models/WorkflowTask.js

@@ -24,12 +24,15 @@ const WorkflowTaskNames_2 = require("./WorkflowTaskNames");
 //     NOTIFICATION = 'NOTIFICATION'
 // }
 let WorkflowTask = class WorkflowTask extends BaseModel_1.BaseModel {
-    constructor(name, task_id, task_type, category) {
+    constructor(name, task_id, task_type, category, service_id, sub_service_id, service_type) {
         super();
         this.name = name;
         this.task_id = task_id || 0;
         this.task_type = task_type || WorkflowTaskNames_1.TaskType.SIMPLE;
         this.category = category || WorkflowTaskNames_2.CategoryType.CREATE;
+        this.service_id = service_id ?? null;
+        this.sub_service_id = sub_service_id ?? null;
+        this.service_type = service_type ?? null;
     }
 };
 exports.WorkflowTask = WorkflowTask;
@@ -41,6 +44,18 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
     __metadata("design:type", String)
 ], WorkflowTask.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], WorkflowTask.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], WorkflowTask.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], WorkflowTask.prototype, "service_type", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: 'enum',
@@ -59,5 +74,5 @@ __decorate([
 ], WorkflowTask.prototype, "category", void 0);
 exports.WorkflowTask = WorkflowTask = __decorate([
     (0, typeorm_1.Entity)({ name: 'workflow_tasks' }),
-    __metadata("design:paramtypes", [String, Number, String, String])
+    __metadata("design:paramtypes", [String, Number, String, String, Object, Object, Object])
 ], WorkflowTask);

package/dist/models/user.d.ts

@@ -42,6 +42,5 @@ export declare class User extends BaseModel {
     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);
+    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);
 }

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, religion) {
+    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) {
         super();
         this.employee_id = employee_id;
         this.civil_employee_id = civil_employee_id;
@@ -56,7 +56,6 @@ 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;
@@ -228,11 +227,7 @@ __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, 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])
 ], User);

package/package.json

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

package/src/data-source.ts

@@ -47,11 +47,6 @@ 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',
@@ -105,11 +100,6 @@ export const AppDataSource = new DataSource({
     VpnApprovalDetails,
     VpnWorkFlow,
     VpnRequestAttachment,
-    VpnRequestChat,
-    HotelReservation,
-    HotelApprovalDetails,
-    HotelWorkFlow,
-    HotelRequestChat,
-    HotelRequestAttachment
+    VpnRequestChat
   ],
 });

package/src/index.ts

@@ -42,8 +42,3 @@ 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/ITHelpDeskModel.ts

@@ -50,6 +50,12 @@ export class ITHelpDeskRequests extends BaseModel {
     @Column({ nullable: false })
     contact_num: 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;
 
@@ -81,7 +87,9 @@ 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
+        service_type_id?: number | null,
+        person_name?: string | null,
+        person_contact_number?: string | null
     ) {
         super();     
         this.service_id = service_id;
@@ -91,6 +99,8 @@ export class ITHelpDeskRequests extends BaseModel {
         this.description = description;
         this.extn_num = extn_num;
         this.contact_num = contact_num;
+        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,6 +13,12 @@ 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;
 
@@ -42,7 +48,9 @@ export class ITRequestAttachment extends BaseModel {
         file_name?: string,
         file_type?: string,
         file_size?: number,
-        description?: string
+        description?: string,
+        service_id?: number | null,
+        sub_service_id?: number | null
     ) {
         super();
         this.request_id = request_id;
@@ -52,6 +60,8 @@ 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,6 +13,12 @@ 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;
 
@@ -46,7 +52,9 @@ export class ItApprovalDetails extends BaseModel {
       level: number,
       department_id?: number | null,
       section_id?: number | null,
-      approved_by?: number | null
+      approved_by?: number | null,
+      service_id?: number | null,
+      sub_service_id?: number | null
     ) {
     super();
     this.request_id = request_id;
@@ -58,5 +66,7 @@ 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,6 +13,12 @@ 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;
 
@@ -22,11 +28,13 @@ 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) {
+  constructor(request_id: number, content: string, status: workFlowStatus, order?: number, service_id?: number | null, sub_service_id?: number | null) {
     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;
   }
 }

package/src/models/VpnApprovalModel.ts

@@ -42,6 +42,9 @@ export class VpnApprovalDetails extends BaseModel {
   })
   approval_status: VpnApprovalStatus;
 
+  @Column({ type: "boolean", default: false, nullable: false })
+  is_manager: boolean;
+
   constructor(
     request_id: number,
     approver_user_id: number | null,
@@ -51,7 +54,8 @@ export class VpnApprovalDetails extends BaseModel {
     level: number,
     department_id?: number | null,
     section_id?: number | null,
-    approved_by?: number | null
+    approved_by?: number | null,
+    is_manager?: boolean
   ) {
     super();
     this.request_id = request_id;
@@ -63,6 +67,7 @@ export class VpnApprovalDetails extends BaseModel {
     this.department_id = department_id || null;
     this.section_id = section_id || null;
     this.approved_by = approved_by || null;
+    this.is_manager = is_manager ?? false;
   }
 }
 

package/src/models/WorkflowTask.ts

@@ -24,6 +24,15 @@ export class WorkflowTask extends BaseModel {
     @Column({ type: 'varchar', length: 100, nullable: false })
     name: string;
 
+    @Column({ type: 'int', nullable: true })
+    service_id?: number | null;
+
+    @Column({ type: 'int', nullable: true })
+    sub_service_id?: number | null;
+
+    @Column({ type: 'varchar', length: 50, nullable: true })
+    service_type?: string | null;
+
     @Column({
         type: 'enum',
         enum: TaskType,
@@ -42,12 +51,18 @@ export class WorkflowTask extends BaseModel {
         name: string,
         task_id?: number,
         task_type?: TaskType,
-        category?: CategoryType
+        category?: CategoryType,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        service_type?: string | null
     ) {
         super();
         this.name = name;
         this.task_id = task_id || 0;
         this.task_type = task_type || TaskType.SIMPLE;
         this.category = category || CategoryType.CREATE;
+        this.service_id = service_id ?? null;
+        this.sub_service_id = sub_service_id ?? null;
+        this.service_type = service_type ?? null;
     }
 }