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

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

@@ -29,18 +29,23 @@ export declare enum Type_of_Vehicle {
     SEDAN = "Sedan",
     SUV = "SUV"
 }
+export declare enum Type_of_Request {
+    NEW_REQUEST = "New Request",
+    EXTENSION = "Extension of Previous Request"
+}
 export declare class LogisticsRequests extends BaseModel {
     req_user_department_id: number | null;
     req_user_section_id: number | null;
     service_id: number;
     sub_service_id: number;
     user_id: number;
-    request_type: Request_Type;
+    category: Request_Type;
     vehicle_required_for: Vehicle_Required_For;
     vehicle_required_location: Vehicle_Required_Location;
     title: string;
     purpose_of_travel: Purpose_of_Travel;
     type_of_vehicle_required: Type_of_Vehicle;
+    type_of_request: Type_of_Request;
     date_of_travel: Date;
     time_of_travel: string;
     exp_duration_of_use_hrs: number;
@@ -48,5 +53,5 @@ export declare class LogisticsRequests extends BaseModel {
     description: string;
     status: 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, request_type: Request_Type, vehicle_required_for: Vehicle_Required_For, vehicle_required_location: Vehicle_Required_Location, title: string, purpose_of_travel: Purpose_of_Travel, type_of_vehicle_required: Type_of_Vehicle, date_of_travel: Date, time_of_travel: string, exp_duration_of_use_hrs: number, exp_duration_of_use_days: number, description: string, status: 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, category: Request_Type, vehicle_required_for: Vehicle_Required_For, vehicle_required_location: Vehicle_Required_Location, title: string, purpose_of_travel: Purpose_of_Travel, type_of_vehicle_required: Type_of_Vehicle, type_of_request: Type_of_Request, date_of_travel: Date, time_of_travel: string, exp_duration_of_use_hrs: number, exp_duration_of_use_days: number, description: string, status: Status, workflow_execution_id?: string | null);
 }

package/dist/models/LogisticsModel.js

@@ -9,7 +9,7 @@ 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.LogisticsRequests = exports.Type_of_Vehicle = exports.Purpose_of_Travel = exports.Vehicle_Required_Location = exports.Vehicle_Required_For = exports.Status = exports.Request_Type = void 0;
+exports.LogisticsRequests = exports.Type_of_Request = exports.Type_of_Vehicle = exports.Purpose_of_Travel = exports.Vehicle_Required_Location = exports.Vehicle_Required_For = exports.Status = exports.Request_Type = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 var Request_Type;
@@ -48,20 +48,26 @@ var Type_of_Vehicle;
     Type_of_Vehicle["SEDAN"] = "Sedan";
     Type_of_Vehicle["SUV"] = "SUV";
 })(Type_of_Vehicle || (exports.Type_of_Vehicle = Type_of_Vehicle = {}));
+var Type_of_Request;
+(function (Type_of_Request) {
+    Type_of_Request["NEW_REQUEST"] = "New Request";
+    Type_of_Request["EXTENSION"] = "Extension of Previous Request";
+})(Type_of_Request || (exports.Type_of_Request = Type_of_Request = {}));
 let LogisticsRequests = class LogisticsRequests extends BaseModel_1.BaseModel {
-    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, request_type, vehicle_required_for, vehicle_required_location, title, purpose_of_travel, type_of_vehicle_required, date_of_travel, time_of_travel, exp_duration_of_use_hrs, exp_duration_of_use_days, description, status, workflow_execution_id) {
+    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, category, vehicle_required_for, vehicle_required_location, title, purpose_of_travel, type_of_vehicle_required, type_of_request, date_of_travel, time_of_travel, exp_duration_of_use_hrs, exp_duration_of_use_days, description, status, 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.request_type = request_type;
+        this.category = category;
         this.vehicle_required_for = vehicle_required_for;
         this.vehicle_required_location = vehicle_required_location;
         this.title = title;
         this.purpose_of_travel = purpose_of_travel;
         this.type_of_vehicle_required = type_of_vehicle_required;
+        this.type_of_request = type_of_request;
         this.date_of_travel = date_of_travel;
         this.time_of_travel = time_of_travel;
         this.exp_duration_of_use_hrs = exp_duration_of_use_hrs;
@@ -100,7 +106,7 @@ __decorate([
         nullable: false,
     }),
     __metadata("design:type", String)
-], LogisticsRequests.prototype, "request_type", void 0);
+], LogisticsRequests.prototype, "category", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
@@ -141,6 +147,15 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], LogisticsRequests.prototype, "type_of_vehicle_required", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: Type_of_Request,
+        default: Type_of_Request.NEW_REQUEST,
+        nullable: false,
+    }),
+    __metadata("design:type", String)
+], LogisticsRequests.prototype, "type_of_request", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "date", nullable: false }),
     __metadata("design:type", Date)
@@ -176,5 +191,5 @@ __decorate([
 ], LogisticsRequests.prototype, "workflow_execution_id", void 0);
 exports.LogisticsRequests = LogisticsRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'logistics_requests' }),
-    __metadata("design:paramtypes", [Object, Object, Number, Number, Number, String, String, String, String, String, String, Date, String, Number, Number, String, String, Object])
+    __metadata("design:paramtypes", [Object, Object, Number, Number, Number, String, String, String, String, String, String, String, Date, String, Number, Number, String, String, Object])
 ], LogisticsRequests);

package/package.json

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

package/src/models/LogisticsModel.ts

@@ -37,6 +37,11 @@ export enum Type_of_Vehicle {
   SUV = "SUV"
 }
 
+export enum Type_of_Request {
+  NEW_REQUEST = "New Request",
+  EXTENSION = "Extension of Previous Request"
+}
+
 @Entity({ name: 'logistics_requests' })
 export class LogisticsRequests extends BaseModel {
 
@@ -61,7 +66,7 @@ export class LogisticsRequests extends BaseModel {
     default: Request_Type.DAILY,
     nullable: false,
   })
-  request_type: Request_Type;
+  category: Request_Type;
 
   @Column({
     type: "enum",
@@ -98,6 +103,14 @@ export class LogisticsRequests extends BaseModel {
   })
   type_of_vehicle_required: Type_of_Vehicle;
 
+  @Column({
+    type: "enum",
+    enum: Type_of_Request,
+    default: Type_of_Request.NEW_REQUEST,
+    nullable: false,
+  })
+  type_of_request: Type_of_Request;
+
   @Column({ type: "date", nullable: false })
   date_of_travel: Date;
 
@@ -130,12 +143,13 @@ export class LogisticsRequests extends BaseModel {
     service_id: number,
     sub_service_id: number,
     user_id: number,
-    request_type: Request_Type,
+    category: Request_Type,
     vehicle_required_for: Vehicle_Required_For,
     vehicle_required_location: Vehicle_Required_Location,
     title: string,
     purpose_of_travel: Purpose_of_Travel,
     type_of_vehicle_required: Type_of_Vehicle,
+    type_of_request: Type_of_Request,
     date_of_travel: Date,
     time_of_travel: string,
     exp_duration_of_use_hrs: number,
@@ -150,12 +164,13 @@ export class LogisticsRequests extends BaseModel {
     this.service_id = service_id;
     this.sub_service_id = sub_service_id;
     this.user_id = user_id;
-    this.request_type = request_type;
+    this.category = category;
     this.vehicle_required_for = vehicle_required_for;
     this.vehicle_required_location = vehicle_required_location;
     this.title = title;
     this.purpose_of_travel = purpose_of_travel;
     this.type_of_vehicle_required = type_of_vehicle_required;
+    this.type_of_request = type_of_request;
     this.date_of_travel = date_of_travel;
     this.time_of_travel = time_of_travel;
     this.exp_duration_of_use_hrs = exp_duration_of_use_hrs;