@platform-modules/civil-aviation-authority 2.3.97 → 2.3.99

package/dist/models/HousingContractRenewalRequestModel.js

@@ -0,0 +1,107 @@
+"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.HousingContractRenewalRequest = exports.HousingContractRenewalRequestStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var HousingContractRenewalRequestStatus;
+(function (HousingContractRenewalRequestStatus) {
+    HousingContractRenewalRequestStatus["Pending"] = "Pending";
+    HousingContractRenewalRequestStatus["Approved"] = "Approved";
+    HousingContractRenewalRequestStatus["Rejected"] = "Rejected";
+    HousingContractRenewalRequestStatus["RFC"] = "RFC";
+})(HousingContractRenewalRequestStatus || (exports.HousingContractRenewalRequestStatus = HousingContractRenewalRequestStatus = {}));
+let HousingContractRenewalRequest = class HousingContractRenewalRequest extends BaseModel_1.BaseModel {
+    constructor() {
+        super();
+    }
+};
+exports.HousingContractRenewalRequest = HousingContractRenewalRequest;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 20, nullable: false }),
+    __metadata("design:type", String)
+], HousingContractRenewalRequest.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], HousingContractRenewalRequest.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], HousingContractRenewalRequest.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: false }),
+    __metadata("design:type", String)
+], HousingContractRenewalRequest.prototype, "requested_unit_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: false }),
+    __metadata("design:type", String)
+], HousingContractRenewalRequest.prototype, "current_unit_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", String)
+], HousingContractRenewalRequest.prototype, "location_of_unit", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
+    __metadata("design:type", Date)
+], HousingContractRenewalRequest.prototype, "current_contract_start_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
+    __metadata("design:type", Date)
+], HousingContractRenewalRequest.prototype, "current_contract_end_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: false }),
+    __metadata("design:type", String)
+], HousingContractRenewalRequest.prototype, "requested_renewal_duration", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], HousingContractRenewalRequest.prototype, "family_size", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: false }),
+    __metadata("design:type", String)
+], HousingContractRenewalRequest.prototype, "reason_for_renewal", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], HousingContractRenewalRequest.prototype, "comment", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 20, nullable: false, default: 'Pending' }),
+    __metadata("design:type", String)
+], HousingContractRenewalRequest.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], HousingContractRenewalRequest.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", String)
+], HousingContractRenewalRequest.prototype, "workflow_execution_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], HousingContractRenewalRequest.prototype, "created_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], HousingContractRenewalRequest.prototype, "approved_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Date)
+], HousingContractRenewalRequest.prototype, "approved_at", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], HousingContractRenewalRequest.prototype, "approver_comment", void 0);
+exports.HousingContractRenewalRequest = HousingContractRenewalRequest = __decorate([
+    (0, typeorm_1.Entity)({ name: 'housing_contract_renewal_requests' }),
+    __metadata("design:paramtypes", [])
+], HousingContractRenewalRequest);

package/dist/models/HousingContractRenewalWorkflowModel.d.ts

@@ -0,0 +1,25 @@
+import { BaseModel } from "./BaseModel";
+export declare enum HousingContractRenewalWorkFlowStatus {
+    Pending = "Pending",
+    InProgress = "In Progress",
+    Approved = "Approved",
+    Rejected = "Rejected",
+    RFC = "RFC"
+}
+export declare class HousingContractRenewalWorkflow extends BaseModel {
+    request_id: number;
+    service_id: number;
+    sub_service_id: number;
+    workflow_definition_id: number;
+    current_level: number;
+    content: string;
+    status: string;
+    step_order: number;
+    user_id: number;
+    role_id: number;
+    department_id: number;
+    section_id: number;
+    workflow_data: string;
+    created_by: number;
+    constructor();
+}

package/dist/models/HousingContractRenewalWorkflowModel.js

@@ -0,0 +1,88 @@
+"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.HousingContractRenewalWorkflow = exports.HousingContractRenewalWorkFlowStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var HousingContractRenewalWorkFlowStatus;
+(function (HousingContractRenewalWorkFlowStatus) {
+    HousingContractRenewalWorkFlowStatus["Pending"] = "Pending";
+    HousingContractRenewalWorkFlowStatus["InProgress"] = "In Progress";
+    HousingContractRenewalWorkFlowStatus["Approved"] = "Approved";
+    HousingContractRenewalWorkFlowStatus["Rejected"] = "Rejected";
+    HousingContractRenewalWorkFlowStatus["RFC"] = "RFC";
+})(HousingContractRenewalWorkFlowStatus || (exports.HousingContractRenewalWorkFlowStatus = HousingContractRenewalWorkFlowStatus = {}));
+let HousingContractRenewalWorkflow = class HousingContractRenewalWorkflow extends BaseModel_1.BaseModel {
+    constructor() {
+        super();
+    }
+};
+exports.HousingContractRenewalWorkflow = HousingContractRenewalWorkflow;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], HousingContractRenewalWorkflow.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], HousingContractRenewalWorkflow.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], HousingContractRenewalWorkflow.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], HousingContractRenewalWorkflow.prototype, "workflow_definition_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], HousingContractRenewalWorkflow.prototype, "current_level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", String)
+], HousingContractRenewalWorkflow.prototype, "content", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: false }),
+    __metadata("design:type", String)
+], HousingContractRenewalWorkflow.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], HousingContractRenewalWorkflow.prototype, "step_order", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], HousingContractRenewalWorkflow.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], HousingContractRenewalWorkflow.prototype, "role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], HousingContractRenewalWorkflow.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], HousingContractRenewalWorkflow.prototype, "section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], HousingContractRenewalWorkflow.prototype, "workflow_data", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], HousingContractRenewalWorkflow.prototype, "created_by", void 0);
+exports.HousingContractRenewalWorkflow = HousingContractRenewalWorkflow = __decorate([
+    (0, typeorm_1.Entity)({ name: 'housing_contract_renewal_workflow' }),
+    __metadata("design:paramtypes", [])
+], HousingContractRenewalWorkflow);

package/dist/models/PermissionModel.d.ts

@@ -0,0 +1,18 @@
+import { Role } from './role';
+import { UUIDBaseModel } from './UUIDBaseModel';
+export declare enum PermissionType {
+    VIEW = "view",
+    UPLOAD = "upload",
+    UPDATE = "update",
+    DELETE = "delete",
+    PUBLISH = "publish"
+}
+export declare class Permission extends UUIDBaseModel {
+    name: string;
+    code: string;
+    type: PermissionType;
+    description?: string;
+    is_active: boolean;
+    roles: Role[];
+    constructor(name: string, code: string, type: PermissionType, created_by: string, description?: string, is_active?: boolean);
+}

package/dist/models/PermissionModel.js

@@ -0,0 +1,68 @@
+"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.Permission = exports.PermissionType = void 0;
+const typeorm_1 = require("typeorm");
+const role_1 = require("./role");
+const UUIDBaseModel_1 = require("./UUIDBaseModel");
+var PermissionType;
+(function (PermissionType) {
+    PermissionType["VIEW"] = "view";
+    PermissionType["UPLOAD"] = "upload";
+    PermissionType["UPDATE"] = "update";
+    PermissionType["DELETE"] = "delete";
+    PermissionType["PUBLISH"] = "publish";
+})(PermissionType || (exports.PermissionType = PermissionType = {}));
+let Permission = class Permission extends UUIDBaseModel_1.UUIDBaseModel {
+    constructor(name, code, type, created_by, description, is_active = true) {
+        super();
+        this.name = name;
+        this.code = code;
+        this.type = type;
+        this.created_by = created_by;
+        this.description = description;
+        this.is_active = is_active;
+    }
+};
+exports.Permission = Permission;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, unique: true }),
+    __metadata("design:type", String)
+], Permission.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, unique: true }),
+    __metadata("design:type", String)
+], Permission.prototype, "code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'enum', enum: PermissionType }),
+    __metadata("design:type", String)
+], Permission.prototype, "type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], Permission.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
+    __metadata("design:type", Boolean)
+], Permission.prototype, "is_active", void 0);
+__decorate([
+    (0, typeorm_1.ManyToMany)(() => role_1.Role),
+    (0, typeorm_1.JoinTable)({
+        name: 'role_permissions',
+        joinColumn: { name: 'permission_id', referencedColumnName: 'id' },
+        inverseJoinColumn: { name: 'role_id', referencedColumnName: 'id' },
+    }),
+    __metadata("design:type", Array)
+], Permission.prototype, "roles", void 0);
+exports.Permission = Permission = __decorate([
+    (0, typeorm_1.Entity)({ name: 'permissions' }),
+    __metadata("design:paramtypes", [String, String, String, String, String, Boolean])
+], Permission);

package/dist/models/UUIDBaseModel.d.ts

@@ -0,0 +1,14 @@
+export declare abstract class UUIDModel0 {
+    jsonIgnore: string[];
+    created_by?: string;
+    created_at?: Date;
+    updated_by?: string;
+    updated_at?: Date;
+    insertCreated(): void;
+    is_deleted?: boolean;
+    constructor();
+}
+export declare abstract class UUIDBaseModel extends UUIDModel0 {
+    id: string;
+    constructor();
+}

package/dist/models/UUIDBaseModel.js

@@ -0,0 +1,66 @@
+"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);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UUIDBaseModel = exports.UUIDModel0 = void 0;
+const moment_timezone_1 = __importDefault(require("moment-timezone"));
+const typeorm_1 = require("typeorm");
+class UUIDModel0 {
+    insertCreated() {
+        const currentTime = (0, moment_timezone_1.default)().utc().tz('Asia/Kolkata').toDate();
+        this.created_at = currentTime;
+        this.updated_at = currentTime;
+    }
+    constructor() {
+        this.jsonIgnore = ['logicalDelete', 'is_deleted', 'jsonIgnore'];
+        this.is_deleted = false;
+    }
+}
+exports.UUIDModel0 = UUIDModel0;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'uuid', nullable: true }),
+    __metadata("design:type", String)
+], UUIDModel0.prototype, "created_by", void 0);
+__decorate([
+    (0, typeorm_1.CreateDateColumn)({ type: "timestamptz", default: () => "CURRENT_TIMESTAMP" }),
+    __metadata("design:type", Date)
+], UUIDModel0.prototype, "created_at", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'uuid', nullable: true }),
+    __metadata("design:type", String)
+], UUIDModel0.prototype, "updated_by", void 0);
+__decorate([
+    (0, typeorm_1.UpdateDateColumn)({ type: "timestamptz", default: () => "CURRENT_TIMESTAMP" }),
+    __metadata("design:type", Date)
+], UUIDModel0.prototype, "updated_at", void 0);
+__decorate([
+    (0, typeorm_1.BeforeInsert)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], UUIDModel0.prototype, "insertCreated", null);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true, default: false }),
+    __metadata("design:type", Boolean)
+], UUIDModel0.prototype, "is_deleted", void 0);
+class UUIDBaseModel extends UUIDModel0 {
+    constructor() {
+        super();
+        this.id = ''; // This will be set by the database when the entity is saved
+    }
+}
+exports.UUIDBaseModel = UUIDBaseModel;
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
+    __metadata("design:type", String)
+], UUIDBaseModel.prototype, "id", void 0);

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
- "version": "2.3.97",
+ "version": "2.3.99",
  "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

@@ -265,4 +265,18 @@ export * from './models/ResidentialUnitRentalRequestModel';
 export * from './models/ResidentialUnitRentalWorkflowModel';
 export * from './models/ResidentialUnitRentalApprovalModel';
 export * from './models/ResidentialUnitRentalChatModel';
-export * from './models/ResidentialUnitRentalAttachmentModel';
+export * from './models/ResidentialUnitRentalAttachmentModel';
+
+// Housing Contract Renewal (CAA042)
+export * from './models/HousingContractRenewalRequestModel';
+export * from './models/HousingContractRenewalWorkflowModel';
+export * from './models/HousingContractRenewalApprovalModel';
+export * from './models/HousingContractRenewalChatModel';
+export * from './models/HousingContractRenewalAttachmentModel';
+
+// Housing Contract Cancel
+export * from './models/HousingContractCancelRequestModel';
+export * from './models/HousingContractCancelWorkflowModel';
+export * from './models/HousingContractCancelApprovalModel';
+export * from './models/HousingContractCancelChatModel';
+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;