@platform-modules/civil-aviation-authority 2.3.100 → 2.3.101

package/.env

@@ -8,7 +8,5 @@
 DB_HOST=localhost
 DB_PORT=5432 
 DB_USER=postgres
-DB_PASS=admin123
-DB_NAME=CAA
-
-TYPEORM_DATABASE_SYNC=true 
+DB_PASS=stevejobs
+DB_NAME=CAA

package/dist/index.d.ts

@@ -208,6 +208,7 @@ export * from './models/SkillsEnhancementRequestModel';
 export { SkillsEnhancementRequestStatus } from './models/SkillsEnhancementRequestModel';
 export * from './models/PerformanceManagementRequestModel';
 export { PerformanceManagementRequestStatus, PerformanceManagementCyclePeriod } from './models/PerformanceManagementRequestModel';
+export * from './models/PerformanceManagementRequestGoalModel';
 export * from './models/PerformanceCyclePeriodModel';
 export * from './models/PerformanceGoalMasterModel';
 export * from './models/HumanResourceAnnualPlanningRequestModel';

package/dist/index.js

@@ -317,6 +317,7 @@ __exportStar(require("./models/PerformanceManagementRequestModel"), exports);
 var PerformanceManagementRequestModel_1 = require("./models/PerformanceManagementRequestModel");
 Object.defineProperty(exports, "PerformanceManagementRequestStatus", { enumerable: true, get: function () { return PerformanceManagementRequestModel_1.PerformanceManagementRequestStatus; } });
 Object.defineProperty(exports, "PerformanceManagementCyclePeriod", { enumerable: true, get: function () { return PerformanceManagementRequestModel_1.PerformanceManagementCyclePeriod; } });
+__exportStar(require("./models/PerformanceManagementRequestGoalModel"), exports);
 __exportStar(require("./models/PerformanceCyclePeriodModel"), exports);
 __exportStar(require("./models/PerformanceGoalMasterModel"), exports);
 // Human Resource Annual Planning Service

package/dist/models/ITApprovalSettings.d.ts

@@ -0,0 +1,7 @@
+import { BaseModel } from './BaseModel';
+export declare class ITApprovalSettings extends BaseModel {
+    level: number;
+    approval_role_id: number;
+    workflow_id: number;
+    constructor(level: number, approval_role_id: number, workflow_id: number);
+}

package/dist/models/ITApprovalSettings.js

@@ -0,0 +1,40 @@
+"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.ITApprovalSettings = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ITApprovalSettings = class ITApprovalSettings extends BaseModel_1.BaseModel {
+    constructor(level, approval_role_id, workflow_id) {
+        super();
+        this.level = level;
+        this.approval_role_id = approval_role_id;
+        this.workflow_id = workflow_id;
+    }
+};
+exports.ITApprovalSettings = ITApprovalSettings;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], ITApprovalSettings.prototype, "level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], ITApprovalSettings.prototype, "approval_role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], ITApprovalSettings.prototype, "workflow_id", void 0);
+exports.ITApprovalSettings = ITApprovalSettings = __decorate([
+    (0, typeorm_1.Entity)({ name: 'it_approval_settings' }),
+    (0, typeorm_1.Unique)(['workflow_id', 'level']),
+    __metadata("design:paramtypes", [Number, Number, Number])
+], ITApprovalSettings);

package/dist/models/ITServicesTypesMuscatModel.d.ts

@@ -0,0 +1,6 @@
+import { BaseModel } from './BaseModel';
+export declare class ITServicesTypesMuscat extends BaseModel {
+    name: string;
+    name_in_arabic: string;
+    constructor(name: string, name_in_arabic: string);
+}

package/dist/models/ITServicesTypesMuscatModel.js

@@ -0,0 +1,34 @@
+"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.ITServicesTypesMuscat = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ITServicesTypesMuscat = class ITServicesTypesMuscat extends BaseModel_1.BaseModel {
+    constructor(name, name_in_arabic) {
+        super();
+        this.name = name;
+        this.name_in_arabic = name_in_arabic;
+    }
+};
+exports.ITServicesTypesMuscat = ITServicesTypesMuscat;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], ITServicesTypesMuscat.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], ITServicesTypesMuscat.prototype, "name_in_arabic", void 0);
+exports.ITServicesTypesMuscat = ITServicesTypesMuscat = __decorate([
+    (0, typeorm_1.Entity)({ name: 'it_services_types_muscat' }),
+    __metadata("design:paramtypes", [String, String])
+], ITServicesTypesMuscat);

package/dist/models/ITServicesTypesSalalahModel.d.ts

@@ -0,0 +1,6 @@
+import { BaseModel } from './BaseModel';
+export declare class ITServicesTypesSalalah extends BaseModel {
+    name: string;
+    name_in_arabic: string;
+    constructor(name: string, name_in_arabic: string);
+}

package/dist/models/ITServicesTypesSalalahModel.js

@@ -0,0 +1,34 @@
+"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.ITServicesTypesSalalah = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ITServicesTypesSalalah = class ITServicesTypesSalalah extends BaseModel_1.BaseModel {
+    constructor(name, name_in_arabic) {
+        super();
+        this.name = name;
+        this.name_in_arabic = name_in_arabic;
+    }
+};
+exports.ITServicesTypesSalalah = ITServicesTypesSalalah;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], ITServicesTypesSalalah.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], ITServicesTypesSalalah.prototype, "name_in_arabic", void 0);
+exports.ITServicesTypesSalalah = ITServicesTypesSalalah = __decorate([
+    (0, typeorm_1.Entity)({ name: 'it_services_types_salalah' }),
+    __metadata("design:paramtypes", [String, String])
+], ITServicesTypesSalalah);

package/dist/models/PerformanceManagementRequestGoalModel.d.ts

@@ -0,0 +1,9 @@
+import { BaseModel } from "./BaseModel";
+export declare class PerformanceManagementRequestGoal extends BaseModel {
+    request_id: number;
+    goal_title: string;
+    goal_id: string;
+    goal_description: string;
+    goal_weight: number;
+    constructor(request_id?: number, goal_title?: string, goal_id?: string, goal_description?: string, goal_weight?: number);
+}

package/dist/models/PerformanceManagementRequestGoalModel.js

@@ -0,0 +1,50 @@
+"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.PerformanceManagementRequestGoal = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let PerformanceManagementRequestGoal = class PerformanceManagementRequestGoal extends BaseModel_1.BaseModel {
+    constructor(request_id, goal_title, goal_id, goal_description, goal_weight) {
+        super();
+        this.request_id = request_id || 0;
+        this.goal_title = goal_title || "";
+        this.goal_id = goal_id || "";
+        this.goal_description = goal_description || "";
+        this.goal_weight = goal_weight || 0;
+    }
+};
+exports.PerformanceManagementRequestGoal = PerformanceManagementRequestGoal;
+__decorate([
+    (0, typeorm_1.Index)("idx_pm_request_goals_request_id"),
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], PerformanceManagementRequestGoal.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
+    __metadata("design:type", String)
+], PerformanceManagementRequestGoal.prototype, "goal_title", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: false }),
+    __metadata("design:type", String)
+], PerformanceManagementRequestGoal.prototype, "goal_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: false }),
+    __metadata("design:type", String)
+], PerformanceManagementRequestGoal.prototype, "goal_description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false, default: 0 }),
+    __metadata("design:type", Number)
+], PerformanceManagementRequestGoal.prototype, "goal_weight", void 0);
+exports.PerformanceManagementRequestGoal = PerformanceManagementRequestGoal = __decorate([
+    (0, typeorm_1.Entity)({ name: "performance_management_request_goals" }),
+    __metadata("design:paramtypes", [Number, String, String, String, Number])
+], PerformanceManagementRequestGoal);

package/dist/models/PerformanceManagementRequestModel.d.ts

@@ -24,11 +24,7 @@ export declare class PerformanceManagementRequest extends BaseModel {
     assigned_at: Date | null;
     workflow_execution_id: string | null;
     description: string | null;
-    goal_title: string;
-    goal_id: string;
-    goal_description: string;
     cycle_period: PerformanceManagementCyclePeriod;
-    goal_weight: number;
     cycle_year: number | null;
-    constructor(user_id: number, status?: PerformanceManagementRequestStatus, 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, goal_title?: string, goal_id?: string, goal_description?: string, cycle_period?: PerformanceManagementCyclePeriod, goal_weight?: number, cycle_year?: number | null);
+    constructor(user_id: number, status?: PerformanceManagementRequestStatus, 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, cycle_period?: PerformanceManagementCyclePeriod, cycle_year?: number | null);
 }

package/dist/models/PerformanceManagementRequestModel.js

@@ -27,7 +27,7 @@ var PerformanceManagementCyclePeriod;
     PerformanceManagementCyclePeriod["JUL_DEC"] = "Jul-Dec";
 })(PerformanceManagementCyclePeriod || (exports.PerformanceManagementCyclePeriod = PerformanceManagementCyclePeriod = {}));
 let PerformanceManagementRequest = class PerformanceManagementRequest extends BaseModel_1.BaseModel {
-    constructor(user_id, status = PerformanceManagementRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, description, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, goal_title, goal_id, goal_description, cycle_period, goal_weight, cycle_year) {
+    constructor(user_id, status = PerformanceManagementRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, description, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, cycle_period, cycle_year) {
         super();
         this.user_id = user_id;
         this.status = status;
@@ -41,11 +41,7 @@ let PerformanceManagementRequest = class PerformanceManagementRequest extends Ba
         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.goal_title = goal_title || "";
-        this.goal_id = goal_id || "";
-        this.goal_description = goal_description || "";
         this.cycle_period = cycle_period || PerformanceManagementCyclePeriod.JAN_JUN;
-        this.goal_weight = goal_weight || 0;
         this.cycle_year = cycle_year || null;
     }
 };
@@ -98,31 +94,15 @@ __decorate([
     (0, typeorm_1.Column)({ type: "text", nullable: true }),
     __metadata("design:type", Object)
 ], PerformanceManagementRequest.prototype, "description", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
-    __metadata("design:type", String)
-], PerformanceManagementRequest.prototype, "goal_title", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: false }),
-    __metadata("design:type", String)
-], PerformanceManagementRequest.prototype, "goal_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "text", nullable: false }),
-    __metadata("design:type", String)
-], PerformanceManagementRequest.prototype, "goal_description", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "enum", enum: PerformanceManagementCyclePeriod, nullable: false }),
     __metadata("design:type", String)
 ], PerformanceManagementRequest.prototype, "cycle_period", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: false, default: 0 }),
-    __metadata("design:type", Number)
-], PerformanceManagementRequest.prototype, "goal_weight", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Object)
 ], PerformanceManagementRequest.prototype, "cycle_year", void 0);
 exports.PerformanceManagementRequest = PerformanceManagementRequest = __decorate([
     (0, typeorm_1.Entity)({ name: "performance_management_requests" }),
-    __metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, String, String, String, Number, Object])
+    __metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, Object])
 ], PerformanceManagementRequest);

package/dist/models/Workflows.d.ts

@@ -0,0 +1,9 @@
+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/dist/models/Workflows.js

@@ -0,0 +1,31 @@
+"use strict";
+// import { Column, Entity, Unique } from "typeorm";
+// import { BaseModel } from './BaseModel';
+// @Entity({ name: 'workflows' })
+// @Unique(['service_id', 'sub_service_id', 'request_for'])
+// export class Workflows extends BaseModel {
+//     @Column({ type: 'varchar', length: 100, nullable: false })
+//     name: string;
+//     @Column({ type: 'bigint', nullable: false })
+//     service_id: number;
+//     @Column({ type: 'bigint', nullable: false })
+//     sub_service_id: number;
+//     @Column({ type: 'varchar', length: 20, nullable: false })
+//     request_for: string; // 'Self' | 'Behalf of' | 'Internal'
+//     @Column({ type: 'int', nullable: false })
+//     levels: number;
+//     constructor(
+//         name: string,
+//         service_id: number,
+//         sub_service_id: number,
+//         request_for: string,
+//         levels: number,
+//     ) {
+//         super();
+//         this.name = name;
+//         this.service_id = service_id;
+//         this.sub_service_id = sub_service_id;
+//         this.request_for = request_for;
+//         this.levels = levels;
+//     }
+// }

package/package.json

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

package/src/data-source.ts

@@ -128,11 +128,11 @@ import { RequestForCoverageWorkFlow } from './models/RequestForCoverageWorkflowM
 import { RequestForCoverageApprovalDetails } from './models/RequestForCoverageApprovalModel';
 import { RequestForCoverageRequestChat } from './models/RequestForCoverageChatModel';
 import { RequestForCoverageRequestAttachment } from './models/RequestForCoverageAttachmentModel';
-import { CashAllowanceLeaveRequest } from './models/CashAllowanceLeaveRequestModel';
-import { PromotionRequest } from './models/PromotionRequestModel';
-import { AnnualIncrementRequest } from './models/AnnualIncrementRequestModel';
-import { AnnualIncrementRequestEmployee } from './models/AnnualIncrementRequestEmployeeModel';
-import { SkillsEnhancementRequest } from './models/SkillsEnhancementRequestModel';
+import { CashAllowanceLeaveRequest } from './models/CashAllowanceLeaveRequestModel';
+import { PromotionRequest } from './models/PromotionRequestModel';
+import { AnnualIncrementRequest } from './models/AnnualIncrementRequestModel';
+import { AnnualIncrementRequestEmployee } from './models/AnnualIncrementRequestEmployeeModel';
+import { SkillsEnhancementRequest } from './models/SkillsEnhancementRequestModel';
 import { CityMaster } from './models/CityMasterModel';
 import { ResidentialUnitRentalRequest } from './models/ResidentialUnitRentalRequestModel';
 import { ResidentialUnitRentalWorkflow } from './models/ResidentialUnitRentalWorkflowModel';
@@ -268,11 +268,11 @@ export const AppDataSource = new DataSource({
     AssignTasksEmpWorkFlow,
     AssignTasksEmpRequestAttachment,
     AssignTasksEmpRequestChat,
-    CashAllowanceLeaveRequest,
-    PromotionRequest,
-    AnnualIncrementRequest,
-    AnnualIncrementRequestEmployee,
-    SkillsEnhancementRequest,
+    CashAllowanceLeaveRequest,
+    PromotionRequest,
+    AnnualIncrementRequest,
+    AnnualIncrementRequestEmployee,
+    SkillsEnhancementRequest,
     CityMaster,
     ResidentialUnitRentalRequest,
     ResidentialUnitRentalWorkflow,

package/src/index.ts

@@ -240,11 +240,12 @@ export * from './models/AnnualIncrementRequestEmployeeModel';
 export * from './models/SkillsEnhancementRequestModel';
 export { SkillsEnhancementRequestStatus } from './models/SkillsEnhancementRequestModel';
 
-// Performance Management Service
-export * from './models/PerformanceManagementRequestModel';
-export { PerformanceManagementRequestStatus, PerformanceManagementCyclePeriod } from './models/PerformanceManagementRequestModel';
-export * from './models/PerformanceCyclePeriodModel';
-export * from './models/PerformanceGoalMasterModel';
+// Performance Management Service
+export * from './models/PerformanceManagementRequestModel';
+export { PerformanceManagementRequestStatus, PerformanceManagementCyclePeriod } from './models/PerformanceManagementRequestModel';
+export * from './models/PerformanceManagementRequestGoalModel';
+export * from './models/PerformanceCyclePeriodModel';
+export * from './models/PerformanceGoalMasterModel';
 
 // Human Resource Annual Planning Service
 export * from './models/HumanResourceAnnualPlanningRequestModel';
@@ -279,4 +280,4 @@ export * from './models/HousingContractCancelRequestModel';
 export * from './models/HousingContractCancelWorkflowModel';
 export * from './models/HousingContractCancelApprovalModel';
 export * from './models/HousingContractCancelChatModel';
-export * from './models/HousingContractCancelAttachmentModel';
+export * from './models/HousingContractCancelAttachmentModel';

package/src/models/AnnualIncrementRequestEmployeeModel.ts

@@ -1,65 +1,65 @@
-import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
-import { BaseModel } from "./BaseModel";
-import { AnnualIncrementRequest } from "./AnnualIncrementRequestModel";
-
-@Entity({ name: "annual_increment_request_employees" })
-export class AnnualIncrementRequestEmployee extends BaseModel {
-    @Column({ type: "integer", nullable: false })
-    request_id: number;
-
-    @Column({ type: "integer", nullable: true })
-    service_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    sub_service_id: number | null;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    employee_name: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    employee_id: string;
-
-    @Column({ type: "integer", nullable: false })
-    allowance_year: number;
-
-    @Column({ type: "date", nullable: false })
-    effective_date: Date;
-
-    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
-    current_basic_salary: number | null;
-
-    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
-    increment_percentage: number | null;
-
-    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
-    new_basic_salary: number | null;
-
-    @ManyToOne(() => AnnualIncrementRequest, { onDelete: "CASCADE" })
-    @JoinColumn({ name: "request_id", referencedColumnName: "id" })
-    request: AnnualIncrementRequest;
-
-    constructor(
-        request_id: number,
-        employee_name: string,
-        employee_id: string,
-        allowance_year: number,
-        effective_date: Date,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        current_basic_salary?: number | null,
-        increment_percentage?: number | null,
-        new_basic_salary?: number | null
-    ) {
-        super();
-        this.request_id = request_id;
-        this.service_id = service_id ?? null;
-        this.sub_service_id = sub_service_id ?? null;
-        this.employee_name = employee_name;
-        this.employee_id = employee_id;
-        this.allowance_year = allowance_year;
-        this.effective_date = effective_date;
-        this.current_basic_salary = current_basic_salary ?? null;
-        this.increment_percentage = increment_percentage ?? null;
-        this.new_basic_salary = new_basic_salary ?? null;
-    }
-}
+import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import { AnnualIncrementRequest } from "./AnnualIncrementRequestModel";
+
+@Entity({ name: "annual_increment_request_employees" })
+export class AnnualIncrementRequestEmployee extends BaseModel {
+    @Column({ type: "integer", nullable: false })
+    request_id: number;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    employee_name: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    employee_id: string;
+
+    @Column({ type: "integer", nullable: false })
+    allowance_year: number;
+
+    @Column({ type: "date", nullable: false })
+    effective_date: Date;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    current_basic_salary: number | null;
+
+    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
+    increment_percentage: number | null;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    new_basic_salary: number | null;
+
+    @ManyToOne(() => AnnualIncrementRequest, { onDelete: "CASCADE" })
+    @JoinColumn({ name: "request_id", referencedColumnName: "id" })
+    request: AnnualIncrementRequest;
+
+    constructor(
+        request_id: number,
+        employee_name: string,
+        employee_id: string,
+        allowance_year: number,
+        effective_date: Date,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        current_basic_salary?: number | null,
+        increment_percentage?: number | null,
+        new_basic_salary?: number | null
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id ?? null;
+        this.sub_service_id = sub_service_id ?? null;
+        this.employee_name = employee_name;
+        this.employee_id = employee_id;
+        this.allowance_year = allowance_year;
+        this.effective_date = effective_date;
+        this.current_basic_salary = current_basic_salary ?? null;
+        this.increment_percentage = increment_percentage ?? null;
+        this.new_basic_salary = new_basic_salary ?? null;
+    }
+}

package/src/models/AnnualIncrementRequestModel.ts

@@ -45,24 +45,24 @@ export class AnnualIncrementRequest extends BaseModel {
     @Column({ type: "timestamp", nullable: true })
     assigned_at: Date | null;
 
-    @Column({ type: "varchar", length: 255, nullable: true })
-    workflow_execution_id: string | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    reference_number: string | null;
-
+    @Column({ type: "varchar", length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    reference_number: string | null;
+
     // Annual Increment specific fields
-    @Column({ type: "varchar", length: 255, nullable: true })
-    employee_name: string | null;
-
-    @Column({ type: "varchar", length: 100, nullable: true })
-    employee_id: string | null;
-
-    @Column({ type: "integer", nullable: true })
-    allowance_year: number | null;
-
-    @Column({ type: "date", nullable: true })
-    effective_date: Date | null;
+    @Column({ type: "varchar", length: 255, nullable: true })
+    employee_name: string | null;
+
+    @Column({ type: "varchar", length: 100, nullable: true })
+    employee_id: string | null;
+
+    @Column({ type: "integer", nullable: true })
+    allowance_year: number | null;
+
+    @Column({ type: "date", nullable: true })
+    effective_date: Date | null;
 
     @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
     current_basic_salary: number | null;
@@ -104,14 +104,14 @@ export class AnnualIncrementRequest extends BaseModel {
         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.reference_number = null;
-        this.employee_name = employee_name || null;
-        this.employee_id = employee_id || null;
-        this.allowance_year = allowance_year || null;
-        this.effective_date = effective_date || 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.reference_number = null;
+        this.employee_name = employee_name || null;
+        this.employee_id = employee_id || null;
+        this.allowance_year = allowance_year || null;
+        this.effective_date = effective_date || null;
         this.current_basic_salary = current_basic_salary || null;
         this.increment_percentage = increment_percentage || null;
         this.new_basic_salary = new_basic_salary || null;

package/src/models/CashAllowanceLeaveRequestModel.ts

@@ -45,12 +45,12 @@ export class CashAllowanceLeaveRequest extends BaseModel {
     @Column({ type: "timestamp", nullable: true })
     assigned_at: Date | null;
 
-    @Column({ type: "varchar", length: 255, nullable: true })
-    workflow_execution_id: string | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    reference_number: string | null;
-
+    @Column({ type: "varchar", length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    reference_number: string | null;
+
     // Cash Allowance for Leave specific fields
     @Column({ type: "varchar", length: 255, nullable: false })
     employee_name: string;
@@ -112,11 +112,11 @@ export class CashAllowanceLeaveRequest extends BaseModel {
         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.reference_number = null;
-        this.employee_name = employee_name || "";
+        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.reference_number = null;
+        this.employee_name = employee_name || "";
         this.employee_id = employee_id || "";
         this.job_title = job_title || "";
         this.salary_grade = salary_grade || "";