@platform-modules/civil-aviation-authority 2.2.202 → 2.2.203

package/.env

@@ -1,5 +1,17 @@
-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=216.48.187.46
+DB_PORT=5432
+DB_USER=adminuser
+DB_PASS=postgres_caa_fm_qa_34567
+DB_NAME=CAA_QA

package/dist/models/AirportEntryPermitApprovalModel.d.ts

@@ -19,6 +19,5 @@ export declare class AirportEntryPermitApproval extends BaseModel {
     approved_by: number | null;
     comment: string;
     approval_status: AirportEntryPermitApprovalStatus;
-    is_manager: boolean;
-    constructor(request_id: number, approver_role_id: number, comment: string, approval_status: AirportEntryPermitApprovalStatus, 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);
+    constructor(request_id: number, approver_role_id: number, comment: string, approval_status: AirportEntryPermitApprovalStatus, 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);
 }

package/dist/models/AirportEntryPermitApprovalModel.js

@@ -21,7 +21,7 @@ var AirportEntryPermitApprovalStatus;
     AirportEntryPermitApprovalStatus["RFC"] = "Request For Change";
 })(AirportEntryPermitApprovalStatus || (exports.AirportEntryPermitApprovalStatus = AirportEntryPermitApprovalStatus = {}));
 let AirportEntryPermitApproval = class AirportEntryPermitApproval 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) {
+    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) {
         super();
         this.request_id = request_id;
         this.service_id = service_id || null;
@@ -30,7 +30,6 @@ let AirportEntryPermitApproval = class AirportEntryPermitApproval extends BaseMo
         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,11 +86,7 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'enum', enum: AirportEntryPermitApprovalStatus, default: AirportEntryPermitApprovalStatus.PENDING, nullable: false }),
     __metadata("design:type", String)
 ], AirportEntryPermitApproval.prototype, "approval_status", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false, nullable: false }),
-    __metadata("design:type", Boolean)
-], AirportEntryPermitApproval.prototype, "is_manager", void 0);
 exports.AirportEntryPermitApproval = AirportEntryPermitApproval = __decorate([
     (0, typeorm_1.Entity)({ name: 'airport_entry_permit_approvals' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, Number, Boolean, Object, Object, Object, Object, Object, Number, Number])
+    __metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object, Object, Object, Number, Number])
 ], AirportEntryPermitApproval);

package/dist/models/AirportEntryPermitWorkflowModel.d.ts

@@ -10,9 +10,5 @@ export declare class AirportEntryPermitWorkFlow extends BaseModel {
     sub_service_id: number | null;
     content: string;
     status: AirportEntryPermitWorkFlowStatus;
-    user_id: number | null;
-    role_id: number | null;
-    department_id: number | null;
-    section_id: number | null;
-    constructor(request_id: number, content: string, status: AirportEntryPermitWorkFlowStatus, service_id?: number, sub_service_id?: number, user_id?: number, role_id?: number, department_id?: number, section_id?: number);
+    constructor(request_id: number, content: string, status: AirportEntryPermitWorkFlowStatus, service_id?: number, sub_service_id?: number);
 }

package/dist/models/AirportEntryPermitWorkflowModel.js

@@ -19,17 +19,13 @@ var AirportEntryPermitWorkFlowStatus;
     AirportEntryPermitWorkFlowStatus["PENDING"] = "Pending";
 })(AirportEntryPermitWorkFlowStatus || (exports.AirportEntryPermitWorkFlowStatus = AirportEntryPermitWorkFlowStatus = {}));
 let AirportEntryPermitWorkFlow = class AirportEntryPermitWorkFlow extends BaseModel_1.BaseModel {
-    constructor(request_id, content, status, service_id, sub_service_id, user_id, role_id, department_id, section_id) {
+    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;
-        this.user_id = user_id || null;
-        this.role_id = role_id || null;
-        this.department_id = department_id || null;
-        this.section_id = section_id || null;
     }
 };
 exports.AirportEntryPermitWorkFlow = AirportEntryPermitWorkFlow;
@@ -53,23 +49,7 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'enum', enum: AirportEntryPermitWorkFlowStatus, default: AirportEntryPermitWorkFlowStatus.NOT_YET_STARTED, nullable: false }),
     __metadata("design:type", String)
 ], AirportEntryPermitWorkFlow.prototype, "status", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
-    __metadata("design:type", Object)
-], AirportEntryPermitWorkFlow.prototype, "user_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
-    __metadata("design:type", Object)
-], AirportEntryPermitWorkFlow.prototype, "role_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
-    __metadata("design:type", Object)
-], AirportEntryPermitWorkFlow.prototype, "department_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
-    __metadata("design:type", Object)
-], AirportEntryPermitWorkFlow.prototype, "section_id", void 0);
 exports.AirportEntryPermitWorkFlow = AirportEntryPermitWorkFlow = __decorate([
     (0, typeorm_1.Entity)({ name: 'airport_entry_permit_workflows' }),
-    __metadata("design:paramtypes", [Number, String, String, Number, Number, Number, Number, Number, Number])
+    __metadata("design:paramtypes", [Number, String, String, Number, Number])
 ], AirportEntryPermitWorkFlow);

package/dist/models/LogisticsApprovalModel.d.ts

@@ -18,5 +18,6 @@ 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, 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: LogisticsApprovalStatus, 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/LogisticsApprovalModel.js

@@ -20,7 +20,7 @@ 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, approver_user_id, delegate_user_id, approved_by, service_id, sub_service_id) {
+    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;
@@ -34,6 +34,7 @@ let LogisticsApprovalDetails = class LogisticsApprovalDetails extends BaseModel_
         this.approver_user_id = approver_user_id || null;
         this.delegate_user_id = delegate_user_id || null;
         this.approved_by = approved_by || null;
+        this.is_allowed = is_allowed !== undefined ? is_allowed : true;
     }
 };
 exports.LogisticsApprovalDetails = LogisticsApprovalDetails;
@@ -85,7 +86,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'enum', enum: LogisticsApprovalStatus, default: LogisticsApprovalStatus.PENDING, nullable: false }),
     __metadata("design:type", String)
 ], LogisticsApprovalDetails.prototype, "approval_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true, nullable: false }),
+    __metadata("design:type", Boolean)
+], LogisticsApprovalDetails.prototype, "is_allowed", void 0);
 exports.LogisticsApprovalDetails = LogisticsApprovalDetails = __decorate([
     (0, typeorm_1.Entity)({ name: 'logistics_approvals' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object, Object, Object, Number, Number])
+    __metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object, Object, Object, Number, Number, Boolean])
 ], LogisticsApprovalDetails);

package/package.json

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

package/src/models/AirportEntryPermitApprovalModel.ts

@@ -47,16 +47,12 @@ export class AirportEntryPermitApproval extends BaseModel {
   @Column({ type: 'enum', enum: AirportEntryPermitApprovalStatus, default: AirportEntryPermitApprovalStatus.PENDING, nullable: false })
   approval_status: AirportEntryPermitApprovalStatus;
 
-  @Column({ type: 'boolean', default: false, nullable: false })
-  is_manager: boolean;
-
   constructor(
     request_id: number,
     approver_role_id: number,
     comment: string,
     approval_status: AirportEntryPermitApprovalStatus,
     level: number,
-    is_manager: boolean = false,
     department_id?: number | null,
     section_id?: number | null,
     approver_user_id?: number | null,
@@ -73,7 +69,6 @@ export class AirportEntryPermitApproval 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/AirportEntryPermitWorkflowModel.ts

@@ -24,28 +24,12 @@ export class AirportEntryPermitWorkFlow extends BaseModel {
   @Column({ type: 'enum', enum: AirportEntryPermitWorkFlowStatus, default: AirportEntryPermitWorkFlowStatus.NOT_YET_STARTED, nullable: false })
   status: AirportEntryPermitWorkFlowStatus;
 
-  @Column({ type: 'integer', nullable: true })
-  user_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  role_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  department_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  section_id: number | null;
-
   constructor(
     request_id: number,
     content: string,
     status: AirportEntryPermitWorkFlowStatus,
     service_id?: number,
-    sub_service_id?: number,
-    user_id?: number,
-    role_id?: number,
-    department_id?: number,
-    section_id?: number
+    sub_service_id?: number
   ) {
     super();
     this.request_id = request_id;
@@ -53,10 +37,6 @@ export class AirportEntryPermitWorkFlow extends BaseModel {
     this.sub_service_id = sub_service_id || null;
     this.content = content;
     this.status = status;
-    this.user_id = user_id || null;
-    this.role_id = role_id || null;
-    this.department_id = department_id || null;
-    this.section_id = section_id || null;
   }
 }
 

package/src/models/LogisticsApprovalModel.ts

@@ -47,6 +47,9 @@ export class LogisticsApprovalDetails extends BaseModel {
   @Column({ type: 'enum', enum: LogisticsApprovalStatus,default: LogisticsApprovalStatus.PENDING, nullable: false })
   approval_status: LogisticsApprovalStatus;
 
+  @Column({ type: 'boolean', default: true, nullable: false })
+  is_allowed: boolean;
+
     constructor(
       request_id: number, 
       approver_role_id: number, 
@@ -59,7 +62,8 @@ export class LogisticsApprovalDetails extends BaseModel {
       delegate_user_id?: number | null,
       approved_by?: number | null,
       service_id?: number,
-      sub_service_id?: number
+      sub_service_id?: number,
+      is_allowed?: boolean
     ) {
     super();
     this.request_id = request_id;
@@ -74,5 +78,6 @@ export class LogisticsApprovalDetails extends BaseModel {
     this.approver_user_id = approver_user_id || null;
     this.delegate_user_id = delegate_user_id || null;
     this.approved_by = approved_by || null;
+    this.is_allowed = is_allowed !== undefined ? is_allowed : true;
   }
 }

package/dist/models/HotelreservationModal.d.ts

@@ -1,30 +0,0 @@
-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

@@ -1,119 +0,0 @@
-"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);