@platform-modules/civil-aviation-authority 2.3.32 → 2.3.34

package/.env

@@ -1,12 +1,17 @@
-# DB_HOST=164.52.222.169
-# DB_PORT=5432 
-# DB_USER=postgres_admin_user
-# DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+# DB_HOST=localhost
+# DB_PORT=5433
+# DB_USER=postgres
+# DB_PASS=123
 # DB_NAME=CAA
 
+DB_HOST=164.52.222.169
+DB_PORT=5432
+DB_USER=postgres_admin_user
+DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+DB_NAME=CAA
 
-DB_HOST=localhost
-DB_PORT=5432 
-DB_USER=postgres
-DB_PASS=stevejobs
-DB_NAME=CAA
+# DB_HOST=216.48.187.46
+# DB_PORT=5432
+# DB_USER=adminuser
+# DB_PASS=postgres_caa_fm_qa_34567
+# DB_NAME=CAA_QA

package/dist/index.d.ts

@@ -181,7 +181,3 @@ export { AssignTasksEmpWorkFlowStatus } from './models/AssignTasksEmpWorkflowMod
 export { AssignTasksEmpRequestAttachment } from './models/AssignTasksEmpAttachmentModel';
 export { AssignTasksEmpRequestChat } from './models/AssignTasksEmpChatModel';
 export { AssignTasksEmpMessageType } from './models/AssignTasksEmpChatModel';
-export * from './models/ShiftAllowanceRequestModel';
-export { ShiftAllowanceRequestStatus, ShiftAllowanceValue } from './models/ShiftAllowanceRequestModel';
-export * from './models/JobTransferRequestModel';
-export { JobTransferRequestStatus } from './models/JobTransferRequestModel';

package/dist/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestForCoverageWorkFlowStatus = exports.RequestForCoverageNewsSize = exports.RequestForCoverageRequestStatus = exports.ServiceTransferRequestType = exports.SalaryDetailsType = exports.ServiceTransferRequestStatus = exports.TemporaryAssignmentRequestType = exports.TemporaryAssignmentRequestStatus = exports.SecondmentRequestStatus = exports.TrainingRoomBookingChatStatus = exports.TrainingRoomBookingMessageType = exports.TrainingRoomBookingRequestChat = 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.LogisticsVehicleMaintenanceWorkFlowStatus = exports.LogisticsVehicleMaintenanceMessageType = exports.LogisticsVehicleMaintenanceApprovalStatus = exports.VehicleMaintenanceStatus = exports.VehicleMaintenanceType = void 0;
-exports.JobTransferRequestStatus = 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 = void 0;
+exports.AssignTasksEmpMessageType = exports.AssignTasksEmpRequestChat = exports.AssignTasksEmpRequestAttachment = exports.AssignTasksEmpWorkFlowStatus = exports.AssignTasksEmpApprovalStatus = exports.AssignTasksEmpPriority = exports.AssignTasksEmpStatus = exports.RequestForCoverageRequestAttachment = exports.RequestForCoverageChatStatus = exports.RequestForCoverageMessageType = exports.RequestForCoverageRequestChat = exports.RequestForCoverageApprovalStatus = void 0;
 __exportStar(require("./models/user"), exports);
 __exportStar(require("./models/role"), exports);
 __exportStar(require("./models/user-sessions"), exports);
@@ -265,11 +265,3 @@ var AssignTasksEmpChatModel_1 = require("./models/AssignTasksEmpChatModel");
 Object.defineProperty(exports, "AssignTasksEmpRequestChat", { enumerable: true, get: function () { return AssignTasksEmpChatModel_1.AssignTasksEmpRequestChat; } });
 var AssignTasksEmpChatModel_2 = require("./models/AssignTasksEmpChatModel");
 Object.defineProperty(exports, "AssignTasksEmpMessageType", { enumerable: true, get: function () { return AssignTasksEmpChatModel_2.AssignTasksEmpMessageType; } });
-__exportStar(require("./models/ShiftAllowanceRequestModel"), exports);
-var ShiftAllowanceRequestModel_1 = require("./models/ShiftAllowanceRequestModel");
-Object.defineProperty(exports, "ShiftAllowanceRequestStatus", { enumerable: true, get: function () { return ShiftAllowanceRequestModel_1.ShiftAllowanceRequestStatus; } });
-Object.defineProperty(exports, "ShiftAllowanceValue", { enumerable: true, get: function () { return ShiftAllowanceRequestModel_1.ShiftAllowanceValue; } });
-// Job Transfer (Transfer from One Job to Another Job Nature) Service
-__exportStar(require("./models/JobTransferRequestModel"), exports);
-var JobTransferRequestModel_1 = require("./models/JobTransferRequestModel");
-Object.defineProperty(exports, "JobTransferRequestStatus", { enumerable: true, get: function () { return JobTransferRequestModel_1.JobTransferRequestStatus; } });

package/dist/models/LogisticsForeignVehicleModel.js

@@ -96,7 +96,6 @@ __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
         enum: Foreign_Vehicle_Required_Location,
-        enumName: 'foreign_vehicle_required_location_en',
         default: Foreign_Vehicle_Required_Location.INSIDE,
         nullable: false,
     }),

package/dist/models/LogisticsVehicleMaintenanceRequestModel.js

@@ -73,7 +73,6 @@ __decorate([
         type: "enum",
         enum: VehicleMaintenanceType,
         nullable: false,
-        default: VehicleMaintenanceType.CORRECTIVE
     }),
     __metadata("design:type", String)
 ], LogisticsVehicleMaintenanceRequests.prototype, "type_of_maintenance_required", void 0);

package/dist/models/Workflows.d.ts

@@ -1,9 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class Workflows extends BaseModel {
-    name: string;
-    service_id: number;
-    sub_service_id: number;
-    request_for: string;
-    levels: number;
-    constructor(name: string, service_id: number, sub_service_id: number, request_for: string, levels: number);
-}

package/dist/models/roleRightsModel.d.ts

@@ -1,16 +1,13 @@
-/** *
-@author
-Amnet Digital
-@date
-2024-05-20
-@Model
-Role
-@usage
-Userrole Information will store
-*/
+/**
+ * @author Amnet Digital
+ * @date 2024-05-20
+ * @Model RoleRights
+ * @usage Stores role rights/permissions for user roles, mapping services and sub-services that a role can access
+ */
 import { BaseModel } from './BaseModel';
 export declare class RoleRights extends BaseModel {
-    user_role_id: number;
+    user_role_id: number | null;
     service_id: number;
-    constructor(user_role_id: number, service_id: number);
+    sub_service_ids: number[] | null;
+    constructor(user_role_id?: number | null, service_id?: number, sub_service_ids?: number[] | null);
 }

package/dist/models/roleRightsModel.js

@@ -1,14 +1,10 @@
 "use strict";
-/** *
-@author
-Amnet Digital
-@date
-2024-05-20
-@Model
-Role
-@usage
-Userrole Information will store
-*/
+/**
+ * @author Amnet Digital
+ * @date 2024-05-20
+ * @Model RoleRights
+ * @usage Stores role rights/permissions for user roles, mapping services and sub-services that a role can access
+ */
 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);
@@ -23,22 +19,27 @@ exports.RoleRights = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let RoleRights = class RoleRights extends BaseModel_1.BaseModel {
-    constructor(user_role_id, service_id) {
+    constructor(user_role_id, service_id, sub_service_ids) {
         super();
-        this.user_role_id = user_role_id;
-        this.service_id = service_id;
+        this.user_role_id = user_role_id ?? null;
+        this.service_id = service_id ?? 0;
+        this.sub_service_ids = sub_service_ids ?? null;
     }
 };
 exports.RoleRights = RoleRights;
 __decorate([
     (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
-    __metadata("design:type", Number)
+    __metadata("design:type", Object)
 ], RoleRights.prototype, "user_role_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
     __metadata("design:type", Number)
 ], RoleRights.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', array: true, nullable: true }),
+    __metadata("design:type", Object)
+], RoleRights.prototype, "sub_service_ids", void 0);
 exports.RoleRights = RoleRights = __decorate([
     (0, typeorm_1.Entity)({ name: 'role_rights' }),
-    __metadata("design:paramtypes", [Number, Number])
+    __metadata("design:paramtypes", [Object, Number, Object])
 ], RoleRights);

package/package.json

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

package/src/index.ts

@@ -185,10 +185,3 @@ export {AssignTasksEmpWorkFlowStatus} from './models/AssignTasksEmpWorkflowModel
 export {AssignTasksEmpRequestAttachment} from './models/AssignTasksEmpAttachmentModel';
 export {AssignTasksEmpRequestChat} from './models/AssignTasksEmpChatModel';
 export {AssignTasksEmpMessageType} from './models/AssignTasksEmpChatModel';
-
-export * from './models/ShiftAllowanceRequestModel';
-export {ShiftAllowanceRequestStatus, ShiftAllowanceValue} from './models/ShiftAllowanceRequestModel';
-
-// Job Transfer (Transfer from One Job to Another Job Nature) Service
-export * from './models/JobTransferRequestModel';
-export {JobTransferRequestStatus} from './models/JobTransferRequestModel';

package/src/models/HrServiceRequestModel.ts

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

package/src/models/LogisticsForeignVehicleModel.ts

@@ -57,7 +57,6 @@ export class LogisticsForeignVehicleRequests extends BaseModel {
   @Column({
     type: "enum",
     enum: Foreign_Vehicle_Required_Location,
-    enumName: 'foreign_vehicle_required_location_en',
     default: Foreign_Vehicle_Required_Location.INSIDE,
     nullable: false,
   })

package/src/models/LogisticsVehicleMaintenanceRequestModel.ts

@@ -40,7 +40,6 @@ export class LogisticsVehicleMaintenanceRequests extends BaseModel {
     type: "enum",
     enum: VehicleMaintenanceType,
     nullable: false,
-    default:VehicleMaintenanceType.CORRECTIVE
   })
   type_of_maintenance_required: VehicleMaintenanceType;
 

package/src/models/roleRightsModel.ts

@@ -1,13 +1,9 @@
-/** *
-@author
-Amnet Digital
-@date
-2024-05-20
-@Model 
-Role
-@usage
-Userrole Information will store 
-*/
+/**
+ * @author Amnet Digital
+ * @date 2024-05-20
+ * @Model RoleRights
+ * @usage Stores role rights/permissions for user roles, mapping services and sub-services that a role can access
+ */
 
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
@@ -17,16 +13,19 @@ import { BaseModel } from './BaseModel';
 export class RoleRights extends BaseModel {
 
     @Column({ type: 'bigint', nullable: true })
-    user_role_id: number;
+    user_role_id: number | null;
 
     @Column({ type: 'bigint', nullable: false })
     service_id: number;
 
+    @Column({ type: 'int', array: true, nullable: true })
+    sub_service_ids: number[] | null;
 
-    constructor(user_role_id: number, service_id: number) {
+    constructor(user_role_id?: number | null, service_id?: number, sub_service_ids?: number[] | null) {
         super();
-        this.user_role_id = user_role_id
-        this.service_id = service_id
+        this.user_role_id = user_role_id ?? null;
+        this.service_id = service_id ?? 0;
+        this.sub_service_ids = sub_service_ids ?? null;
     }
 }
 

package/dist/models/JobTransferRequestModel.d.ts

@@ -1,31 +0,0 @@
-import { BaseModel } from "./BaseModel";
-export declare enum JobTransferRequestStatus {
-    PENDING = "Pending",
-    ASSIGNED = "Assigned",
-    IN_PROGRESS = "In Progress",
-    COMPLETED = "Completed",
-    APPROVED = "Approved",
-    REJECTED = "Rejected"
-}
-export declare class JobTransferRequest extends BaseModel {
-    req_user_department_id: number | null;
-    req_user_section_id: number | null;
-    req_user_position_id: number | null;
-    service_id: number | null;
-    sub_service_id: number | null;
-    user_id: number;
-    description: string | null;
-    status: JobTransferRequestStatus;
-    reviewer_user_id: number | null;
-    assigned_to_user_id: number | null;
-    assigned_at: Date | null;
-    workflow_execution_id: string | null;
-    reason_for_request: string;
-    assigned_employee_name: string;
-    civil_id_card_number: string | null;
-    employee_id: string;
-    current_job_position: string;
-    position_to_be_transferred: string;
-    effective_from_date: Date;
-    constructor(user_id: number, status?: JobTransferRequestStatus, 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, reason_for_request?: string, assigned_employee_name?: string, civil_id_card_number?: string | null, employee_id?: string, current_job_position?: string, position_to_be_transferred?: string, effective_from_date?: Date);
-}

package/dist/models/JobTransferRequestModel.js

@@ -1,128 +0,0 @@
-"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.JobTransferRequest = exports.JobTransferRequestStatus = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-var JobTransferRequestStatus;
-(function (JobTransferRequestStatus) {
-    JobTransferRequestStatus["PENDING"] = "Pending";
-    JobTransferRequestStatus["ASSIGNED"] = "Assigned";
-    JobTransferRequestStatus["IN_PROGRESS"] = "In Progress";
-    JobTransferRequestStatus["COMPLETED"] = "Completed";
-    JobTransferRequestStatus["APPROVED"] = "Approved";
-    JobTransferRequestStatus["REJECTED"] = "Rejected";
-})(JobTransferRequestStatus || (exports.JobTransferRequestStatus = JobTransferRequestStatus = {}));
-let JobTransferRequest = class JobTransferRequest extends BaseModel_1.BaseModel {
-    constructor(user_id, status = JobTransferRequestStatus.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, reason_for_request, assigned_employee_name, civil_id_card_number, employee_id, current_job_position, position_to_be_transferred, effective_from_date) {
-        super();
-        this.user_id = user_id;
-        this.status = status;
-        this.service_id = service_id || null;
-        this.sub_service_id = sub_service_id || null;
-        this.req_user_department_id = req_user_department_id || null;
-        this.req_user_section_id = req_user_section_id || null;
-        this.req_user_position_id = req_user_position_id || null;
-        this.description = description || null;
-        this.reviewer_user_id = reviewer_user_id || null;
-        this.assigned_to_user_id = assigned_to_user_id || null;
-        this.assigned_at = assigned_at || null;
-        this.workflow_execution_id = workflow_execution_id || null;
-        this.reason_for_request = reason_for_request || "";
-        this.assigned_employee_name = assigned_employee_name || "";
-        this.civil_id_card_number = civil_id_card_number || null;
-        this.employee_id = employee_id || "";
-        this.current_job_position = current_job_position || "";
-        this.position_to_be_transferred = position_to_be_transferred || "";
-        this.effective_from_date = effective_from_date || new Date();
-    }
-};
-exports.JobTransferRequest = JobTransferRequest;
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], JobTransferRequest.prototype, "req_user_department_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], JobTransferRequest.prototype, "req_user_section_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], JobTransferRequest.prototype, "req_user_position_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], JobTransferRequest.prototype, "service_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], JobTransferRequest.prototype, "sub_service_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
-    __metadata("design:type", Number)
-], JobTransferRequest.prototype, "user_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "text", nullable: true }),
-    __metadata("design:type", Object)
-], JobTransferRequest.prototype, "description", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "enum", enum: JobTransferRequestStatus, default: JobTransferRequestStatus.PENDING, nullable: false }),
-    __metadata("design:type", String)
-], JobTransferRequest.prototype, "status", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], JobTransferRequest.prototype, "reviewer_user_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], JobTransferRequest.prototype, "assigned_to_user_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "timestamp", nullable: true }),
-    __metadata("design:type", Object)
-], JobTransferRequest.prototype, "assigned_at", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
-    __metadata("design:type", Object)
-], JobTransferRequest.prototype, "workflow_execution_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "text", nullable: false }),
-    __metadata("design:type", String)
-], JobTransferRequest.prototype, "reason_for_request", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
-    __metadata("design:type", String)
-], JobTransferRequest.prototype, "assigned_employee_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 50, nullable: true }),
-    __metadata("design:type", Object)
-], JobTransferRequest.prototype, "civil_id_card_number", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: false }),
-    __metadata("design:type", String)
-], JobTransferRequest.prototype, "employee_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
-    __metadata("design:type", String)
-], JobTransferRequest.prototype, "current_job_position", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
-    __metadata("design:type", String)
-], JobTransferRequest.prototype, "position_to_be_transferred", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "date", nullable: false }),
-    __metadata("design:type", Date)
-], JobTransferRequest.prototype, "effective_from_date", void 0);
-exports.JobTransferRequest = JobTransferRequest = __decorate([
-    (0, typeorm_1.Entity)({ name: "job_transfer_requests" }),
-    __metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, String, Object, String, String, String, Date])
-], JobTransferRequest);

package/dist/models/ShiftAllowanceRequestModel.d.ts

@@ -1,37 +0,0 @@
-import { BaseModel } from "./BaseModel";
-export declare enum ShiftAllowanceRequestStatus {
-    PENDING = "Pending",
-    ASSIGNED = "Assigned",
-    IN_PROGRESS = "In Progress",
-    COMPLETED = "Completed",
-    APPROVED = "Approved",
-    REJECTED = "Rejected"
-}
-export declare enum ShiftAllowanceValue {
-    TWENTY_TWO_PERCENT = "22%",
-    THIRTY_PERCENT = "30%",
-    SEVENTY_PERCENT = "70%"
-}
-export declare class ShiftAllowanceRequest extends BaseModel {
-    req_user_department_id: number | null;
-    req_user_section_id: number | null;
-    req_user_position_id: number | null;
-    service_id: number | null;
-    sub_service_id: number | null;
-    user_id: number;
-    description: string | null;
-    status: ShiftAllowanceRequestStatus;
-    reviewer_user_id: number | null;
-    assigned_to_user_id: number | null;
-    assigned_at: Date | null;
-    workflow_execution_id: string | null;
-    employee_name: string;
-    employee_id: string;
-    job_title: string;
-    financial_grade: string;
-    allowance_value: ShiftAllowanceValue;
-    shift_start_date: Date;
-    shift_end_date: Date;
-    reason_for_request: string | null;
-    constructor(user_id: number, status?: ShiftAllowanceRequestStatus, 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, employee_name?: string, employee_id?: string, job_title?: string, financial_grade?: string, allowance_value?: ShiftAllowanceValue, shift_start_date?: Date, shift_end_date?: Date, reason_for_request?: string | null);
-}

package/dist/models/ShiftAllowanceRequestModel.js

@@ -1,140 +0,0 @@
-"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.ShiftAllowanceRequest = exports.ShiftAllowanceValue = exports.ShiftAllowanceRequestStatus = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-var ShiftAllowanceRequestStatus;
-(function (ShiftAllowanceRequestStatus) {
-    ShiftAllowanceRequestStatus["PENDING"] = "Pending";
-    ShiftAllowanceRequestStatus["ASSIGNED"] = "Assigned";
-    ShiftAllowanceRequestStatus["IN_PROGRESS"] = "In Progress";
-    ShiftAllowanceRequestStatus["COMPLETED"] = "Completed";
-    ShiftAllowanceRequestStatus["APPROVED"] = "Approved";
-    ShiftAllowanceRequestStatus["REJECTED"] = "Rejected";
-})(ShiftAllowanceRequestStatus || (exports.ShiftAllowanceRequestStatus = ShiftAllowanceRequestStatus = {}));
-var ShiftAllowanceValue;
-(function (ShiftAllowanceValue) {
-    ShiftAllowanceValue["TWENTY_TWO_PERCENT"] = "22%";
-    ShiftAllowanceValue["THIRTY_PERCENT"] = "30%";
-    ShiftAllowanceValue["SEVENTY_PERCENT"] = "70%";
-})(ShiftAllowanceValue || (exports.ShiftAllowanceValue = ShiftAllowanceValue = {}));
-let ShiftAllowanceRequest = class ShiftAllowanceRequest extends BaseModel_1.BaseModel {
-    constructor(user_id, status = ShiftAllowanceRequestStatus.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, employee_name, employee_id, job_title, financial_grade, allowance_value, shift_start_date, shift_end_date, reason_for_request) {
-        super();
-        this.user_id = user_id;
-        this.status = status;
-        this.service_id = service_id || null;
-        this.sub_service_id = sub_service_id || null;
-        this.req_user_department_id = req_user_department_id || null;
-        this.req_user_section_id = req_user_section_id || null;
-        this.req_user_position_id = req_user_position_id || null;
-        this.description = description || null;
-        this.reviewer_user_id = reviewer_user_id || null;
-        this.assigned_to_user_id = assigned_to_user_id || null;
-        this.assigned_at = assigned_at || null;
-        this.workflow_execution_id = workflow_execution_id || null;
-        this.employee_name = employee_name || "";
-        this.employee_id = employee_id || "";
-        this.job_title = job_title || "";
-        this.financial_grade = financial_grade || "";
-        this.allowance_value = allowance_value || ShiftAllowanceValue.TWENTY_TWO_PERCENT;
-        this.shift_start_date = shift_start_date || new Date();
-        this.shift_end_date = shift_end_date || new Date();
-        this.reason_for_request = reason_for_request || null;
-    }
-};
-exports.ShiftAllowanceRequest = ShiftAllowanceRequest;
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], ShiftAllowanceRequest.prototype, "req_user_department_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], ShiftAllowanceRequest.prototype, "req_user_section_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], ShiftAllowanceRequest.prototype, "req_user_position_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], ShiftAllowanceRequest.prototype, "service_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], ShiftAllowanceRequest.prototype, "sub_service_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
-    __metadata("design:type", Number)
-], ShiftAllowanceRequest.prototype, "user_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "text", nullable: true }),
-    __metadata("design:type", Object)
-], ShiftAllowanceRequest.prototype, "description", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "enum", enum: ShiftAllowanceRequestStatus, default: ShiftAllowanceRequestStatus.PENDING, nullable: false }),
-    __metadata("design:type", String)
-], ShiftAllowanceRequest.prototype, "status", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], ShiftAllowanceRequest.prototype, "reviewer_user_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], ShiftAllowanceRequest.prototype, "assigned_to_user_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "timestamp", nullable: true }),
-    __metadata("design:type", Object)
-], ShiftAllowanceRequest.prototype, "assigned_at", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
-    __metadata("design:type", Object)
-], ShiftAllowanceRequest.prototype, "workflow_execution_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
-    __metadata("design:type", String)
-], ShiftAllowanceRequest.prototype, "employee_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: false }),
-    __metadata("design:type", String)
-], ShiftAllowanceRequest.prototype, "employee_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
-    __metadata("design:type", String)
-], ShiftAllowanceRequest.prototype, "job_title", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: false }),
-    __metadata("design:type", String)
-], ShiftAllowanceRequest.prototype, "financial_grade", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "enum", enum: ShiftAllowanceValue, nullable: false }),
-    __metadata("design:type", String)
-], ShiftAllowanceRequest.prototype, "allowance_value", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "date", nullable: false }),
-    __metadata("design:type", Date)
-], ShiftAllowanceRequest.prototype, "shift_start_date", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "date", nullable: false }),
-    __metadata("design:type", Date)
-], ShiftAllowanceRequest.prototype, "shift_end_date", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "text", nullable: true }),
-    __metadata("design:type", Object)
-], ShiftAllowanceRequest.prototype, "reason_for_request", void 0);
-exports.ShiftAllowanceRequest = ShiftAllowanceRequest = __decorate([
-    (0, typeorm_1.Entity)({ name: "shift_allowance_requests" }),
-    __metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, String, String, String, String, Date,
-        Date, Object])
-], ShiftAllowanceRequest);

package/src/models/JobTransferRequestModel.ts

@@ -1,115 +0,0 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum JobTransferRequestStatus {
-    PENDING = "Pending",
-    ASSIGNED = "Assigned",
-    IN_PROGRESS = "In Progress",
-    COMPLETED = "Completed",
-    APPROVED = "Approved",
-    REJECTED = "Rejected"
-}
-
-@Entity({ name: "job_transfer_requests" })
-export class JobTransferRequest extends BaseModel {
-    @Column({ type: "integer", nullable: true })
-    req_user_department_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    req_user_section_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    req_user_position_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    service_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    sub_service_id: number | null;
-
-    @Column({ type: "integer", nullable: false })
-    user_id: number;
-
-    @Column({ type: "text", nullable: true })
-    description: string | null;
-
-    @Column({ type: "enum", enum: JobTransferRequestStatus, default: JobTransferRequestStatus.PENDING, nullable: false })
-    status: JobTransferRequestStatus;
-
-    @Column({ type: "integer", nullable: true })
-    reviewer_user_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    assigned_to_user_id: number | null;
-
-    @Column({ type: "timestamp", nullable: true })
-    assigned_at: Date | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    workflow_execution_id: string | null;
-
-    // Job Transfer specific fields
-    @Column({ type: "text", nullable: false })
-    reason_for_request: string;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    assigned_employee_name: string;
-
-    @Column({ type: "varchar", length: 50, nullable: true })
-    civil_id_card_number: string | null;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    employee_id: string;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    current_job_position: string;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    position_to_be_transferred: string;
-
-    @Column({ type: "date", nullable: false })
-    effective_from_date: Date;
-
-    constructor(
-        user_id: number,
-        status: JobTransferRequestStatus = JobTransferRequestStatus.PENDING,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        req_user_department_id?: number | null,
-        req_user_section_id?: number | null,
-        req_user_position_id?: number | null,
-        description?: string | null,
-        reviewer_user_id?: number | null,
-        assigned_to_user_id?: number | null,
-        assigned_at?: Date | null,
-        workflow_execution_id?: string | null,
-        reason_for_request?: string,
-        assigned_employee_name?: string,
-        civil_id_card_number?: string | null,
-        employee_id?: string,
-        current_job_position?: string,
-        position_to_be_transferred?: string,
-        effective_from_date?: Date
-    ) {
-        super();
-        this.user_id = user_id;
-        this.status = status;
-        this.service_id = service_id || null;
-        this.sub_service_id = sub_service_id || null;
-        this.req_user_department_id = req_user_department_id || null;
-        this.req_user_section_id = req_user_section_id || null;
-        this.req_user_position_id = req_user_position_id || null;
-        this.description = description || null;
-        this.reviewer_user_id = reviewer_user_id || null;
-        this.assigned_to_user_id = assigned_to_user_id || null;
-        this.assigned_at = assigned_at || null;
-        this.workflow_execution_id = workflow_execution_id || null;
-        this.reason_for_request = reason_for_request || "";
-        this.assigned_employee_name = assigned_employee_name || "";
-        this.civil_id_card_number = civil_id_card_number || null;
-        this.employee_id = employee_id || "";
-        this.current_job_position = current_job_position || "";
-        this.position_to_be_transferred = position_to_be_transferred || "";
-        this.effective_from_date = effective_from_date || new Date();
-    }
-}

package/src/models/ShiftAllowanceRequestModel.ts

@@ -1,126 +0,0 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum ShiftAllowanceRequestStatus {
-    PENDING = "Pending",
-    ASSIGNED = "Assigned",
-    IN_PROGRESS = "In Progress",
-    COMPLETED = "Completed",
-    APPROVED = "Approved",
-    REJECTED = "Rejected"
-}
-
-export enum ShiftAllowanceValue {
-    TWENTY_TWO_PERCENT = "22%",
-    THIRTY_PERCENT = "30%",
-    SEVENTY_PERCENT = "70%"
-}
-
-@Entity({ name: "shift_allowance_requests" })
-export class ShiftAllowanceRequest extends BaseModel {
-    @Column({ type: "integer", nullable: true })
-    req_user_department_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    req_user_section_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    req_user_position_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    service_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    sub_service_id: number | null;
-
-    @Column({ type: "integer", nullable: false })
-    user_id: number;
-
-    @Column({ type: "text", nullable: true })
-    description: string | null;
-
-    @Column({ type: "enum", enum: ShiftAllowanceRequestStatus, default: ShiftAllowanceRequestStatus.PENDING, nullable: false })
-    status: ShiftAllowanceRequestStatus;
-
-    @Column({ type: "integer", nullable: true })
-    reviewer_user_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    assigned_to_user_id: number | null;
-
-    @Column({ type: "timestamp", nullable: true })
-    assigned_at: Date | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    workflow_execution_id: string | null;
-
-    // Shift Allowance specific fields
-    @Column({ type: "varchar", length: 255, nullable: false })
-    employee_name: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    employee_id: string;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    job_title: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    financial_grade: string;
-
-    @Column({ type: "enum", enum: ShiftAllowanceValue, nullable: false })
-    allowance_value: ShiftAllowanceValue;
-
-    @Column({ type: "date", nullable: false })
-    shift_start_date: Date;
-
-    @Column({ type: "date", nullable: false })
-    shift_end_date: Date;
-
-    @Column({ type: "text", nullable: true })
-    reason_for_request: string | null;
-
-    constructor(
-        user_id: number,
-        status: ShiftAllowanceRequestStatus = ShiftAllowanceRequestStatus.PENDING,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        req_user_department_id?: number | null,
-        req_user_section_id?: number | null,
-        req_user_position_id?: number | null,
-        description?: string | null,
-        reviewer_user_id?: number | null,
-        assigned_to_user_id?: number | null,
-        assigned_at?: Date | null,
-        workflow_execution_id?: string | null,
-        employee_name?: string,
-        employee_id?: string,
-        job_title?: string,
-        financial_grade?: string,
-        allowance_value?: ShiftAllowanceValue,
-        shift_start_date?: Date,
-        shift_end_date?: Date,
-        reason_for_request?: string | null
-    ) {
-        super();
-        this.user_id = user_id;
-        this.status = status;
-        this.service_id = service_id || null;
-        this.sub_service_id = sub_service_id || null;
-        this.req_user_department_id = req_user_department_id || null;
-        this.req_user_section_id = req_user_section_id || null;
-        this.req_user_position_id = req_user_position_id || null;
-        this.description = description || null;
-        this.reviewer_user_id = reviewer_user_id || null;
-        this.assigned_to_user_id = assigned_to_user_id || null;
-        this.assigned_at = assigned_at || null;
-        this.workflow_execution_id = workflow_execution_id || null;
-        this.employee_name = employee_name || "";
-        this.employee_id = employee_id || "";
-        this.job_title = job_title || "";
-        this.financial_grade = financial_grade || "";
-        this.allowance_value = allowance_value || ShiftAllowanceValue.TWENTY_TWO_PERCENT;
-        this.shift_start_date = shift_start_date || new Date();
-        this.shift_end_date = shift_end_date || new Date();
-        this.reason_for_request = reason_for_request || null;
-    }
-}