@platform-modules/civil-aviation-authority 2.2.209 → 2.2.210

package/.env

@@ -1,17 +1,5 @@
-# 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=216.48.187.46
-# DB_PORT=5432
-# DB_USER=adminuser
-# DB_PASS=postgres_caa_fm_qa_34567
-# DB_NAME=CAA_QA
+DB_HOST=localhost
+DB_PORT=5433
+DB_USER=postgres
+DB_PASS=123
+DB_NAME=CAA

package/dist/models/AirportEntryPermitModel.d.ts

@@ -74,5 +74,6 @@ export declare class AirportEntryPermit extends BaseModel {
     consent_do_not_approve_to_issue_permit: boolean;
     consent_justification: string | null;
     requested_by: string;
-    constructor(name_full_family_name: string, nationality: string, dob: Date, place: string, passport_id_card_no: string, category_of_permit: AirportEntryPermitCategory, date_of_submission: Date, phone_number: string, location: AirportEntryPermitLocation, type_of_permit: AirportEntryPermitType, permission_to_required_areas: AirportEntryPermitArea[], details: string, occupation_staff: string, requested_by: string, user_id: number, status?: AirportEntryPermitStatus, 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, temporary_start_time?: Date | null, temporary_duration?: string | null, for_visitor?: VisitorOption[] | null, acknowledge_security_policies?: boolean, acknowledge_disciplinary_action?: boolean, consent_approve_to_issue_permit?: boolean, consent_do_not_approve_to_issue_permit?: boolean, consent_justification?: string | null, request_id?: string | null);
+    expiration_date: Date | null;
+    constructor(name_full_family_name: string, nationality: string, dob: Date, place: string, passport_id_card_no: string, category_of_permit: AirportEntryPermitCategory, date_of_submission: Date, phone_number: string, location: AirportEntryPermitLocation, type_of_permit: AirportEntryPermitType, permission_to_required_areas: AirportEntryPermitArea[], details: string, occupation_staff: string, requested_by: string, user_id: number, status?: AirportEntryPermitStatus, 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, temporary_start_time?: Date | null, temporary_duration?: string | null, for_visitor?: VisitorOption[] | null, acknowledge_security_policies?: boolean, acknowledge_disciplinary_action?: boolean, consent_approve_to_issue_permit?: boolean, consent_do_not_approve_to_issue_permit?: boolean, consent_justification?: string | null, request_id?: string | null, expiration_date?: Date | null);
 }

package/dist/models/AirportEntryPermitModel.js

@@ -61,7 +61,7 @@ var VisitorOption;
     VisitorOption["DATE_EXPIRY_VISA"] = "Date Expiry Visa";
 })(VisitorOption || (exports.VisitorOption = VisitorOption = {}));
 let AirportEntryPermit = class AirportEntryPermit extends BaseModel_1.BaseModel {
-    constructor(name_full_family_name, nationality, dob, place, passport_id_card_no, category_of_permit, date_of_submission, phone_number, location, type_of_permit, permission_to_required_areas, details, occupation_staff, requested_by, user_id, status = AirportEntryPermitStatus.PENDING, service_id, sub_service_id, service_type, workflow_execution_id, req_user_department_id, req_user_section_id, attachment_url, temporary_start_time, temporary_duration, for_visitor, acknowledge_security_policies = false, acknowledge_disciplinary_action = false, consent_approve_to_issue_permit = false, consent_do_not_approve_to_issue_permit = false, consent_justification, request_id) {
+    constructor(name_full_family_name, nationality, dob, place, passport_id_card_no, category_of_permit, date_of_submission, phone_number, location, type_of_permit, permission_to_required_areas, details, occupation_staff, requested_by, user_id, status = AirportEntryPermitStatus.PENDING, service_id, sub_service_id, service_type, workflow_execution_id, req_user_department_id, req_user_section_id, attachment_url, temporary_start_time, temporary_duration, for_visitor, acknowledge_security_policies = false, acknowledge_disciplinary_action = false, consent_approve_to_issue_permit = false, consent_do_not_approve_to_issue_permit = false, consent_justification, request_id, expiration_date) {
         super();
         this.name_full_family_name = name_full_family_name;
         this.nationality = nationality;
@@ -95,6 +95,7 @@ let AirportEntryPermit = class AirportEntryPermit extends BaseModel_1.BaseModel
         this.consent_do_not_approve_to_issue_permit = consent_do_not_approve_to_issue_permit;
         this.consent_justification = consent_justification ?? null;
         this.request_id = request_id ?? null;
+        this.expiration_date = expiration_date ?? null;
     }
 };
 exports.AirportEntryPermit = AirportEntryPermit;
@@ -243,7 +244,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
     __metadata("design:type", String)
 ], AirportEntryPermit.prototype, "requested_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], AirportEntryPermit.prototype, "expiration_date", void 0);
 exports.AirportEntryPermit = AirportEntryPermit = __decorate([
     (0, typeorm_1.Entity)({ name: 'airport_entry_permits' }),
-    __metadata("design:paramtypes", [String, String, Date, String, String, String, Date, String, String, String, Array, String, String, String, Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Boolean, Boolean, Boolean, Boolean, Object, Object])
+    __metadata("design:paramtypes", [String, String, Date, String, String, String, Date, String, String, String, Array, String, String, String, Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Boolean, Boolean, Boolean, Boolean, Object, Object, Object])
 ], AirportEntryPermit);

package/dist/models/HotelreservationModal.d.ts

@@ -0,0 +1,30 @@
+import { BaseModel } from './BaseModel';
+export declare enum MealType {
+    BREAKFAST = "Breakfast",
+    LUNCH = "Lunch",
+    DINNER = "Dinner"
+}
+export declare enum ServiceTypes {
+    LAUNDRY = "Laundry",
+    TELEPHONE = "Telephone Service"
+}
+export declare class HotelReservation extends BaseModel {
+    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;
+    attachment_url: string;
+    requested_by: string;
+    visitor_name: string;
+    hr_approval: boolean;
+    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, hr_approval: boolean, pr_approval: boolean);
+}

package/dist/models/HotelreservationModal.js

@@ -0,0 +1,119 @@
+"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.HotelReservation = exports.ServiceTypes = exports.MealType = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var MealType;
+(function (MealType) {
+    MealType["BREAKFAST"] = "Breakfast";
+    MealType["LUNCH"] = "Lunch";
+    MealType["DINNER"] = "Dinner";
+})(MealType || (exports.MealType = MealType = {}));
+var ServiceTypes;
+(function (ServiceTypes) {
+    ServiceTypes["LAUNDRY"] = "Laundry";
+    ServiceTypes["TELEPHONE"] = "Telephone Service";
+})(ServiceTypes || (exports.ServiceTypes = ServiceTypes = {}));
+let HotelReservation = class HotelReservation extends BaseModel_1.BaseModel {
+    constructor(type_of_accommodation, price, meal, service, date_of_request, hotel_name, check_in_date, check_in_time, check_out_date, check_out_time, number_of_guests, description, requested_by, visitor_name, hr_approval, pr_approval) {
+        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.hr_approval = hr_approval;
+        this.pr_approval = pr_approval;
+    }
+};
+exports.HotelReservation = HotelReservation;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50 }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "type_of_accommodation", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: false }),
+    __metadata("design:type", Number)
+], HotelReservation.prototype, "price", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'enum', enum: MealType, nullable: false, }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "meal", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'enum', enum: ServiceTypes, nullable: false, }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "service", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'timestamptz', nullable: false }),
+    __metadata("design:type", Date)
+], HotelReservation.prototype, "date_of_request", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "hotel_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
+    __metadata("design:type", Date)
+], HotelReservation.prototype, "check_in_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "check_in_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
+    __metadata("design:type", Date)
+], HotelReservation.prototype, "check_out_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "check_out_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], HotelReservation.prototype, "number_of_guests", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "attachment_url", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "requested_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "visitor_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], HotelReservation.prototype, "hr_approval", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], HotelReservation.prototype, "pr_approval", void 0);
+exports.HotelReservation = HotelReservation = __decorate([
+    (0, typeorm_1.Entity)({ name: 'hotel_reservations' }),
+    __metadata("design:paramtypes", [String, Number, String, String, Date, String, Date, String, Date, String, Number, String, String, String, Boolean, Boolean])
+], HotelReservation);

package/dist/models/SecurityAwarenessApprovalModel.d.ts

@@ -18,7 +18,6 @@ export declare class SecurityAwarenessApproval extends BaseModel {
     approved_by: number | null;
     comment: string;
     approval_status: SecurityAwarenessApprovalStatus;
-    is_manager: boolean;
     is_allowed: boolean;
-    constructor(request_id: number, approver_role_id: number, comment: string, approval_status: SecurityAwarenessApprovalStatus, level: number, is_manager?: boolean, 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, is_allowed?: boolean);
+    constructor(request_id: number, approver_role_id: number, comment: string, approval_status: SecurityAwarenessApprovalStatus, 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, is_allowed?: boolean);
 }

package/dist/models/SecurityAwarenessApprovalModel.js

@@ -20,7 +20,7 @@ var SecurityAwarenessApprovalStatus;
     SecurityAwarenessApprovalStatus["REJECTED"] = "Rejected";
 })(SecurityAwarenessApprovalStatus || (exports.SecurityAwarenessApprovalStatus = SecurityAwarenessApprovalStatus = {}));
 let SecurityAwarenessApproval = class SecurityAwarenessApproval extends BaseModel_1.BaseModel {
-    constructor(request_id, approver_role_id, comment, approval_status, level, is_manager = false, department_id, section_id, approver_user_id, delegate_user_id, approved_by, service_id, sub_service_id, is_allowed) {
+    constructor(request_id, approver_role_id, comment, approval_status, level, department_id, section_id, approver_user_id, delegate_user_id, approved_by, service_id, sub_service_id, is_allowed) {
         super();
         this.request_id = request_id;
         this.service_id = service_id || null;
@@ -29,7 +29,6 @@ let SecurityAwarenessApproval = class SecurityAwarenessApproval extends BaseMode
         this.comment = comment;
         this.approval_status = approval_status;
         this.level = level;
-        this.is_manager = is_manager;
         this.department_id = department_id || null;
         this.section_id = section_id || null;
         this.approver_user_id = approver_user_id || null;
@@ -87,15 +86,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'enum', enum: SecurityAwarenessApprovalStatus, default: SecurityAwarenessApprovalStatus.PENDING, nullable: false }),
     __metadata("design:type", String)
 ], SecurityAwarenessApproval.prototype, "approval_status", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false, nullable: false }),
-    __metadata("design:type", Boolean)
-], SecurityAwarenessApproval.prototype, "is_manager", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'boolean', default: true, nullable: false }),
     __metadata("design:type", Boolean)
 ], SecurityAwarenessApproval.prototype, "is_allowed", void 0);
 exports.SecurityAwarenessApproval = SecurityAwarenessApproval = __decorate([
     (0, typeorm_1.Entity)({ name: 'security_awareness_approvals' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, Number, Boolean, Object, Object, Object, Object, Object, Number, Number, Boolean])
+    __metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object, Object, Object, Number, Number, Boolean])
 ], SecurityAwarenessApproval);

package/dist/models/ServiceTypeModel.js

@@ -35,7 +35,7 @@ __decorate([
     __metadata("design:type", String)
 ], ServiceType.prototype, "name", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", Object)
 ], ServiceType.prototype, "name_in_arabic", void 0);
 __decorate([

package/package.json

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

package/src/models/AirportEntryPermitModel.ts

@@ -170,6 +170,9 @@ export class AirportEntryPermit extends BaseModel {
   @Column({ type: 'varchar', length: 100, nullable: false })
   requested_by: string;
 
+  @Column({ type: 'date', nullable: true })
+  expiration_date: Date | null;
+
   constructor(
     name_full_family_name: string,
     nationality: string,
@@ -202,7 +205,8 @@ export class AirportEntryPermit extends BaseModel {
     consent_approve_to_issue_permit: boolean = false,
     consent_do_not_approve_to_issue_permit: boolean = false,
     consent_justification?: string | null,
-    request_id?: string | null
+    request_id?: string | null,
+    expiration_date?: Date | null
   ) {
     super();
     this.name_full_family_name = name_full_family_name;
@@ -237,6 +241,7 @@ export class AirportEntryPermit extends BaseModel {
     this.consent_do_not_approve_to_issue_permit = consent_do_not_approve_to_issue_permit;
     this.consent_justification = consent_justification ?? null;
     this.request_id = request_id ?? null;
+    this.expiration_date = expiration_date ?? null;
   }
 }
 

package/src/models/SecurityAwarenessApprovalModel.ts

@@ -47,9 +47,6 @@ export class SecurityAwarenessApproval extends BaseModel {
   @Column({ type: 'enum', enum: SecurityAwarenessApprovalStatus, default: SecurityAwarenessApprovalStatus.PENDING, nullable: false })
   approval_status: SecurityAwarenessApprovalStatus;
 
-  @Column({ type: 'boolean', default: false, nullable: false })
-  is_manager: boolean;
-
   @Column({ type: 'boolean', default: true, nullable: false })
   is_allowed: boolean;
 
@@ -59,7 +56,6 @@ export class SecurityAwarenessApproval extends BaseModel {
     comment: string, 
     approval_status: SecurityAwarenessApprovalStatus, 
     level: number,
-    is_manager: boolean = false,
     department_id?: number | null,
     section_id?: number | null,
     approver_user_id?: number | null,
@@ -77,7 +73,6 @@ export class SecurityAwarenessApproval extends BaseModel {
     this.comment = comment;
     this.approval_status = approval_status;
     this.level = level;
-    this.is_manager = is_manager;
     this.department_id = department_id || null;
     this.section_id = section_id || null;
     this.approver_user_id = approver_user_id || null;

package/src/models/ServiceTypeModel.ts

@@ -11,7 +11,7 @@ export class ServiceType extends BaseModel {
     @Column({ nullable: false })
     name: string;
 
-    @Column({type: 'varchar', nullable: true })
+    @Column({ nullable: true })
     name_in_arabic: string | null;
 
     @Column({ nullable: false })