@platform-modules/civil-aviation-authority 2.3.174 → 2.3.176

package/.env

@@ -1,12 +1,12 @@
-# DB_HOST=164.52.222.169
-# DB_PORT=5432 
-# DB_USER=postgres_admin_user
-# DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
-# DB_NAME=CAA
+DB_HOST=164.52.222.169
+DB_PORT=5432 
+DB_USER=postgres_admin_user
+DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+DB_NAME=CAA
 
 
-DB_HOST=localhost
-DB_PORT=5432 
-DB_USER=postgres
-DB_PASS=stevejobs
-DB_NAME=CAA
+# DB_HOST=localhost
+# DB_PORT=5432 
+# DB_USER=postgres
+# DB_PASS=stevejobs
+# DB_NAME=CAA

package/dist/data-source.js

@@ -184,11 +184,6 @@ const LegalComplaintWorkflowModel_1 = require("./models/LegalComplaintWorkflowMo
 const LegalComplaintApprovalModel_1 = require("./models/LegalComplaintApprovalModel");
 const LegalComplaintChatModel_1 = require("./models/LegalComplaintChatModel");
 const LegalComplaintAttachmentModel_1 = require("./models/LegalComplaintAttachmentModel");
-const RespondToEnquiriesRequestModel_1 = require("./models/RespondToEnquiriesRequestModel");
-const RespondToEnquiriesWorkflowModel_1 = require("./models/RespondToEnquiriesWorkflowModel");
-const RespondToEnquiriesApprovalModel_1 = require("./models/RespondToEnquiriesApprovalModel");
-const RespondToEnquiriesChatModel_1 = require("./models/RespondToEnquiriesChatModel");
-const RespondToEnquiriesAttachmentModel_1 = require("./models/RespondToEnquiriesAttachmentModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -376,11 +371,6 @@ exports.AppDataSource = new typeorm_1.DataSource({
         DocumentAuditLogModel_1.DocumentAuditLog,
         DocumentVersionModel_1.DocumentVersion,
         DocumentAccessModel_1.DocumentAccess,
-        DepartmentDocumentOwnerModel_1.DepartmentDocumentOwner,
-        RespondToEnquiriesRequestModel_1.RespondToEnquiriesRequest,
-        RespondToEnquiriesWorkflowModel_1.RespondToEnquiriesWorkFlow,
-        RespondToEnquiriesApprovalModel_1.RespondToEnquiriesApprovalDetails,
-        RespondToEnquiriesChatModel_1.RespondToEnquiriesRequestChat,
-        RespondToEnquiriesAttachmentModel_1.RespondToEnquiriesRequestAttachment
+        DepartmentDocumentOwnerModel_1.DepartmentDocumentOwner
     ],
 });

package/dist/index.d.ts

@@ -321,13 +321,3 @@ export * from './models/LegalComplaintChatModel';
 export * from './models/LegalComplaintAttachmentModel';
 export * from './models/AssetApartmentTypeModel';
 export * from './models/AssetUnitLocationModel';
-export * from './models/RespondToEnquiriesRequestModel';
-export { RespondToEnquiriesRequestStatus, RespondToEnquiriesRequest, RespondToEnquiriesEnquiryCategory } from './models/RespondToEnquiriesRequestModel';
-export * from './models/RespondToEnquiriesApprovalModel';
-export { RespondToEnquiriesApprovalStatus, RespondToEnquiriesApprovalDetails } from './models/RespondToEnquiriesApprovalModel';
-export * from './models/RespondToEnquiriesChatModel';
-export { RespondToEnquiriesMessageType, RespondToEnquiriesChatStatus, RespondToEnquiriesRequestChat } from './models/RespondToEnquiriesChatModel';
-export * from './models/RespondToEnquiriesWorkflowModel';
-export { RespondToEnquiriesWorkFlowStatus, RespondToEnquiriesWorkFlow } from './models/RespondToEnquiriesWorkflowModel';
-export * from './models/RespondToEnquiriesAttachmentModel';
-export { RespondToEnquiriesRequestAttachment } from './models/RespondToEnquiriesAttachmentModel';

package/dist/index.js

@@ -16,7 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrainingRoomBookingRequestAttachment = exports.TrainingRoomBookingWorkFlowStatus = exports.TrainingRoomBookingApprovalStatus = exports.TrainingRoomBookingRoomType = exports.TrainingRoomBookingRequestStatus = exports.AnnualTrainingPlanChatStatus = exports.AnnualTrainingPlanMessageType = exports.AnnualTrainingPlanRequestChat = exports.AnnualTrainingPlanRequestAttachment = exports.AnnualTrainingPlanWorkFlowStatus = exports.AnnualTrainingPlanApprovalStatus = exports.AnnualTrainingPlanPlace = exports.AnnualTrainingPlanRequestStatus = exports.StudyLeaveChatStatus = exports.StudyLeaveMessageType = exports.StudyLeaveRequestChat = exports.StudyLeaveRequestAttachment = exports.StudyLeaveWorkFlowStatus = exports.StudyLeaveApprovalStatus = exports.StudyLeaveRequestStatus = exports.TrainingMessageType = exports.TrainingRequestChat = exports.TrainingRequestAttachment = exports.TrainingWorkFlowStatus = exports.TrainingApprovalStatus = exports.TrainingRequestStatus = exports.HrServiceChatStatus = exports.HrServiceMessageType = exports.HrServiceRequestChat = exports.HrServiceRequestAttachment = exports.HrServiceWorkFlowStatus = exports.HrServiceApprovalStatus = exports.HrServiceRequestStatus = exports.CancellationMessageType = exports.CancellationRequestChat = exports.CancellationRequestAttachment = exports.CancellationWorkFlowStatus = exports.CancellationApprovalStatus = exports.EventSupportMessageType = exports.EventSupportRequestChat = exports.EventSupportRequestAttachment = exports.EventSupportWorkFlowStatus = exports.EventSupportApprovalStatus = exports.EventSupportRequestStatus = exports.CancellationRequestStatus = exports.LogisticsVehicleMaintenanceWorkFlowStatus = exports.LogisticsVehicleMaintenanceMessageType = exports.LogisticsVehicleMaintenanceApprovalStatus = exports.VehicleMaintenanceStatus = exports.VehicleMaintenanceType = void 0;
 exports.LegalContractReviewRequestStatus = exports.LegalContractReviewRequest = exports.CyberSecurityRiskImpactedCategory = exports.CyberSecurityRiskManagementRisk = exports.CyberSecurityRiskManagementRequestStatus = exports.CyberSecurityRiskManagementRequest = exports.CyberSecurityAuditApplicationType = exports.CyberSecurityAuditClassification = exports.CyberSecurityAuditRequestStatus = exports.CyberSecurityAuditRequest = exports.RequestForVaptClassification = exports.RequestForVaptType = exports.RequestForVaptStatus = exports.RequestForVaptRequest = exports.InformationSecurityRequestAttachment = exports.InformationSecurityWorkFlow = exports.InformationSecurityWorkFlowStatus = exports.InformationSecurityRequestChat = exports.InformationSecurityChatStatus = exports.InformationSecurityMessageType = exports.InformationSecurityApprovalDetails = exports.InformationSecurityApprovalStatus = exports.RequestForProjectApproval = exports.RequestForProjectApprovalStatus = exports.ShiftAllowanceValue = exports.ShiftAllowanceRequestStatus = exports.AssignTasksEmpMessageType = exports.AssignTasksEmpRequestChat = exports.AssignTasksEmpRequestAttachment = exports.AssignTasksEmpWorkFlowStatus = exports.AssignTasksEmpApprovalStatus = exports.AssignTasksEmpPriority = exports.AssignTasksEmpStatus = exports.RequestForCoverageRequestAttachment = exports.RequestForCoverageChatStatus = exports.RequestForCoverageMessageType = exports.RequestForCoverageRequestChat = exports.RequestForCoverageApprovalStatus = exports.RequestForCoverageWorkFlowStatus = exports.RequestForCoverageNewsSize = exports.RequestForCoverageRequestStatus = exports.ServiceTransferRequestType = exports.SalaryDetailsType = exports.ServiceTransferRequestStatus = exports.TemporaryAssignmentRequestType = exports.TemporaryAssignmentRequestStatus = exports.SecondmentRequestStatus = exports.TrainingRoomBookingChatStatus = exports.TrainingRoomBookingMessageType = exports.TrainingRoomBookingRequestChat = void 0;
-exports.RespondToEnquiriesRequestAttachment = exports.RespondToEnquiriesWorkFlow = exports.RespondToEnquiriesWorkFlowStatus = exports.RespondToEnquiriesRequestChat = exports.RespondToEnquiriesChatStatus = exports.RespondToEnquiriesMessageType = exports.RespondToEnquiriesApprovalDetails = exports.RespondToEnquiriesApprovalStatus = exports.RespondToEnquiriesEnquiryCategory = exports.RespondToEnquiriesRequest = exports.RespondToEnquiriesRequestStatus = exports.DurationUnit = exports.RepeatFrequency = exports.Quarter = exports.HumanResourceAnnualPlanningRequestStatus = exports.PerformanceManagementCyclePeriod = exports.PerformanceManagementRequestStatus = exports.SkillsEnhancementRequestStatus = exports.AnnualIncrementRequestStatus = exports.PromotionRequestStatus = exports.CashAllowanceLeaveRequestStatus = exports.NotificationFrequency = exports.ServicesNotificationTriggerType = exports.NewResourceRequestStatus = exports.JobTransferRequestStatus = exports.AppealAgainstAdministrativeDecisionRequestStatus = exports.AppealAgainstAdministrativeDecisionRequest = exports.LegalContractReviewRequestType = void 0;
+exports.DurationUnit = exports.RepeatFrequency = exports.Quarter = exports.HumanResourceAnnualPlanningRequestStatus = exports.PerformanceManagementCyclePeriod = exports.PerformanceManagementRequestStatus = exports.SkillsEnhancementRequestStatus = exports.AnnualIncrementRequestStatus = exports.PromotionRequestStatus = exports.CashAllowanceLeaveRequestStatus = exports.NotificationFrequency = exports.ServicesNotificationTriggerType = exports.NewResourceRequestStatus = exports.JobTransferRequestStatus = exports.AppealAgainstAdministrativeDecisionRequestStatus = exports.AppealAgainstAdministrativeDecisionRequest = exports.LegalContractReviewRequestType = void 0;
 __exportStar(require("./models/user"), exports);
 __exportStar(require("./models/role"), exports);
 __exportStar(require("./models/user-sessions"), exports);
@@ -486,25 +486,3 @@ __exportStar(require("./models/LegalComplaintAttachmentModel"), exports);
 // Asset Affairs Admin Configuration
 __exportStar(require("./models/AssetApartmentTypeModel"), exports);
 __exportStar(require("./models/AssetUnitLocationModel"), exports);
-// Tender — Request a Service to Respond to Enquiries
-__exportStar(require("./models/RespondToEnquiriesRequestModel"), exports);
-var RespondToEnquiriesRequestModel_1 = require("./models/RespondToEnquiriesRequestModel");
-Object.defineProperty(exports, "RespondToEnquiriesRequestStatus", { enumerable: true, get: function () { return RespondToEnquiriesRequestModel_1.RespondToEnquiriesRequestStatus; } });
-Object.defineProperty(exports, "RespondToEnquiriesRequest", { enumerable: true, get: function () { return RespondToEnquiriesRequestModel_1.RespondToEnquiriesRequest; } });
-Object.defineProperty(exports, "RespondToEnquiriesEnquiryCategory", { enumerable: true, get: function () { return RespondToEnquiriesRequestModel_1.RespondToEnquiriesEnquiryCategory; } });
-__exportStar(require("./models/RespondToEnquiriesApprovalModel"), exports);
-var RespondToEnquiriesApprovalModel_1 = require("./models/RespondToEnquiriesApprovalModel");
-Object.defineProperty(exports, "RespondToEnquiriesApprovalStatus", { enumerable: true, get: function () { return RespondToEnquiriesApprovalModel_1.RespondToEnquiriesApprovalStatus; } });
-Object.defineProperty(exports, "RespondToEnquiriesApprovalDetails", { enumerable: true, get: function () { return RespondToEnquiriesApprovalModel_1.RespondToEnquiriesApprovalDetails; } });
-__exportStar(require("./models/RespondToEnquiriesChatModel"), exports);
-var RespondToEnquiriesChatModel_1 = require("./models/RespondToEnquiriesChatModel");
-Object.defineProperty(exports, "RespondToEnquiriesMessageType", { enumerable: true, get: function () { return RespondToEnquiriesChatModel_1.RespondToEnquiriesMessageType; } });
-Object.defineProperty(exports, "RespondToEnquiriesChatStatus", { enumerable: true, get: function () { return RespondToEnquiriesChatModel_1.RespondToEnquiriesChatStatus; } });
-Object.defineProperty(exports, "RespondToEnquiriesRequestChat", { enumerable: true, get: function () { return RespondToEnquiriesChatModel_1.RespondToEnquiriesRequestChat; } });
-__exportStar(require("./models/RespondToEnquiriesWorkflowModel"), exports);
-var RespondToEnquiriesWorkflowModel_1 = require("./models/RespondToEnquiriesWorkflowModel");
-Object.defineProperty(exports, "RespondToEnquiriesWorkFlowStatus", { enumerable: true, get: function () { return RespondToEnquiriesWorkflowModel_1.RespondToEnquiriesWorkFlowStatus; } });
-Object.defineProperty(exports, "RespondToEnquiriesWorkFlow", { enumerable: true, get: function () { return RespondToEnquiriesWorkflowModel_1.RespondToEnquiriesWorkFlow; } });
-__exportStar(require("./models/RespondToEnquiriesAttachmentModel"), exports);
-var RespondToEnquiriesAttachmentModel_1 = require("./models/RespondToEnquiriesAttachmentModel");
-Object.defineProperty(exports, "RespondToEnquiriesRequestAttachment", { enumerable: true, get: function () { return RespondToEnquiriesAttachmentModel_1.RespondToEnquiriesRequestAttachment; } });

package/dist/models/ScholarshipApprovalModel.d.ts

@@ -12,6 +12,11 @@ export declare class ScholarshipApprovalDetails extends BaseModel {
     level: number;
     /** Matches workflow_hierarchy.step_order / scholarship_workflows.step_order for this approval row */
     workflow_step_order: number | null;
+    /**
+     * Conductor taskReferenceName for this approval step (set at request create).
+     * Approve API uses this to complete the correct HUMAN task for every level without guessing.
+     */
+    conductor_task_reference_name: string | null;
     approver_role_id: number | null;
     department_id: number | null;
     section_id: number | null;

package/dist/models/ScholarshipApprovalModel.js

@@ -42,6 +42,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Object)
 ], ScholarshipApprovalDetails.prototype, "workflow_step_order", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], ScholarshipApprovalDetails.prototype, "conductor_task_reference_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Object)

package/dist/models/ScholarshipRequestModel.d.ts

@@ -23,6 +23,8 @@ export declare class ScholarshipRequests extends BaseModel {
     type: ScholarshipType;
     /** Planned-flow only: whether amount exceeds threshold; Unplanned rows store null. */
     is_amount_more_than_tenthousand: "Yes" | "No" | null;
+    amount: string | null;
+    currency_type: string | null;
     reason: string | null;
     description: string | null;
     start_date: string | null;

package/dist/models/ScholarshipRequestModel.js

@@ -69,6 +69,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 10, nullable: true }),
     __metadata("design:type", Object)
 ], ScholarshipRequests.prototype, "is_amount_more_than_tenthousand", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], ScholarshipRequests.prototype, "amount", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], ScholarshipRequests.prototype, "currency_type", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "text", nullable: true }),
     __metadata("design:type", Object)

package/package.json

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

package/src/data-source.ts

@@ -182,11 +182,6 @@ import { LegalComplaintWorkflow } from './models/LegalComplaintWorkflowModel';
 import { LegalComplaintApproval } from './models/LegalComplaintApprovalModel';
 import { LegalComplaintChat } from './models/LegalComplaintChatModel';
 import { LegalComplaintAttachment } from './models/LegalComplaintAttachmentModel';
-import {RespondToEnquiriesRequest} from './models/RespondToEnquiriesRequestModel';
-import { RespondToEnquiriesWorkFlow } from './models/RespondToEnquiriesWorkflowModel';
-import { RespondToEnquiriesApprovalDetails } from './models/RespondToEnquiriesApprovalModel';
-import { RespondToEnquiriesRequestChat } from './models/RespondToEnquiriesChatModel';
-import { RespondToEnquiriesRequestAttachment } from './models/RespondToEnquiriesAttachmentModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -375,11 +370,6 @@ export const AppDataSource = new DataSource({
     DocumentAuditLog,
     DocumentVersion,
     DocumentAccess,
-    DepartmentDocumentOwner,
-    RespondToEnquiriesRequest,
-    RespondToEnquiriesWorkFlow,
-    RespondToEnquiriesApprovalDetails,
-    RespondToEnquiriesRequestChat,
-    RespondToEnquiriesRequestAttachment
+    DepartmentDocumentOwner
   ],
 });

package/src/index.ts

@@ -391,23 +391,3 @@ export * from './models/LegalComplaintAttachmentModel';
 // Asset Affairs Admin Configuration
 export * from './models/AssetApartmentTypeModel';
 export * from './models/AssetUnitLocationModel';
-
-// Tender — Request a Service to Respond to Enquiries
-export * from './models/RespondToEnquiriesRequestModel';
-export {
-    RespondToEnquiriesRequestStatus,
-    RespondToEnquiriesRequest,
-    RespondToEnquiriesEnquiryCategory
-} from './models/RespondToEnquiriesRequestModel';
-export * from './models/RespondToEnquiriesApprovalModel';
-export {RespondToEnquiriesApprovalStatus, RespondToEnquiriesApprovalDetails} from './models/RespondToEnquiriesApprovalModel';
-export * from './models/RespondToEnquiriesChatModel';
-export {
-    RespondToEnquiriesMessageType,
-    RespondToEnquiriesChatStatus,
-    RespondToEnquiriesRequestChat
-} from './models/RespondToEnquiriesChatModel';
-export * from './models/RespondToEnquiriesWorkflowModel';
-export {RespondToEnquiriesWorkFlowStatus, RespondToEnquiriesWorkFlow} from './models/RespondToEnquiriesWorkflowModel';
-export * from './models/RespondToEnquiriesAttachmentModel';
-export {RespondToEnquiriesRequestAttachment} from './models/RespondToEnquiriesAttachmentModel';

package/src/models/AccommodationApprovalModel.ts

@@ -35,14 +35,14 @@ export class AccommodationApproval extends BaseModel {
     @Column({ type: 'int', nullable: true })
     department_id: number;
 
-    @Column({ type: 'int', nullable: true })
-    section_id: number;
-
-    @Column({ type: 'boolean', nullable: false, default: true })
-    is_allowed: boolean;
-
-    @Column({ type: 'int', nullable: false })
-    level: number;
+    @Column({ type: 'int', nullable: true })
+    section_id: number;
+
+    @Column({ type: 'boolean', nullable: false, default: true })
+    is_allowed: boolean;
+
+    @Column({ type: 'int', nullable: false })
+    level: number;
 
     @Column({ 
         type: 'enum', 

package/src/models/AccommodationRequestModel.ts

@@ -134,14 +134,14 @@ export class AccommodationRequest extends BaseModel {
     @Column({ type: 'int', nullable: true })
     assigned_to_user_id: number | null;
 
-    @Column({ type: 'text', nullable: true })
-    approver_comment: string | null;
-
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    accommodation_allocated: string | null;
-
-    @Column({ type: 'int', nullable: true })
-    approved_by: number | null;
+    @Column({ type: 'text', nullable: true })
+    approver_comment: string | null;
+
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    accommodation_allocated: string | null;
+
+    @Column({ type: 'int', nullable: true })
+    approved_by: number | null;
 
     @Column({ type: 'date', nullable: true })
     approved_at: Date | null;

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/AppealAgainstAdministrativeDecisionRequestModel.ts

@@ -75,29 +75,29 @@ export class AppealAgainstAdministrativeDecisionRequest extends BaseModel {
     @Column({ type: "text", nullable: false })
     decision_subject: string;
 
-    @Column({ type: "text", nullable: false })
-    grievance_details: string;
-
-    @Column({ type: "jsonb", nullable: true })
-    individuals_involved: string[] | null;
-
-    @Column({ type: "jsonb", nullable: true })
-    times: string[] | null;
-
-    @Column({ type: "date", nullable: true })
-    dates: Date | null;
-
-    @Column({ type: "text", nullable: true })
-    location: string | null;
-
-    @Column({ type: "jsonb", nullable: true })
-    requests: string[] | null;
-
-    @Column({ type: "jsonb", nullable: true })
-    events: string[] | null;
-
-    @Column({ type: "varchar", length: 500, nullable: false })
-    grievant_name: string;
+    @Column({ type: "text", nullable: false })
+    grievance_details: string;
+
+    @Column({ type: "jsonb", nullable: true })
+    individuals_involved: string[] | null;
+
+    @Column({ type: "jsonb", nullable: true })
+    times: string[] | null;
+
+    @Column({ type: "date", nullable: true })
+    dates: Date | null;
+
+    @Column({ type: "text", nullable: true })
+    location: string | null;
+
+    @Column({ type: "jsonb", nullable: true })
+    requests: string[] | null;
+
+    @Column({ type: "jsonb", nullable: true })
+    events: string[] | null;
+
+    @Column({ type: "varchar", length: 500, nullable: false })
+    grievant_name: string;
 
     @Column({ type: "varchar", length: 100, nullable: false })
     grievant_employee_number: string;

package/src/models/CAAServices.ts

@@ -8,36 +8,36 @@ export class CAAServices extends BaseModel {
     @Column({ type: 'varchar', length: 64, nullable: false, unique: true })
     code: string;
 
-    @Column({ nullable: false })
-    name: string;
-
-    @Column({ type: "text", nullable: true })
-    arabic_name: string | null;
-
-    @Column({ nullable: false })
-    description: string;
-
-    @Column({ type: "text", nullable: true })
-    arabic_description: string | null;
-
-    @Column({ nullable: true })
-    logo_url: string;
-
-
-    constructor(     
-        name: string,
-        description: string,
-        arabic_name?: string | null,
-        arabic_description?: string | null,
-        code?: string,
-        logo_url?: string
-    ) {
-        super();     
-        this.name = name;
-        this.description = description;
-        this.arabic_name = arabic_name || null;
-        this.arabic_description = arabic_description || null;
-        this.code = code || '';
-        this.logo_url = logo_url || '';
-    }
-}
+    @Column({ nullable: false })
+    name: string;
+
+    @Column({ type: "text", nullable: true })
+    arabic_name: string | null;
+
+    @Column({ nullable: false })
+    description: string;
+
+    @Column({ type: "text", nullable: true })
+    arabic_description: string | null;
+
+    @Column({ nullable: true })
+    logo_url: string;
+
+
+    constructor(     
+        name: string,
+        description: string,
+        arabic_name?: string | null,
+        arabic_description?: string | null,
+        code?: string,
+        logo_url?: string
+    ) {
+        super();     
+        this.name = name;
+        this.description = description;
+        this.arabic_name = arabic_name || null;
+        this.arabic_description = arabic_description || null;
+        this.code = code || '';
+        this.logo_url = logo_url || '';
+    }
+}