@platform-modules/civil-aviation-authority 2.3.79 → 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/data-source.js

@@ -128,6 +128,7 @@ const CashAllowanceLeaveRequestModel_1 = require("./models/CashAllowanceLeaveReq
 const PromotionRequestModel_1 = require("./models/PromotionRequestModel");
 const AnnualIncrementRequestModel_1 = require("./models/AnnualIncrementRequestModel");
 const SkillsEnhancementRequestModel_1 = require("./models/SkillsEnhancementRequestModel");
+const CityMasterModel_1 = require("./models/CityMasterModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -259,6 +260,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         CashAllowanceLeaveRequestModel_1.CashAllowanceLeaveRequest,
         PromotionRequestModel_1.PromotionRequest,
         AnnualIncrementRequestModel_1.AnnualIncrementRequest,
-        SkillsEnhancementRequestModel_1.SkillsEnhancementRequest
+        SkillsEnhancementRequestModel_1.SkillsEnhancementRequest,
+        CityMasterModel_1.CityMaster
     ],
 });

package/dist/index.d.ts

@@ -188,6 +188,7 @@ export { JobTransferRequestStatus } from './models/JobTransferRequestModel';
 export * from './models/NewResourceRequestModel';
 export { NewResourceRequestStatus } from './models/NewResourceRequestModel';
 export * from './models/CountryMasterModel';
+export * from './models/CityMasterModel';
 export * from './models/LocationModel';
 export * from './models/FinancialGradeModel';
 export * from './models/NationalityMasterModel';

package/dist/index.js

@@ -279,6 +279,8 @@ var NewResourceRequestModel_1 = require("./models/NewResourceRequestModel");
 Object.defineProperty(exports, "NewResourceRequestStatus", { enumerable: true, get: function () { return NewResourceRequestModel_1.NewResourceRequestStatus; } });
 // Country Master
 __exportStar(require("./models/CountryMasterModel"), exports);
+// City Master
+__exportStar(require("./models/CityMasterModel"), exports);
 // Location Master
 __exportStar(require("./models/LocationModel"), exports);
 // Financial Grade Master

package/dist/models/CityMasterModel.d.ts

@@ -0,0 +1,8 @@
+import { BaseModel } from './BaseModel';
+export declare class CityMaster extends BaseModel {
+    country_id: number | null;
+    city_name: string;
+    city_code: string | null;
+    description: string | null;
+    constructor(city_name: string);
+}

package/dist/models/CityMasterModel.js

@@ -0,0 +1,41 @@
+"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.CityMaster = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let CityMaster = class CityMaster extends BaseModel_1.BaseModel {
+    constructor(city_name) {
+        super();
+        this.city_name = city_name;
+    }
+};
+exports.CityMaster = CityMaster;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], CityMaster.prototype, "country_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], CityMaster.prototype, "city_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], CityMaster.prototype, "city_code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], CityMaster.prototype, "description", void 0);
+exports.CityMaster = CityMaster = __decorate([
+    (0, typeorm_1.Entity)({ name: 'city_master' }),
+    __metadata("design:paramtypes", [String])
+], CityMaster);

package/dist/models/DutyMissionRequestModel.d.ts

@@ -61,5 +61,6 @@ export declare class DutyMissionRequests extends BaseModel {
     vehicle_required: VehicleRequired | null;
     remarks: string | null;
     decision_number: 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, trip_type: TripType, choose_type: ChooseType, mission_sponsored_by: MissionSponsoredBy, mission_purpose: string, mission_number: string, mission_start_date: Date, mission_end_date: Date, travelling_area_from: string, travelling_area_to: string, from_country: string, to_country: string, travel_place: string, travel_start_date: Date, travel_return_date: Date, status: DutyMissionStatus, request_id?: string | null, mission_id?: string | null, mission_days?: number | null, distance?: string | null, if_sponsored?: string | null, allowance_percentage?: string | null, air_ticket_required?: AirTicketRequired | null, vehicle_required?: VehicleRequired | null, remarks?: string | null, decision_number?: string | null, workflow_execution_id?: string | null);
+    decision_date: Date | null;
+    constructor(req_user_department_id: number | null, req_user_section_id: number | null, service_id: number, sub_service_id: number, user_id: number, trip_type: TripType, choose_type: ChooseType, mission_sponsored_by: MissionSponsoredBy, mission_purpose: string, mission_number: string, mission_start_date: Date, mission_end_date: Date, travelling_area_from: string, travelling_area_to: string, from_country: string, to_country: string, travel_place: string, travel_start_date: Date, travel_return_date: Date, status: DutyMissionStatus, request_id?: string | null, mission_id?: string | null, mission_days?: number | null, distance?: string | null, if_sponsored?: string | null, allowance_percentage?: string | null, air_ticket_required?: AirTicketRequired | null, vehicle_required?: VehicleRequired | null, remarks?: string | null, decision_number?: string | null, decision_date?: Date | null, workflow_execution_id?: string | null);
 }

package/dist/models/DutyMissionRequestModel.js

@@ -49,7 +49,7 @@ var DutyMissionStatus;
     DutyMissionStatus["REJECTED"] = "Rejected";
 })(DutyMissionStatus || (exports.DutyMissionStatus = DutyMissionStatus = {}));
 let DutyMissionRequests = class DutyMissionRequests extends BaseModel_1.BaseModel {
-    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, trip_type, choose_type, mission_sponsored_by, mission_purpose, mission_number, mission_start_date, mission_end_date, travelling_area_from, travelling_area_to, from_country, to_country, travel_place, travel_start_date, travel_return_date, status, request_id, mission_id, mission_days, distance, if_sponsored, allowance_percentage, air_ticket_required, vehicle_required, remarks, decision_number, workflow_execution_id) {
+    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, trip_type, choose_type, mission_sponsored_by, mission_purpose, mission_number, mission_start_date, mission_end_date, travelling_area_from, travelling_area_to, from_country, to_country, travel_place, travel_start_date, travel_return_date, status, request_id, mission_id, mission_days, distance, if_sponsored, allowance_percentage, air_ticket_required, vehicle_required, remarks, decision_number, decision_date, workflow_execution_id) {
         super();
         this.req_user_department_id = req_user_department_id ?? null;
         this.req_user_section_id = req_user_section_id ?? null;
@@ -81,6 +81,7 @@ let DutyMissionRequests = class DutyMissionRequests extends BaseModel_1.BaseMode
         this.vehicle_required = vehicle_required ?? null;
         this.remarks = remarks ?? null;
         this.decision_number = decision_number ?? null;
+        this.decision_date = decision_date ?? null;
         this.workflow_execution_id = workflow_execution_id ?? null;
     }
 };
@@ -126,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);
@@ -138,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);
@@ -159,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([
@@ -175,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([
@@ -187,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([
@@ -234,9 +235,13 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", Object)
 ], DutyMissionRequests.prototype, "decision_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
+    __metadata("design:type", Object)
+], DutyMissionRequests.prototype, "decision_date", void 0);
 exports.DutyMissionRequests = DutyMissionRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'duty_mission_requests' }),
     __metadata("design:paramtypes", [Object, Object, Number, Number, Number, String, String, String, String, String, Date,
         Date, String, String, String, String, String, Date,
-        Date, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
+        Date, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
 ], DutyMissionRequests);

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

package/src/data-source.ts

@@ -126,6 +126,7 @@ import { CashAllowanceLeaveRequest } from './models/CashAllowanceLeaveRequestMod
 import { PromotionRequest } from './models/PromotionRequestModel';
 import { AnnualIncrementRequest } from './models/AnnualIncrementRequestModel';
 import { SkillsEnhancementRequest } from './models/SkillsEnhancementRequestModel';
+import { CityMaster } from './models/CityMasterModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -258,6 +259,7 @@ export const AppDataSource = new DataSource({
     CashAllowanceLeaveRequest,
     PromotionRequest,
     AnnualIncrementRequest,
-    SkillsEnhancementRequest
+    SkillsEnhancementRequest,
+    CityMaster
   ],
 });

package/src/index.ts

@@ -202,6 +202,9 @@ export {NewResourceRequestStatus} from './models/NewResourceRequestModel';
 // Country Master
 export * from './models/CountryMasterModel';
 
+// City Master
+export * from './models/CityMasterModel';
+
 // Location Master
 export * from './models/LocationModel';
 

package/src/models/CityMasterModel.ts

@@ -0,0 +1,22 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'city_master' })
+export class CityMaster extends BaseModel {
+  @Column({ type: 'int', nullable: true })
+  country_id: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  city_name: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  city_code: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  description: string | null;
+
+  constructor(city_name: string) {
+    super();
+    this.city_name = city_name;
+  }
+}

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 })
@@ -160,6 +160,9 @@ export class DutyMissionRequests extends BaseModel {
   @Column({ type: 'varchar', length: 100, nullable: true })
   decision_number: string | null;
 
+  @Column({ type: 'timestamp', nullable: true })
+  decision_date: Date | null;
+
   constructor(
     req_user_department_id: number | null,
     req_user_section_id: number | null,
@@ -191,6 +194,7 @@ export class DutyMissionRequests extends BaseModel {
     vehicle_required?: VehicleRequired | null,
     remarks?: string | null,
     decision_number?: string | null,
+    decision_date?: Date | null,
     workflow_execution_id?: string | null,
   ) {
     super();
@@ -224,6 +228,7 @@ export class DutyMissionRequests extends BaseModel {
     this.vehicle_required = vehicle_required ?? null;
     this.remarks = remarks ?? null;
     this.decision_number = decision_number ?? null;
+    this.decision_date = decision_date ?? null;
     this.workflow_execution_id = workflow_execution_id ?? null;
   }
 }

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;
+    }
+}
+