@platform-modules/civil-aviation-authority 2.0.5 → 2.0.7

package/.env

@@ -1,11 +1,11 @@
-DB_HOST=localhost
-DB_PORT=5433
-DB_USER=postgres
-DB_PASS=123
-DB_NAME=CAA
+# DB_HOST=localhost
+# DB_PORT=5433
+# DB_USER=postgres
+# DB_PASS=123
+# DB_NAME=CAA
 
-# DB_HOST=164.52.222.169
-# DB_PORT=5432
-# DB_USER=postgres_admin_user
-# DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
-# DB_NAME=CAA
+DB_HOST=164.52.222.169
+DB_PORT=5432
+DB_USER=postgres_admin_user
+DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+DB_NAME=CAA

package/dist/data-source.js

@@ -34,6 +34,8 @@ const NotificationModel_1 = require("./models/NotificationModel");
 const ITRequestChatModel_1 = require("./models/ITRequestChatModel");
 const ITRequestAttachmentModel_1 = require("./models/ITRequestAttachmentModel");
 const LogisticsModel_1 = require("./models/LogisticsModel");
+const LogisticsForeignVehicleModel_1 = require("./models/LogisticsForeignVehicleModel");
+const LogisticsForeignVehiclePassengerModel_1 = require("./models/LogisticsForeignVehiclePassengerModel");
 const LogisticsApprovalModel_1 = require("./models/LogisticsApprovalModel");
 const LogisticsChatModel_1 = require("./models/LogisticsChatModel");
 const LogisticsAttachmentModel_1 = require("./models/LogisticsAttachmentModel");
@@ -76,6 +78,8 @@ exports.AppDataSource = new typeorm_1.DataSource({
         ITRequestChatModel_1.ITRequestChat,
         ITRequestAttachmentModel_1.ITRequestAttachment,
         LogisticsModel_1.LogisticsRequests,
+        LogisticsForeignVehicleModel_1.LogisticsForeignVehicleRequests,
+        LogisticsForeignVehiclePassengerModel_1.LogisticsForeignVehiclePassengers,
         LogisticsApprovalModel_1.LogisticsApprovalDetails,
         LogisticsChatModel_1.LogisticsRequestChat,
         LogisticsAttachmentModel_1.LogisticsRequestAttachment,

package/dist/index.d.ts

@@ -26,6 +26,8 @@ export * from './models/NotificationModel';
 export * from './models/ITRequestChatModel';
 export * from './models/ITRequestAttachmentModel';
 export * from './models/LogisticsModel';
+export * from './models/LogisticsForeignVehicleModel';
+export * from './models/LogisticsForeignVehiclePassengerModel';
 export * from './models/LogisticsApprovalModel';
 export * from './models/LogisticsChatModel';
 export * from './models/LogisticsAttachmentModel';

package/dist/index.js

@@ -43,6 +43,8 @@ __exportStar(require("./models/NotificationModel"), exports);
 __exportStar(require("./models/ITRequestChatModel"), exports);
 __exportStar(require("./models/ITRequestAttachmentModel"), exports);
 __exportStar(require("./models/LogisticsModel"), exports);
+__exportStar(require("./models/LogisticsForeignVehicleModel"), exports);
+__exportStar(require("./models/LogisticsForeignVehiclePassengerModel"), exports);
 __exportStar(require("./models/LogisticsApprovalModel"), exports);
 __exportStar(require("./models/LogisticsChatModel"), exports);
 __exportStar(require("./models/LogisticsAttachmentModel"), exports);

package/dist/models/LogisticsApprovalModel.d.ts

@@ -6,6 +6,8 @@ export declare enum LogisticsApprovalStatus {
 }
 export declare class LogisticsApprovalDetails extends BaseModel {
     request_id: number;
+    service_id: number | null;
+    sub_service_id: number | null;
     level: number;
     approver_role_id: number;
     department_id: number | null;
@@ -13,5 +15,5 @@ export declare class LogisticsApprovalDetails extends BaseModel {
     approved_by: number | null;
     comment: string;
     approval_status: LogisticsApprovalStatus;
-    constructor(request_id: number, approver_role_id: number, comment: string, approval_status: LogisticsApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approved_by?: number | null);
+    constructor(request_id: number, approver_role_id: number, comment: string, approval_status: LogisticsApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approved_by?: number | null, service_id?: number, sub_service_id?: number);
 }

package/dist/models/LogisticsApprovalModel.js

@@ -19,9 +19,11 @@ var LogisticsApprovalStatus;
     LogisticsApprovalStatus["REJECTED"] = "Rejected";
 })(LogisticsApprovalStatus || (exports.LogisticsApprovalStatus = LogisticsApprovalStatus = {}));
 let LogisticsApprovalDetails = class LogisticsApprovalDetails extends BaseModel_1.BaseModel {
-    constructor(request_id, approver_role_id, comment, approval_status, level, department_id, section_id, approved_by) {
+    constructor(request_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.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;
@@ -36,6 +38,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
 ], LogisticsApprovalDetails.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsApprovalDetails.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsApprovalDetails.prototype, "sub_service_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
@@ -57,7 +67,7 @@ __decorate([
     __metadata("design:type", Object)
 ], LogisticsApprovalDetails.prototype, "approved_by", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true, default: '' }),
     __metadata("design:type", String)
 ], LogisticsApprovalDetails.prototype, "comment", void 0);
 __decorate([
@@ -66,5 +76,5 @@ __decorate([
 ], LogisticsApprovalDetails.prototype, "approval_status", void 0);
 exports.LogisticsApprovalDetails = LogisticsApprovalDetails = __decorate([
     (0, typeorm_1.Entity)({ name: 'logistics_approvals' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object, Number, Number])
 ], LogisticsApprovalDetails);

package/dist/models/LogisticsAttachmentModel.d.ts

@@ -1,9 +1,11 @@
 import { BaseModel } from './BaseModel';
 export declare class LogisticsRequestAttachment extends BaseModel {
     request_id: number;
+    service_id: number | null;
+    sub_service_id: number | null;
     file_url: string;
     file_name: string;
     file_type: string;
     file_size: number | null;
-    constructor(request_id: number, file_url: string, file_name?: string, file_type?: string, file_size?: number);
+    constructor(request_id: number, file_url: string, file_name?: string, file_type?: string, file_size?: number, service_id?: number, sub_service_id?: number);
 }

package/dist/models/LogisticsAttachmentModel.js

@@ -13,9 +13,11 @@ exports.LogisticsRequestAttachment = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let LogisticsRequestAttachment = class LogisticsRequestAttachment extends BaseModel_1.BaseModel {
-    constructor(request_id, file_url, file_name, file_type, file_size) {
+    constructor(request_id, file_url, file_name, file_type, file_size, service_id, sub_service_id) {
         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 || '';
@@ -27,6 +29,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
 ], LogisticsRequestAttachment.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequestAttachment.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequestAttachment.prototype, "sub_service_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: false }),
     __metadata("design:type", String)
@@ -45,5 +55,5 @@ __decorate([
 ], LogisticsRequestAttachment.prototype, "file_size", void 0);
 exports.LogisticsRequestAttachment = LogisticsRequestAttachment = __decorate([
     (0, typeorm_1.Entity)({ name: 'logistics_request_attachments' }),
-    __metadata("design:paramtypes", [Number, String, String, String, Number])
+    __metadata("design:paramtypes", [Number, String, String, String, Number, Number, Number])
 ], LogisticsRequestAttachment);

package/dist/models/LogisticsChatModel.d.ts

@@ -1,7 +1,17 @@
 import { BaseModel } from './BaseModel';
+export declare enum MessageType {
+    TEXT = "text",
+    IMAGE = "image",
+    VIDEO = "video",
+    FILE = "file",
+    LINK = "link"
+}
 export declare class LogisticsRequestChat extends BaseModel {
     request_id: number;
+    service_id: number | null;
+    sub_service_id: number | null;
     user_id: number;
     message: string;
-    constructor(request_id: number, user_id: number, message: string);
+    messageType: MessageType;
+    constructor(request_id: number, user_id: number, message: string, service_id?: number, sub_service_id?: number, messageType?: MessageType);
 }

package/dist/models/LogisticsChatModel.js

@@ -9,15 +9,26 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogisticsRequestChat = void 0;
+exports.LogisticsRequestChat = exports.MessageType = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
+var MessageType;
+(function (MessageType) {
+    MessageType["TEXT"] = "text";
+    MessageType["IMAGE"] = "image";
+    MessageType["VIDEO"] = "video";
+    MessageType["FILE"] = "file";
+    MessageType["LINK"] = "link";
+})(MessageType || (exports.MessageType = MessageType = {}));
 let LogisticsRequestChat = class LogisticsRequestChat extends BaseModel_1.BaseModel {
-    constructor(request_id, user_id, message) {
+    constructor(request_id, user_id, message, service_id, sub_service_id, messageType) {
         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 || MessageType.TEXT;
     }
 };
 exports.LogisticsRequestChat = LogisticsRequestChat;
@@ -25,6 +36,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
 ], LogisticsRequestChat.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequestChat.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequestChat.prototype, "sub_service_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
@@ -33,7 +52,16 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: false }),
     __metadata("design:type", String)
 ], LogisticsRequestChat.prototype, "message", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: 'enum',
+        enum: MessageType,
+        default: MessageType.TEXT,
+        nullable: false
+    }),
+    __metadata("design:type", String)
+], LogisticsRequestChat.prototype, "messageType", void 0);
 exports.LogisticsRequestChat = LogisticsRequestChat = __decorate([
     (0, typeorm_1.Entity)({ name: 'logistics_request_chat' }),
-    __metadata("design:paramtypes", [Number, Number, String])
+    __metadata("design:paramtypes", [Number, Number, String, Number, Number, String])
 ], LogisticsRequestChat);

package/dist/models/LogisticsForeignVehicleModel.d.ts

@@ -0,0 +1,43 @@
+import { BaseModel } from './BaseModel';
+export declare enum Foreign_Purpose_of_Travel {
+    AIRPORT_PICKUP = "Airport Pickup/Drop-off",
+    OFFICIAL_MEETING = "Official Meeting",
+    SITE_VISIT = "Site Visit",
+    CONFERENCE = "Conference/Event",
+    OTHER = "Other"
+}
+export declare enum Foreign_Vehicle_Required_Location {
+    INSIDE = "Inside Muscat",
+    OUTSIDE = "Outside Muscat"
+}
+export declare enum Foreign_Request_Type {
+    NEW_REQUEST = "New Request",
+    EXTENSION = "Extension of Previous Request"
+}
+export declare enum Foreign_Request_Status {
+    PENDING = "Pending",
+    ASSIGNED = "Assigned",
+    IN_PROGRESS = "In Progress",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+export declare class LogisticsForeignVehicleRequests extends BaseModel {
+    req_user_department_id: number | null;
+    req_user_section_id: number | null;
+    service_id: number;
+    sub_service_id: number;
+    user_id: number;
+    number_of_passengers: number;
+    purpose_of_travel: Foreign_Purpose_of_Travel;
+    vehicle_required_location: Foreign_Vehicle_Required_Location;
+    employee_id_passport: string | null;
+    contact_number: string;
+    request_type: Foreign_Request_Type;
+    origin_city: string | null;
+    destination_city: string;
+    arrival_departure_datetime: Date;
+    special_instructions: string | null;
+    status: Foreign_Request_Status;
+    workflow_execution_id: string | null;
+    constructor(req_user_department_id: number | null, req_user_section_id: number | null, service_id: number, sub_service_id: number, user_id: number, number_of_passengers: number, purpose_of_travel: Foreign_Purpose_of_Travel, vehicle_required_location: Foreign_Vehicle_Required_Location, contact_number: string, request_type: Foreign_Request_Type, destination_city: string, arrival_departure_datetime: Date, status: Foreign_Request_Status, employee_id_passport?: string | null, origin_city?: string | null, special_instructions?: string | null, workflow_execution_id?: string | null);
+}

package/dist/models/LogisticsForeignVehicleModel.js

@@ -0,0 +1,155 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LogisticsForeignVehicleRequests = exports.Foreign_Request_Status = exports.Foreign_Request_Type = exports.Foreign_Vehicle_Required_Location = exports.Foreign_Purpose_of_Travel = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var Foreign_Purpose_of_Travel;
+(function (Foreign_Purpose_of_Travel) {
+    Foreign_Purpose_of_Travel["AIRPORT_PICKUP"] = "Airport Pickup/Drop-off";
+    Foreign_Purpose_of_Travel["OFFICIAL_MEETING"] = "Official Meeting";
+    Foreign_Purpose_of_Travel["SITE_VISIT"] = "Site Visit";
+    Foreign_Purpose_of_Travel["CONFERENCE"] = "Conference/Event";
+    Foreign_Purpose_of_Travel["OTHER"] = "Other";
+})(Foreign_Purpose_of_Travel || (exports.Foreign_Purpose_of_Travel = Foreign_Purpose_of_Travel = {}));
+var Foreign_Vehicle_Required_Location;
+(function (Foreign_Vehicle_Required_Location) {
+    Foreign_Vehicle_Required_Location["INSIDE"] = "Inside Muscat";
+    Foreign_Vehicle_Required_Location["OUTSIDE"] = "Outside Muscat";
+})(Foreign_Vehicle_Required_Location || (exports.Foreign_Vehicle_Required_Location = Foreign_Vehicle_Required_Location = {}));
+var Foreign_Request_Type;
+(function (Foreign_Request_Type) {
+    Foreign_Request_Type["NEW_REQUEST"] = "New Request";
+    Foreign_Request_Type["EXTENSION"] = "Extension of Previous Request";
+})(Foreign_Request_Type || (exports.Foreign_Request_Type = Foreign_Request_Type = {}));
+var Foreign_Request_Status;
+(function (Foreign_Request_Status) {
+    Foreign_Request_Status["PENDING"] = "Pending";
+    Foreign_Request_Status["ASSIGNED"] = "Assigned";
+    Foreign_Request_Status["IN_PROGRESS"] = "In Progress";
+    Foreign_Request_Status["APPROVED"] = "Approved";
+    Foreign_Request_Status["REJECTED"] = "Rejected";
+})(Foreign_Request_Status || (exports.Foreign_Request_Status = Foreign_Request_Status = {}));
+let LogisticsForeignVehicleRequests = class LogisticsForeignVehicleRequests extends BaseModel_1.BaseModel {
+    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, number_of_passengers, purpose_of_travel, vehicle_required_location, contact_number, request_type, destination_city, arrival_departure_datetime, status, employee_id_passport, origin_city, special_instructions, workflow_execution_id) {
+        super();
+        this.req_user_department_id = req_user_department_id ?? null;
+        this.req_user_section_id = req_user_section_id ?? null;
+        this.service_id = service_id;
+        this.sub_service_id = sub_service_id;
+        this.user_id = user_id;
+        this.number_of_passengers = number_of_passengers;
+        this.purpose_of_travel = purpose_of_travel;
+        this.vehicle_required_location = vehicle_required_location;
+        this.employee_id_passport = employee_id_passport ?? null;
+        this.contact_number = contact_number;
+        this.request_type = request_type;
+        this.origin_city = origin_city ?? null;
+        this.destination_city = destination_city;
+        this.arrival_departure_datetime = arrival_departure_datetime;
+        this.special_instructions = special_instructions ?? null;
+        this.status = status;
+        this.workflow_execution_id = workflow_execution_id ?? null;
+    }
+};
+exports.LogisticsForeignVehicleRequests = LogisticsForeignVehicleRequests;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "req_user_department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "req_user_section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Number)
+], LogisticsForeignVehicleRequests.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Number)
+], LogisticsForeignVehicleRequests.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", Number)
+], LogisticsForeignVehicleRequests.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LogisticsForeignVehicleRequests.prototype, "number_of_passengers", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: Foreign_Purpose_of_Travel,
+        default: Foreign_Purpose_of_Travel.OTHER,
+        nullable: false,
+    }),
+    __metadata("design:type", String)
+], LogisticsForeignVehicleRequests.prototype, "purpose_of_travel", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: Foreign_Vehicle_Required_Location,
+        default: Foreign_Vehicle_Required_Location.INSIDE,
+        nullable: false,
+    }),
+    __metadata("design:type", String)
+], LogisticsForeignVehicleRequests.prototype, "vehicle_required_location", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "employee_id_passport", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 20, nullable: false }),
+    __metadata("design:type", String)
+], LogisticsForeignVehicleRequests.prototype, "contact_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: Foreign_Request_Type,
+        default: Foreign_Request_Type.NEW_REQUEST,
+        nullable: false,
+    }),
+    __metadata("design:type", String)
+], LogisticsForeignVehicleRequests.prototype, "request_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "origin_city", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], LogisticsForeignVehicleRequests.prototype, "destination_city", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'timestamp', nullable: false }),
+    __metadata("design:type", Date)
+], LogisticsForeignVehicleRequests.prototype, "arrival_departure_datetime", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "special_instructions", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: Foreign_Request_Status,
+        default: Foreign_Request_Status.PENDING,
+        nullable: false,
+    }),
+    __metadata("design:type", String)
+], LogisticsForeignVehicleRequests.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "workflow_execution_id", void 0);
+exports.LogisticsForeignVehicleRequests = LogisticsForeignVehicleRequests = __decorate([
+    (0, typeorm_1.Entity)({ name: 'logistics_foreign_vehicle_requests' }),
+    __metadata("design:paramtypes", [Object, Object, Number, Number, Number, Number, String, String, String, String, String, Date, String, Object, Object, Object, Object])
+], LogisticsForeignVehicleRequests);

package/dist/models/LogisticsForeignVehiclePassengerModel.d.ts

@@ -0,0 +1,6 @@
+import { BaseModel } from './BaseModel';
+export declare class LogisticsForeignVehiclePassengers extends BaseModel {
+    foreign_vehicle_request_id: number;
+    passenger_name: string;
+    constructor(foreign_vehicle_request_id: number, passenger_name: string);
+}

package/dist/models/LogisticsForeignVehiclePassengerModel.js

@@ -0,0 +1,34 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LogisticsForeignVehiclePassengers = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let LogisticsForeignVehiclePassengers = class LogisticsForeignVehiclePassengers extends BaseModel_1.BaseModel {
+    constructor(foreign_vehicle_request_id, passenger_name) {
+        super();
+        this.foreign_vehicle_request_id = foreign_vehicle_request_id;
+        this.passenger_name = passenger_name;
+    }
+};
+exports.LogisticsForeignVehiclePassengers = LogisticsForeignVehiclePassengers;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], LogisticsForeignVehiclePassengers.prototype, "foreign_vehicle_request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], LogisticsForeignVehiclePassengers.prototype, "passenger_name", void 0);
+exports.LogisticsForeignVehiclePassengers = LogisticsForeignVehiclePassengers = __decorate([
+    (0, typeorm_1.Entity)({ name: 'logistics_foreign_vehicle_passengers' }),
+    __metadata("design:paramtypes", [Number, String])
+], LogisticsForeignVehiclePassengers);

package/dist/models/LogisticsWorkflowModel.d.ts

@@ -6,7 +6,9 @@ export declare enum LogisticsWorkFlowStatus {
 }
 export declare class LogisticsWorkFlow extends BaseModel {
     request_id: number;
+    service_id: number | null;
+    sub_service_id: number | null;
     content: string;
     status: LogisticsWorkFlowStatus;
-    constructor(request_id: number, content: string, status: LogisticsWorkFlowStatus);
+    constructor(request_id: number, content: string, status: LogisticsWorkFlowStatus, service_id?: number, sub_service_id?: number);
 }

package/dist/models/LogisticsWorkflowModel.js

@@ -18,22 +18,32 @@ var LogisticsWorkFlowStatus;
     LogisticsWorkFlowStatus["NOT_YET_STARTED"] = "Not Yet Started";
     LogisticsWorkFlowStatus["PENDING"] = "Pending";
 })(LogisticsWorkFlowStatus || (exports.LogisticsWorkFlowStatus = LogisticsWorkFlowStatus = {}));
-//This model is used to store the store the leave apporval matrix(HOD, Manager, HR, Director) based on leave type along with the levels
+//This model is used to store the logistics workflow status and activity logs
 let LogisticsWorkFlow = class LogisticsWorkFlow extends BaseModel_1.BaseModel {
-    constructor(request_id, content, status) {
+    constructor(request_id, content, status, service_id, sub_service_id) {
         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;
     }
 };
 exports.LogisticsWorkFlow = LogisticsWorkFlow;
 __decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
 ], LogisticsWorkFlow.prototype, "request_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsWorkFlow.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsWorkFlow.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: false }),
     __metadata("design:type", String)
 ], LogisticsWorkFlow.prototype, "content", void 0);
 __decorate([
@@ -42,5 +52,5 @@ __decorate([
 ], LogisticsWorkFlow.prototype, "status", void 0);
 exports.LogisticsWorkFlow = LogisticsWorkFlow = __decorate([
     (0, typeorm_1.Entity)({ name: 'logistics_workflows' }),
-    __metadata("design:paramtypes", [Number, String, String])
+    __metadata("design:paramtypes", [Number, String, String, Number, Number])
 ], LogisticsWorkFlow);

package/package.json

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

package/src/data-source.ts

@@ -31,6 +31,8 @@ import { Notification } from './models/NotificationModel';
 import { ITRequestChat } from './models/ITRequestChatModel';
 import { ITRequestAttachment } from './models/ITRequestAttachmentModel';
 import { LogisticsRequests } from './models/LogisticsModel';
+import { LogisticsForeignVehicleRequests } from './models/LogisticsForeignVehicleModel';
+import { LogisticsForeignVehiclePassengers } from './models/LogisticsForeignVehiclePassengerModel';
 import { LogisticsApprovalDetails } from './models/LogisticsApprovalModel';
 import { LogisticsRequestChat } from './models/LogisticsChatModel';
 import { LogisticsRequestAttachment } from './models/LogisticsAttachmentModel';
@@ -76,6 +78,8 @@ export const AppDataSource = new DataSource({
     ITRequestChat,
     ITRequestAttachment,
     LogisticsRequests,
+    LogisticsForeignVehicleRequests,
+    LogisticsForeignVehiclePassengers,
     LogisticsApprovalDetails,
     LogisticsRequestChat,
     LogisticsRequestAttachment,

package/src/index.ts

@@ -27,6 +27,8 @@ export * from './models/NotificationModel';
 export * from './models/ITRequestChatModel';
 export * from './models/ITRequestAttachmentModel';
 export * from './models/LogisticsModel';
+export * from './models/LogisticsForeignVehicleModel';
+export * from './models/LogisticsForeignVehiclePassengerModel';
 export * from './models/LogisticsApprovalModel';
 export * from './models/LogisticsChatModel';
 export * from './models/LogisticsAttachmentModel';

package/src/models/LogisticsApprovalModel.ts

@@ -13,6 +13,12 @@ export class LogisticsApprovalDetails 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;
 
@@ -28,7 +34,7 @@ export class LogisticsApprovalDetails extends BaseModel {
   @Column({ type: 'integer', nullable: true })
   approved_by: number | null;
 
-  @Column({ type: 'varchar', length: 255, nullable: false })
+  @Column({ type: 'varchar', length: 500, nullable: true, default: '' })
   comment: string;
 
   @Column({ type: 'enum', enum: LogisticsApprovalStatus,default: LogisticsApprovalStatus.PENDING, nullable: false })
@@ -42,10 +48,14 @@ export class LogisticsApprovalDetails extends BaseModel {
       level: number,
       department_id?: number | null,
       section_id?: number | null,
-      approved_by?: 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;

package/src/models/LogisticsAttachmentModel.ts

@@ -9,6 +9,12 @@ export class LogisticsRequestAttachment 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;
 
@@ -28,9 +34,13 @@ export class LogisticsRequestAttachment extends BaseModel {
         file_name?: string,
         file_type?: string,
         file_size?: number,
+        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.file_url = file_url;
         this.file_name = file_name || '';
         this.file_type = file_type || '';

package/src/models/LogisticsChatModel.ts

@@ -1,7 +1,13 @@
-import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
-import { ITHelpDeskRequests } from './ITHelpDeskModel';
-import { User } from './user';
+
+export enum MessageType {
+  TEXT = "text",
+  IMAGE = "image",
+  VIDEO = "video",
+  FILE = "file",
+  LINK = "link"
+}
 
 @Entity({ name: 'logistics_request_chat' })
 export class LogisticsRequestChat extends BaseModel {
@@ -9,21 +15,41 @@ export class LogisticsRequestChat 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: MessageType, 
+        default: MessageType.TEXT,
+        nullable: false
+    })
+    messageType: MessageType;
+
     constructor(
         request_id: number,
         user_id: number,
         message: string,
+        service_id?: number,
+        sub_service_id?: number,
+        messageType?: MessageType
     ) {
         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 || MessageType.TEXT;
     }
 }
 

package/src/models/LogisticsForeignVehicleModel.ts

@@ -0,0 +1,143 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum Foreign_Purpose_of_Travel {
+  AIRPORT_PICKUP = "Airport Pickup/Drop-off",
+  OFFICIAL_MEETING = "Official Meeting",
+  SITE_VISIT = "Site Visit",
+  CONFERENCE = "Conference/Event",
+  OTHER = "Other"
+}
+
+export enum Foreign_Vehicle_Required_Location {
+  INSIDE = "Inside Muscat",
+  OUTSIDE = "Outside Muscat"
+}
+
+export enum Foreign_Request_Type {
+  NEW_REQUEST = "New Request",
+  EXTENSION = "Extension of Previous Request"
+}
+
+export enum Foreign_Request_Status {
+  PENDING = "Pending",
+  ASSIGNED = "Assigned",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: 'logistics_foreign_vehicle_requests' })
+export class LogisticsForeignVehicleRequests extends BaseModel {
+
+  @Column({ type: 'int', nullable: true })
+  req_user_department_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  req_user_section_id: number | null;
+
+  @Column({ nullable: true })
+  service_id: number;
+
+  @Column({ nullable: true })
+  sub_service_id: number;
+
+  @Column({ nullable: false })
+  user_id: number;
+
+  @Column({ type: 'int', nullable: false })
+  number_of_passengers: number;
+
+  @Column({
+    type: "enum",
+    enum: Foreign_Purpose_of_Travel,
+    default: Foreign_Purpose_of_Travel.OTHER,
+    nullable: false,
+  })
+  purpose_of_travel: Foreign_Purpose_of_Travel;
+
+  @Column({
+    type: "enum",
+    enum: Foreign_Vehicle_Required_Location,
+    default: Foreign_Vehicle_Required_Location.INSIDE,
+    nullable: false,
+  })
+  vehicle_required_location: Foreign_Vehicle_Required_Location;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  employee_id_passport: string | null;
+
+  @Column({ type: 'varchar', length: 20, nullable: false })
+  contact_number: string;
+
+  @Column({
+    type: "enum",
+    enum: Foreign_Request_Type,
+    default: Foreign_Request_Type.NEW_REQUEST,
+    nullable: false,
+  })
+  request_type: Foreign_Request_Type;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  origin_city: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  destination_city: string;
+
+  @Column({ type: 'timestamp', nullable: false })
+  arrival_departure_datetime: Date;
+
+  @Column({ type: 'text', nullable: true })
+  special_instructions: string | null;
+
+  @Column({
+    type: "enum",
+    enum: Foreign_Request_Status,
+    default: Foreign_Request_Status.PENDING,
+    nullable: false,
+  })
+  status: Foreign_Request_Status;
+
+  @Column({ type: "varchar", nullable: true })
+  workflow_execution_id: string | null;
+
+  constructor(
+    req_user_department_id: number | null,
+    req_user_section_id: number | null,
+    service_id: number,
+    sub_service_id: number,
+    user_id: number,
+    number_of_passengers: number,
+    purpose_of_travel: Foreign_Purpose_of_Travel,
+    vehicle_required_location: Foreign_Vehicle_Required_Location,
+    contact_number: string,
+    request_type: Foreign_Request_Type,
+    destination_city: string,
+    arrival_departure_datetime: Date,
+    status: Foreign_Request_Status,
+    employee_id_passport?: string | null,
+    origin_city?: string | null,
+    special_instructions?: string | null,
+    workflow_execution_id?: string | null,
+  ) {
+    super();
+    this.req_user_department_id = req_user_department_id ?? null;
+    this.req_user_section_id = req_user_section_id ?? null;
+    this.service_id = service_id;
+    this.sub_service_id = sub_service_id;
+    this.user_id = user_id;
+    this.number_of_passengers = number_of_passengers;
+    this.purpose_of_travel = purpose_of_travel;
+    this.vehicle_required_location = vehicle_required_location;
+    this.employee_id_passport = employee_id_passport ?? null;
+    this.contact_number = contact_number;
+    this.request_type = request_type;
+    this.origin_city = origin_city ?? null;
+    this.destination_city = destination_city;
+    this.arrival_departure_datetime = arrival_departure_datetime;
+    this.special_instructions = special_instructions ?? null;
+    this.status = status;
+    this.workflow_execution_id = workflow_execution_id ?? null;
+  }
+}
+

package/src/models/LogisticsForeignVehiclePassengerModel.ts

@@ -0,0 +1,23 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'logistics_foreign_vehicle_passengers' })
+export class LogisticsForeignVehiclePassengers extends BaseModel {
+
+  @Column({ type: 'integer', nullable: false })
+  foreign_vehicle_request_id: number;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  passenger_name: string;
+
+
+  constructor(
+    foreign_vehicle_request_id: number,
+    passenger_name: string,
+  ) {
+    super();
+    this.foreign_vehicle_request_id = foreign_vehicle_request_id;
+    this.passenger_name = passenger_name;
+  }
+}
+

package/src/models/LogisticsWorkflowModel.ts

@@ -7,21 +7,35 @@ export enum LogisticsWorkFlowStatus {
     PENDING = "Pending"
   }
 
-//This model is used to store the store the leave apporval matrix(HOD, Manager, HR, Director) based on leave type along with the levels
+//This model is used to store the logistics workflow status and activity logs
 @Entity({ name: 'logistics_workflows' })
 export class LogisticsWorkFlow extends BaseModel {
-  @Column({ type: 'int', nullable: false })
+  @Column({ type: 'integer', nullable: false })
   request_id: number;
 
-  @Column({ type: 'varchar', length: 255, nullable: false })
+  @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: LogisticsWorkFlowStatus, default: LogisticsWorkFlowStatus.NOT_YET_STARTED, nullable: false })
   status: LogisticsWorkFlowStatus;
 
-  constructor(request_id: number, content: string, status: LogisticsWorkFlowStatus) {
+  constructor(
+    request_id: number, 
+    content: string, 
+    status: LogisticsWorkFlowStatus,
+    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;
   }