@platform-modules/civil-aviation-authority 2.2.220 → 2.2.221

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

@@ -126,7 +126,7 @@ __decorate([
     __metadata("design:type", String)
 ], AccessCardRequest.prototype, "reason", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    (0, typeorm_1.Column)({ type: "date", nullable: false }),
     __metadata("design:type", Date)
 ], AccessCardRequest.prototype, "request_date", void 0);
 __decorate([

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/HotelreservationModel.d.ts

@@ -38,9 +38,8 @@ export declare class HotelReservation extends BaseModel {
     description: string;
     attachment_url: string | null;
     requested_by: string;
-    visitor_name: string | null;
     purpose_of_visit: string | null;
     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, booking_date: Date | null, check_in_time: string, check_out_date: Date, check_out_time: string, number_of_guests: number, description: string, requested_by: string, visitor_name: string | null, purpose_of_visit: string | null, user_id: number, status?: HotelReservationStatus, hr_approval?: boolean, pr_approval?: boolean, 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);
+    constructor(type_of_accommodation: string, price: number, meal: MealType[], service: ServiceTypes[], date_of_request: Date, hotel_name: string, check_in_date: Date, booking_date: Date | null, check_in_time: string, check_out_date: Date, check_out_time: string, number_of_guests: number, description: string, requested_by: string, purpose_of_visit: string | null, user_id: number, status?: HotelReservationStatus, hr_approval?: boolean, pr_approval?: boolean, 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);
 }

package/dist/models/HotelreservationModel.js

@@ -31,7 +31,7 @@ var HotelReservationStatus;
     HotelReservationStatus["IN_PROGRESS"] = "In Progress";
 })(HotelReservationStatus || (exports.HotelReservationStatus = HotelReservationStatus = {}));
 let HotelReservation = class HotelReservation extends BaseModel_1.BaseModel {
-    constructor(type_of_accommodation, price, meal, service, date_of_request, hotel_name, check_in_date, booking_date, check_in_time, check_out_date, check_out_time, number_of_guests, description, requested_by, visitor_name, purpose_of_visit, user_id, status = HotelReservationStatus.PENDING, hr_approval = false, pr_approval = false, service_id, sub_service_id, service_type, workflow_execution_id, req_user_department_id, req_user_section_id, attachment_url) {
+    constructor(type_of_accommodation, price, meal, service, date_of_request, hotel_name, check_in_date, booking_date, check_in_time, check_out_date, check_out_time, number_of_guests, description, requested_by, purpose_of_visit, user_id, status = HotelReservationStatus.PENDING, hr_approval = false, pr_approval = false, service_id, sub_service_id, service_type, workflow_execution_id, req_user_department_id, req_user_section_id, attachment_url) {
         super();
         this.type_of_accommodation = type_of_accommodation;
         this.price = price;
@@ -46,7 +46,6 @@ let HotelReservation = class HotelReservation extends BaseModel_1.BaseModel {
         this.number_of_guests = number_of_guests;
         this.description = description;
         this.requested_by = requested_by;
-        this.visitor_name = visitor_name;
         this.purpose_of_visit = purpose_of_visit;
         this.user_id = user_id;
         this.status = status;
@@ -160,10 +159,6 @@ __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: true }),
-    __metadata("design:type", Object)
-], HotelReservation.prototype, "visitor_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", Object)
@@ -178,5 +173,5 @@ __decorate([
 ], HotelReservation.prototype, "pr_approval", void 0);
 exports.HotelReservation = HotelReservation = __decorate([
     (0, typeorm_1.Entity)({ name: 'hotelreservations' }),
-    __metadata("design:paramtypes", [String, Number, Array, Array, Date, String, Date, Object, String, Date, String, Number, String, String, Object, Object, Number, String, Boolean, Boolean, Object, Object, Object, Object, Object, Object, Object])
+    __metadata("design:paramtypes", [String, Number, Array, Array, Date, String, Date, Object, String, Date, String, Number, String, String, Object, Number, String, Boolean, Boolean, Object, Object, Object, Object, Object, Object, Object])
 ], HotelReservation);

package/package.json

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

package/src/models/AccessCardRequestModel.ts

@@ -75,7 +75,7 @@ export class AccessCardRequest extends BaseModel {
   @Column({ type: "text", nullable: false })
   reason: string;
 
-  @Column({ type: "date", nullable: true })
+  @Column({ type: "date", nullable: false })
   request_date: Date;
 
   @Column({

package/src/models/HotelreservationModel.ts

@@ -97,9 +97,6 @@ export class HotelReservation extends BaseModel {
     @Column({ type: 'varchar', length: 100, nullable: false })
     requested_by: string;
 
-    @Column({ type: 'varchar', length: 100, nullable: true })
-    visitor_name: string | null;
-
     @Column({ type: 'text', nullable: true })
     purpose_of_visit: string | null;
 
@@ -125,7 +122,6 @@ export class HotelReservation extends BaseModel {
         number_of_guests: number,
         description: string,
         requested_by: string,
-        visitor_name: string | null,
         purpose_of_visit: string | null,
         user_id: number,
         status: HotelReservationStatus = HotelReservationStatus.PENDING,
@@ -153,7 +149,6 @@ export class HotelReservation extends BaseModel {
         this.number_of_guests = number_of_guests;
         this.description = description;
         this.requested_by = requested_by;
-        this.visitor_name = visitor_name;
         this.purpose_of_visit = purpose_of_visit;
         this.user_id = user_id;
         this.status = status;