@platform-modules/civil-aviation-authority 2.2.212 → 2.2.214

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/ServiceTypeModel.js

@@ -31,7 +31,7 @@ let ServiceType = class ServiceType extends BaseModel_1.BaseModel {
 };
 exports.ServiceType = ServiceType;
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: false }),
     __metadata("design:type", String)
 ], ServiceType.prototype, "name", void 0);
 __decorate([
@@ -39,7 +39,7 @@ __decorate([
     __metadata("design:type", Object)
 ], ServiceType.prototype, "name_in_arabic", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
     __metadata("design:type", Number)
 ], ServiceType.prototype, "service_id", void 0);
 __decorate([
@@ -48,7 +48,7 @@ __decorate([
     __metadata("design:type", CAAServices_1.CAAServices)
 ], ServiceType.prototype, "service", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
     __metadata("design:type", Number)
 ], ServiceType.prototype, "sub_service_id", void 0);
 __decorate([
@@ -75,7 +75,7 @@ __decorate([
     __metadata("design:type", SectionModel_1.Sections)
 ], ServiceType.prototype, "section", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", String)
 ], ServiceType.prototype, "description", void 0);
 __decorate([

package/dist/models/VpnApprovalModel.d.ts

@@ -17,5 +17,6 @@ export declare class VpnApprovalDetails extends BaseModel {
     comment: string;
     approval_status: VpnApprovalStatus;
     is_manager: boolean;
+    is_allowed: 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

@@ -81,6 +81,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "boolean", default: false, nullable: false }),
     __metadata("design:type", Boolean)
 ], VpnApprovalDetails.prototype, "is_manager", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "boolean", default: true, nullable: false }),
+    __metadata("design:type", Boolean)
+], VpnApprovalDetails.prototype, "is_allowed", 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, Boolean])

package/dist/models/Workflows.d.ts

@@ -0,0 +1,9 @@
+import { BaseModel } from './BaseModel';
+export declare class Workflows extends BaseModel {
+    name: string;
+    service_id: number;
+    sub_service_id: number;
+    request_for: string;
+    levels: number;
+    constructor(name: string, service_id: number, sub_service_id: number, request_for: string, levels: number);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.2.212",
+  "version": "2.2.214",
   "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/ServiceTypeModel.ts

@@ -8,20 +8,20 @@ import { Sections } from './SectionModel';
 @Entity({ name: 'service_types' })
 export class ServiceType extends BaseModel {
 
-    @Column({ nullable: false })
+    @Column({ type: 'varchar', nullable: false })
     name: string;
 
-    @Column({type: 'varchar', nullable: true })
+    @Column({ type: 'varchar', nullable: true })
     name_in_arabic: string | null;
 
-    @Column({ nullable: false })
+    @Column({ type: 'int', nullable: false })
     service_id: number;
 
     @ManyToOne(() => CAAServices)
     @JoinColumn({ name: 'service_id' })
     service: CAAServices;
 
-    @Column({ nullable: false })
+    @Column({ type: 'int', nullable: false })
     sub_service_id: number;
 
     @ManyToOne(() => CAASubServices)
@@ -42,7 +42,7 @@ export class ServiceType extends BaseModel {
     @JoinColumn({ name: 'section_id' })
     section: Sections;
 
-    @Column({ nullable: true })
+    @Column({ type: 'text', nullable: true })
     description: string;
 
     @Column({ type: 'boolean', default: true })

package/src/models/VpnApprovalModel.ts

@@ -46,6 +46,9 @@ export class VpnApprovalDetails extends BaseModel {
   @Column({ type: "boolean", default: false, nullable: false })
   is_manager: boolean;
 
+  @Column({ type: "boolean", default: true, nullable: false })
+  is_allowed: boolean;
+
   constructor(
     request_id: number,
     approver_user_id: number | null,