@platform-modules/civil-aviation-authority 2.3.80 → 2.3.81

package/.env

@@ -1,12 +1,17 @@
-# DB_HOST=164.52.222.169
-# DB_PORT=5432 
-# DB_USER=postgres_admin_user
-# DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+# 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=localhost
-DB_PORT=5432 
-DB_USER=postgres
-DB_PASS=stevejobs
-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/DutyMissionRequestModel.js

@@ -127,7 +127,7 @@ __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
         enum: TripType,
-        nullable: false,
+        nullable: true,
     }),
     __metadata("design:type", String)
 ], DutyMissionRequests.prototype, "trip_type", void 0);
@@ -139,7 +139,7 @@ __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
         enum: ChooseType,
-        nullable: false,
+        nullable: true,
     }),
     __metadata("design:type", String)
 ], DutyMissionRequests.prototype, "choose_type", void 0);
@@ -160,7 +160,7 @@ __decorate([
     __metadata("design:type", String)
 ], DutyMissionRequests.prototype, "mission_purpose", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
 ], DutyMissionRequests.prototype, "mission_number", void 0);
 __decorate([
@@ -176,11 +176,11 @@ __decorate([
     __metadata("design:type", Object)
 ], DutyMissionRequests.prototype, "mission_days", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", String)
 ], DutyMissionRequests.prototype, "travelling_area_from", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", String)
 ], DutyMissionRequests.prototype, "travelling_area_to", void 0);
 __decorate([
@@ -188,23 +188,23 @@ __decorate([
     __metadata("design:type", Object)
 ], DutyMissionRequests.prototype, "distance", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
 ], DutyMissionRequests.prototype, "from_country", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
 ], DutyMissionRequests.prototype, "to_country", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", String)
 ], DutyMissionRequests.prototype, "travel_place", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "date", nullable: false }),
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
     __metadata("design:type", Date)
 ], DutyMissionRequests.prototype, "travel_start_date", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "date", nullable: false }),
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
     __metadata("design:type", Date)
 ], DutyMissionRequests.prototype, "travel_return_date", void 0);
 __decorate([

package/dist/models/Workflows.d.ts

@@ -1,9 +0,0 @@
-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.3.80",
+  "version": "2.3.81",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/models/DutyMissionRequestModel.ts

@@ -74,7 +74,7 @@ export class DutyMissionRequests extends BaseModel {
   @Column({
     type: "enum",
     enum: TripType,
-    nullable: false,
+    nullable: true,
   })
   trip_type: TripType;
 
@@ -84,7 +84,7 @@ export class DutyMissionRequests extends BaseModel {
   @Column({
     type: "enum",
     enum: ChooseType,
-    nullable: false,
+    nullable: true,
   })
   choose_type: ChooseType;
 
@@ -101,7 +101,7 @@ export class DutyMissionRequests extends BaseModel {
   @Column({ type: 'text', nullable: false })
   mission_purpose: string;
 
-  @Column({ type: 'varchar', length: 100, nullable: false })
+  @Column({ type: 'varchar', length: 100, nullable: true })
   mission_number: string;
 
   @Column({ type: "date", nullable: false })
@@ -113,28 +113,28 @@ export class DutyMissionRequests extends BaseModel {
   @Column({ type: 'int', nullable: true })
   mission_days: number | null;
 
-  @Column({ type: 'varchar', length: 255, nullable: false })
+  @Column({ type: 'varchar', length: 255, nullable: true })
   travelling_area_from: string;
 
-  @Column({ type: 'varchar', length: 255, nullable: false })
+  @Column({ type: 'varchar', length: 255, nullable: true })
   travelling_area_to: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   distance: string | null;
 
-  @Column({ type: 'varchar', length: 100, nullable: false })
+  @Column({ type: 'varchar', length: 100, nullable: true })
   from_country: string;
 
-  @Column({ type: 'varchar', length: 100, nullable: false })
+  @Column({ type: 'varchar', length: 100, nullable: true })
   to_country: string;
 
-  @Column({ type: 'varchar', length: 255, nullable: false })
+  @Column({ type: 'varchar', length: 255, nullable: true })
   travel_place: string;
 
-  @Column({ type: "date", nullable: false })
+  @Column({ type: "date", nullable: true })
   travel_start_date: Date;
 
-  @Column({ type: "date", nullable: false })
+  @Column({ type: "date", nullable: true })
   travel_return_date: Date;
 
   @Column({ type: 'varchar', length: 50, nullable: true })

package/src/models/HrServiceRequestModel.ts

@@ -1,193 +1,193 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum HrServiceRequestStatus {
-    PENDING = "Pending",
-    ASSIGNED = "Assigned",
-    IN_PROGRESS = "In Progress",
-    COMPLETED = "Completed",
-    APPROVED = "Approved",
-    REJECTED = "Rejected"
-}
-
-@Entity({ name: "hr_service_requests" })
-export class HrServiceRequest extends BaseModel {
-    @Column({ type: "integer", nullable: true })
-    req_user_department_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    req_user_section_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    req_user_position_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    service_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    sub_service_id: number | null;
-
-    @Column({ type: "integer", nullable: false })
-    user_id: number;
-
-    @Column({ type: "text", nullable: true })
-    description: string | null;
-
-    @Column({ type: "enum", enum: HrServiceRequestStatus, default: HrServiceRequestStatus.PENDING, nullable: false })
-    status: HrServiceRequestStatus;
-
-    @Column({ type: "integer", nullable: true })
-    reviewer_user_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    assigned_to_user_id: number | null;
-
-    @Column({ type: "timestamp", nullable: true })
-    assigned_at: Date | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    workflow_execution_id: string | null;
-
-    // Assignment Decision specific fields
-    @Column({ type: "varchar", length: 255, nullable: false })
-    assigned_employee_name: string;
-
-    @Column({ type: "varchar", length: 50, nullable: true })
-    civil_id_card_number: string | null;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    employee_id: string;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    current_job_position: string;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    assigned_job_position: string;
-
-    @Column({ type: "date", nullable: false })
-    start_date: Date;
-
-    @Column({ type: "date", nullable: false })
-    end_date: Date;
-
-    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
-    assignment_allowance: number | null; // 0-100 percentage
-
-    @Column({ type: "varchar", length: 20, nullable: false })
-    phone_number: string;
-
-    @Column({ type: "text", nullable: false })
-    reason_for_request: string;
-
-    // Replacement tracking fields - Store REPLACEMENT details (ORIGINAL details above remain unchanged)
-    @Column({ type: "boolean", default: false, nullable: false })
-    is_replaced: boolean;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    replacement_employee_name: string | null;
-
-    @Column({ type: "varchar", length: 100, nullable: true })
-    replacement_employee_id: string | null;
-
-    @Column({ type: "varchar", length: 50, nullable: true })
-    replacement_civil_id_card_number: string | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    replacement_current_job_position: string | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    replacement_assigned_job_position: string | null;
-
-    @Column({ type: "date", nullable: true })
-    replacement_start_date: Date | null;
-
-    @Column({ type: "date", nullable: true })
-    replacement_end_date: Date | null;
-
-    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
-    replacement_assignment_allowance: number | null;
-
-    @Column({ type: "text", nullable: true })
-    replacement_reason: string | null;
-
-    @Column({ type: "integer", nullable: true })
-    replaced_by_user_id: number | null;
-
-    @Column({ type: "timestamp", nullable: true })
-    replaced_at: Date | null;
-
-    constructor(
-        user_id: number,
-        status: HrServiceRequestStatus = HrServiceRequestStatus.PENDING,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        req_user_department_id?: number | null,
-        req_user_section_id?: number | null,
-        req_user_position_id?: number | null,
-        description?: string | null,
-        reviewer_user_id?: number | null,
-        assigned_to_user_id?: number | null,
-        assigned_at?: Date | null,
-        workflow_execution_id?: string | null,
-        assigned_employee_name?: string,
-        civil_id_card_number?: string | null,
-        employee_id?: string,
-        current_job_position?: string,
-        assigned_job_position?: string,
-        start_date?: Date,
-        end_date?: Date,
-        assignment_allowance?: number | null,
-        phone_number?: string,
-        reason_for_request?: string,
-        is_replaced?: boolean,
-        replacement_employee_name?: string | null,
-        replacement_employee_id?: string | null,
-        replacement_civil_id_card_number?: string | null,
-        replacement_current_job_position?: string | null,
-        replacement_assigned_job_position?: string | null,
-        replacement_start_date?: Date | null,
-        replacement_end_date?: Date | null,
-        replacement_assignment_allowance?: number | null,
-        replacement_reason?: string | null,
-        replaced_by_user_id?: number | null,
-        replaced_at?: Date | null
-    ) {
-        super();
-        this.user_id = user_id;
-        this.status = status;
-        this.service_id = service_id || null;
-        this.sub_service_id = sub_service_id || null;
-        this.req_user_department_id = req_user_department_id || null;
-        this.req_user_section_id = req_user_section_id || null;
-        this.req_user_position_id = req_user_position_id || null;
-        this.description = description || null;
-        this.reviewer_user_id = reviewer_user_id || null;
-        this.assigned_to_user_id = assigned_to_user_id || null;
-        this.assigned_at = assigned_at || null;
-        this.workflow_execution_id = workflow_execution_id || null;
-        this.assigned_employee_name = assigned_employee_name || "";
-        this.civil_id_card_number = civil_id_card_number || null;
-        this.employee_id = employee_id || "";
-        this.current_job_position = current_job_position || "";
-        this.assigned_job_position = assigned_job_position || "";
-        this.start_date = start_date || new Date();
-        this.end_date = end_date || new Date();
-        this.assignment_allowance = assignment_allowance || null;
-        this.phone_number = phone_number || "";
-        this.reason_for_request = reason_for_request || "";
-        // Replacement fields initialization
-        this.is_replaced = is_replaced || false;
-        this.replacement_employee_name = replacement_employee_name || null;
-        this.replacement_employee_id = replacement_employee_id || null;
-        this.replacement_civil_id_card_number = replacement_civil_id_card_number || null;
-        this.replacement_current_job_position = replacement_current_job_position || null;
-        this.replacement_assigned_job_position = replacement_assigned_job_position || null;
-        this.replacement_start_date = replacement_start_date || null;
-        this.replacement_end_date = replacement_end_date || null;
-        this.replacement_assignment_allowance = replacement_assignment_allowance || null;
-        this.replacement_reason = replacement_reason || null;
-        this.replaced_by_user_id = replaced_by_user_id || null;
-        this.replaced_at = replaced_at || null;
-    }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum HrServiceRequestStatus {
+    PENDING = "Pending",
+    ASSIGNED = "Assigned",
+    IN_PROGRESS = "In Progress",
+    COMPLETED = "Completed",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+
+@Entity({ name: "hr_service_requests" })
+export class HrServiceRequest extends BaseModel {
+    @Column({ type: "integer", nullable: true })
+    req_user_department_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    req_user_section_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    req_user_position_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "integer", nullable: false })
+    user_id: number;
+
+    @Column({ type: "text", nullable: true })
+    description: string | null;
+
+    @Column({ type: "enum", enum: HrServiceRequestStatus, default: HrServiceRequestStatus.PENDING, nullable: false })
+    status: HrServiceRequestStatus;
+
+    @Column({ type: "integer", nullable: true })
+    reviewer_user_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    assigned_to_user_id: number | null;
+
+    @Column({ type: "timestamp", nullable: true })
+    assigned_at: Date | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    // Assignment Decision specific fields
+    @Column({ type: "varchar", length: 255, nullable: false })
+    assigned_employee_name: string;
+
+    @Column({ type: "varchar", length: 50, nullable: true })
+    civil_id_card_number: string | null;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    employee_id: string;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    current_job_position: string;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    assigned_job_position: string;
+
+    @Column({ type: "date", nullable: false })
+    start_date: Date;
+
+    @Column({ type: "date", nullable: false })
+    end_date: Date;
+
+    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
+    assignment_allowance: number | null; // 0-100 percentage
+
+    @Column({ type: "varchar", length: 20, nullable: false })
+    phone_number: string;
+
+    @Column({ type: "text", nullable: false })
+    reason_for_request: string;
+
+    // Replacement tracking fields - Store REPLACEMENT details (ORIGINAL details above remain unchanged)
+    @Column({ type: "boolean", default: false, nullable: false })
+    is_replaced: boolean;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    replacement_employee_name: string | null;
+
+    @Column({ type: "varchar", length: 100, nullable: true })
+    replacement_employee_id: string | null;
+
+    @Column({ type: "varchar", length: 50, nullable: true })
+    replacement_civil_id_card_number: string | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    replacement_current_job_position: string | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    replacement_assigned_job_position: string | null;
+
+    @Column({ type: "date", nullable: true })
+    replacement_start_date: Date | null;
+
+    @Column({ type: "date", nullable: true })
+    replacement_end_date: Date | null;
+
+    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
+    replacement_assignment_allowance: number | null;
+
+    @Column({ type: "text", nullable: true })
+    replacement_reason: string | null;
+
+    @Column({ type: "integer", nullable: true })
+    replaced_by_user_id: number | null;
+
+    @Column({ type: "timestamp", nullable: true })
+    replaced_at: Date | null;
+
+    constructor(
+        user_id: number,
+        status: HrServiceRequestStatus = HrServiceRequestStatus.PENDING,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        req_user_department_id?: number | null,
+        req_user_section_id?: number | null,
+        req_user_position_id?: number | null,
+        description?: string | null,
+        reviewer_user_id?: number | null,
+        assigned_to_user_id?: number | null,
+        assigned_at?: Date | null,
+        workflow_execution_id?: string | null,
+        assigned_employee_name?: string,
+        civil_id_card_number?: string | null,
+        employee_id?: string,
+        current_job_position?: string,
+        assigned_job_position?: string,
+        start_date?: Date,
+        end_date?: Date,
+        assignment_allowance?: number | null,
+        phone_number?: string,
+        reason_for_request?: string,
+        is_replaced?: boolean,
+        replacement_employee_name?: string | null,
+        replacement_employee_id?: string | null,
+        replacement_civil_id_card_number?: string | null,
+        replacement_current_job_position?: string | null,
+        replacement_assigned_job_position?: string | null,
+        replacement_start_date?: Date | null,
+        replacement_end_date?: Date | null,
+        replacement_assignment_allowance?: number | null,
+        replacement_reason?: string | null,
+        replaced_by_user_id?: number | null,
+        replaced_at?: Date | null
+    ) {
+        super();
+        this.user_id = user_id;
+        this.status = status;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.req_user_department_id = req_user_department_id || null;
+        this.req_user_section_id = req_user_section_id || null;
+        this.req_user_position_id = req_user_position_id || null;
+        this.description = description || null;
+        this.reviewer_user_id = reviewer_user_id || null;
+        this.assigned_to_user_id = assigned_to_user_id || null;
+        this.assigned_at = assigned_at || null;
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.assigned_employee_name = assigned_employee_name || "";
+        this.civil_id_card_number = civil_id_card_number || null;
+        this.employee_id = employee_id || "";
+        this.current_job_position = current_job_position || "";
+        this.assigned_job_position = assigned_job_position || "";
+        this.start_date = start_date || new Date();
+        this.end_date = end_date || new Date();
+        this.assignment_allowance = assignment_allowance || null;
+        this.phone_number = phone_number || "";
+        this.reason_for_request = reason_for_request || "";
+        // Replacement fields initialization
+        this.is_replaced = is_replaced || false;
+        this.replacement_employee_name = replacement_employee_name || null;
+        this.replacement_employee_id = replacement_employee_id || null;
+        this.replacement_civil_id_card_number = replacement_civil_id_card_number || null;
+        this.replacement_current_job_position = replacement_current_job_position || null;
+        this.replacement_assigned_job_position = replacement_assigned_job_position || null;
+        this.replacement_start_date = replacement_start_date || null;
+        this.replacement_end_date = replacement_end_date || null;
+        this.replacement_assignment_allowance = replacement_assignment_allowance || null;
+        this.replacement_reason = replacement_reason || null;
+        this.replaced_by_user_id = replaced_by_user_id || null;
+        this.replaced_at = replaced_at || null;
+    }
+}
+