@platform-modules/foreign-ministry 1.3.161 → 1.3.163

package/.env

@@ -1,5 +1,19 @@
-DB_HOST=localhost
+# DB_HOST=localhost
+# DB_PORT=5433
+# DB_USER=postgres
+# DB_PASS=123
+# DB_NAME=FM
+
+
+
+DB_HOST=164.52.222.169
 DB_PORT=5432
-DB_USER=postgres
-DB_PASS=Fa@123
+DB_USER=postgres_admin_user
+DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
 DB_NAME=FM
+
+# DB_HOST=216.48.187.46
+# DB_PORT=5432
+# DB_USER=adminuser
+# DB_PASS=postgres_caa_fm_qa_34567
+# DB_NAME=FM_QA

package/dist/models/AppointmentAttendeeModel.d.ts

@@ -11,4 +11,6 @@ export declare class AppointmentAttendees extends BaseModel {
     status: AppointmentAttendeeStatus;
     attendee_email: string | null;
     attendee_name: string | null;
+    attendee_mobile: string | null;
+    attendee_position: string | null;
 }

package/dist/models/AppointmentAttendeeModel.js

@@ -42,6 +42,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", Object)
 ], AppointmentAttendees.prototype, "attendee_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], AppointmentAttendees.prototype, "attendee_mobile", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], AppointmentAttendees.prototype, "attendee_position", void 0);
 exports.AppointmentAttendees = AppointmentAttendees = __decorate([
     (0, typeorm_1.Entity)({ name: 'appointment_attendees' })
 ], AppointmentAttendees);

package/dist/models/AppointmentRequestModel.d.ts

@@ -41,6 +41,7 @@ export declare class AppointmentRequests extends BaseModel {
     person_name: string | null;
     contact_number: string | null;
     agenda: string | null;
+    appointment_title: string | null;
     appointment_location: AppointmentLocation | null;
     status: AppointmentRequestStatus;
     workflow_execution_id: string | null;

package/dist/models/AppointmentRequestModel.js

@@ -109,6 +109,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", Object)
 ], AppointmentRequests.prototype, "agenda", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], AppointmentRequests.prototype, "appointment_title", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'enum', enum: AppointmentLocation, nullable: true }),
     __metadata("design:type", Object)

package/dist/models/HelpContentMappedCategoriesModel.d.ts

@@ -0,0 +1,6 @@
+import { BaseModel } from './BaseModel';
+export declare class HelpContentMappedCategories extends BaseModel {
+    help_content_category_Id: number;
+    help_content_Id: number;
+    constructor(help_content_category_Id: number, help_content_Id: number);
+}

package/dist/models/HelpContentMappedCategoriesModel.js

@@ -0,0 +1,34 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HelpContentMappedCategories = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let HelpContentMappedCategories = class HelpContentMappedCategories extends BaseModel_1.BaseModel {
+    constructor(help_content_category_Id, help_content_Id) {
+        super();
+        this.help_content_category_Id = help_content_category_Id,
+            this.help_content_Id = help_content_Id;
+    }
+};
+exports.HelpContentMappedCategories = HelpContentMappedCategories;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Number)
+], HelpContentMappedCategories.prototype, "help_content_category_Id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Number)
+], HelpContentMappedCategories.prototype, "help_content_Id", void 0);
+exports.HelpContentMappedCategories = HelpContentMappedCategories = __decorate([
+    (0, typeorm_1.Entity)({ name: 'help_content_mapped_categories' }),
+    __metadata("design:paramtypes", [Number, Number])
+], HelpContentMappedCategories);

package/dist/models/HelpContentMappedTagsModel.d.ts

@@ -0,0 +1,6 @@
+import { BaseModel } from './BaseModel';
+export declare class HelpContentMappedTags extends BaseModel {
+    help_content_tag_Id: number;
+    help_content_Id: number;
+    constructor(help_content_tag_Id: number, help_content_Id: number);
+}

package/dist/models/HelpContentMappedTagsModel.js

@@ -0,0 +1,34 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HelpContentMappedTags = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let HelpContentMappedTags = class HelpContentMappedTags extends BaseModel_1.BaseModel {
+    constructor(help_content_tag_Id, help_content_Id) {
+        super();
+        this.help_content_tag_Id = help_content_tag_Id,
+            this.help_content_Id = help_content_Id;
+    }
+};
+exports.HelpContentMappedTags = HelpContentMappedTags;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Number)
+], HelpContentMappedTags.prototype, "help_content_tag_Id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Number)
+], HelpContentMappedTags.prototype, "help_content_Id", void 0);
+exports.HelpContentMappedTags = HelpContentMappedTags = __decorate([
+    (0, typeorm_1.Entity)({ name: 'help_content_mapped_tags' }),
+    __metadata("design:paramtypes", [Number, Number])
+], HelpContentMappedTags);

package/dist/models/HelpContentTagsModel.d.ts

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

package/dist/models/HelpContentTagsModel.js

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

package/dist/models/LMSExternalCourseParticipationRequestModel.d.ts

@@ -6,6 +6,10 @@ export declare enum LMSExternalCourseParticipationStatus {
     APPROVED = "Approved",
     REJECTED = "Rejected"
 }
+export declare enum IsExamRequired {
+    YES = "Yes",
+    NO = "No"
+}
 export declare class LMSExternalCourseParticipationRequests extends BaseModel {
     req_user_department_id: number | null;
     department_id: number | null;
@@ -26,4 +30,5 @@ export declare class LMSExternalCourseParticipationRequests extends BaseModel {
     comment: string | null;
     includePoliticalOpinion: string | null;
     course_id: number | null;
+    is_exam_required: IsExamRequired | null;
 }

package/dist/models/LMSExternalCourseParticipationRequestModel.js

@@ -9,7 +9,7 @@ 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.LMSExternalCourseParticipationRequests = exports.LMSExternalCourseParticipationStatus = void 0;
+exports.LMSExternalCourseParticipationRequests = exports.IsExamRequired = exports.LMSExternalCourseParticipationStatus = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 var LMSExternalCourseParticipationStatus;
@@ -20,6 +20,11 @@ var LMSExternalCourseParticipationStatus;
     LMSExternalCourseParticipationStatus["APPROVED"] = "Approved";
     LMSExternalCourseParticipationStatus["REJECTED"] = "Rejected";
 })(LMSExternalCourseParticipationStatus || (exports.LMSExternalCourseParticipationStatus = LMSExternalCourseParticipationStatus = {}));
+var IsExamRequired;
+(function (IsExamRequired) {
+    IsExamRequired["YES"] = "Yes";
+    IsExamRequired["NO"] = "No";
+})(IsExamRequired || (exports.IsExamRequired = IsExamRequired = {}));
 let LMSExternalCourseParticipationRequests = class LMSExternalCourseParticipationRequests extends BaseModel_1.BaseModel {
 };
 exports.LMSExternalCourseParticipationRequests = LMSExternalCourseParticipationRequests;
@@ -99,6 +104,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Object)
 ], LMSExternalCourseParticipationRequests.prototype, "course_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'enum', enum: IsExamRequired, nullable: true }),
+    __metadata("design:type", Object)
+], LMSExternalCourseParticipationRequests.prototype, "is_exam_required", void 0);
 exports.LMSExternalCourseParticipationRequests = LMSExternalCourseParticipationRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'lms_external_course_participation_requests' })
 ], LMSExternalCourseParticipationRequests);

package/dist/models/MeetingAttendeeModel.d.ts

@@ -9,4 +9,8 @@ export declare class MeetingAttendees extends BaseModel {
     attendee_id: number;
     meeting_id: number;
     status: MeetingAttendeeStatus;
+    attendee_email: string | null;
+    attendee_name: string | null;
+    attendee_mobile: string | null;
+    attendee_position: string | null;
 }

package/dist/models/MeetingAttendeeModel.js

@@ -34,6 +34,22 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'enum', enum: MeetingAttendeeStatus, default: MeetingAttendeeStatus.INVITED, nullable: false }),
     __metadata("design:type", String)
 ], MeetingAttendees.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], MeetingAttendees.prototype, "attendee_email", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], MeetingAttendees.prototype, "attendee_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], MeetingAttendees.prototype, "attendee_mobile", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], MeetingAttendees.prototype, "attendee_position", void 0);
 exports.MeetingAttendees = MeetingAttendees = __decorate([
     (0, typeorm_1.Entity)({ name: 'meeting_attendees' })
 ], MeetingAttendees);

package/dist/models/MeetingRequestModel.d.ts

@@ -63,6 +63,7 @@ export declare class MeetingRequests extends BaseModel {
     online_meeting_details: OnlineMeetingDetails | null;
     meeting_link: string | null;
     agenda: string | null;
+    meeting_title: string | null;
     meeting_location: MeetingLocation | null;
     status: MeetingRequestStatus;
     workflow_execution_id: string | null;

package/dist/models/MeetingRequestModel.js

@@ -161,6 +161,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", Object)
 ], MeetingRequests.prototype, "agenda", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], MeetingRequests.prototype, "meeting_title", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'enum', enum: MeetingLocation, nullable: true }),
     __metadata("design:type", Object)

package/dist/models/questionTagsModel.d.ts

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

package/dist/models/questionTagsModel.js

@@ -0,0 +1,34 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QuestionTags = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let QuestionTags = class QuestionTags extends BaseModel_1.BaseModel {
+    constructor(name, question_Id) {
+        super();
+        this.name = name,
+            this.question_Id = question_Id;
+    }
+};
+exports.QuestionTags = QuestionTags;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], QuestionTags.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Number)
+], QuestionTags.prototype, "question_Id", void 0);
+exports.QuestionTags = QuestionTags = __decorate([
+    (0, typeorm_1.Entity)({ name: 'question_tags' }),
+    __metadata("design:paramtypes", [String, Number])
+], QuestionTags);

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/foreign-ministry",
- "version": "1.3.161",
+ "version": "1.3.163",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "scripts": {

package/src/models/AppointmentAttendeeModel.ts

@@ -24,5 +24,11 @@ export class AppointmentAttendees extends BaseModel {
 
   @Column({ type: 'varchar', length: 255, nullable: true })
   attendee_name: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  attendee_mobile: string | null
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  attendee_position: string | null
 }
 

package/src/models/AppointmentRequestModel.ts

@@ -81,6 +81,9 @@ export class AppointmentRequests extends BaseModel {
   @Column({ type: 'text', nullable: true })
   agenda: string | null;
 
+  @Column({ type: 'text', nullable: true })
+  appointment_title: string | null;
+
   @Column({ type: 'enum', enum: AppointmentLocation, nullable: true })
   appointment_location: AppointmentLocation | null;
 

package/src/models/LMSExternalCourseParticipationRequestModel.ts

@@ -9,6 +9,11 @@ export enum LMSExternalCourseParticipationStatus {
   REJECTED = "Rejected"
 }
 
+export enum IsExamRequired {
+  YES = "Yes",
+  NO = "No"
+}
+
 @Entity({ name: 'lms_external_course_participation_requests' })
 export class LMSExternalCourseParticipationRequests extends BaseModel {
 
@@ -69,4 +74,7 @@ export class LMSExternalCourseParticipationRequests extends BaseModel {
 
   @Column({ type: 'int', nullable: true })
   course_id: number | null;
+
+  @Column({ type: 'enum', enum: IsExamRequired, nullable: true })
+  is_exam_required: IsExamRequired | null;
 }

package/src/models/MeetingAttendeeModel.ts

@@ -18,4 +18,16 @@ export class MeetingAttendees extends BaseModel {
 
   @Column({ type: 'enum', enum: MeetingAttendeeStatus, default: MeetingAttendeeStatus.INVITED, nullable: false })
   status: MeetingAttendeeStatus;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  attendee_email: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  attendee_name: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  attendee_mobile: string | null
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  attendee_position: string | null
 }

package/src/models/MeetingRequestModel.ts

@@ -124,6 +124,9 @@ export class MeetingRequests extends BaseModel {
   @Column({ type: 'text', nullable: true })
   agenda: string | null;
 
+  @Column({ type: 'text', nullable: true })
+  meeting_title: string | null;
+
   @Column({ type: 'enum', enum: MeetingLocation, nullable: true })
   meeting_location: MeetingLocation | null;
 

package/src/models/RegisterCandidateRequestModel.ts

@@ -1,177 +1,177 @@
-import { Column, Entity, OneToMany } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { RegisterCandidateExperienceActivity } from './RegisterCandidateExperienceActivityModel';
-
-export enum RegisterCandidateStatus {
-  PENDING = "Pending",
-  ASSIGNED = "Assigned",
-  IN_PROGRESS = "In Progress",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-export enum CandidateStatusType {
-  SELECTED = "Selected",
-  REJECTED = "Rejected",
-  JOINED = "Joined",
-  NOT_JOINED = "Not Joined"
-}
-
-@Entity({ name: 'register_candidate_requests' })
-export class RegisterCandidateRequests extends BaseModel {
-
-  // Common columns from register_vacancy_requests
-  @Column({ type: 'int', nullable: true })
-  req_user_department_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  req_user_section_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: 'int', nullable: false })
-  user_id: number;
-
-  // New columns - Personal Information
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  relationship: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  place_of_birth: string | null;
-
-  @Column({ type: 'date', nullable: true })
-  date_of_birth: Date | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  nationality: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  religion_and_sect: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  sub_religion_and_sect: string | null;
-
-  @Column({ type: 'text', nullable: true })
-  present_residence: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  occupation_and_employer: string | null;
-
-  // Education Information
-  @Column({ type: 'text', nullable: true })
-  type_of_study_specializations_qualification: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  educational_institute: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  education_country: string | null;
-
-  @Column({ type: 'date', nullable: true })
-  education_period_from: Date | null;
-
-  @Column({ type: 'date', nullable: true })
-  education_period_to: Date | null;
-
-  // Note: Employment, Activity, and Charge Information fields have been moved to 
-  // register_candidate_experience_activity table to support multiple experience records
-
-  // First Address
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  address1_country_state: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  address1_street_no: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  address1_road_no: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  address1_flat_building_no: string | null;
-
-  @Column({ type: 'text', nullable: true })
-  address1_po_box_telephone_fax: string | null;
-
-  // Second Address
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  address2_country_state: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  address2_street_no: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  address2_road_no: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  address2_flat_building_no: string | null;
-
-  @Column({ type: 'text', nullable: true })
-  address2_po_box_telephone_fax: string | null;
-
-  // Reference Information
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  reference_full_name: string | null;
-
-  @Column({ type: 'text', nullable: true })
-  reference_address_and_telephone: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  telephone_number: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  reference_employer: string | null;
-
-  // Vacancy Information
-  @Column({ type: 'int', nullable: true })
-  vacancy_id: number | null;
-
-  @Column({ type: 'text', nullable: true })
-  vacancy_description: string | null;
-
-  // Interview Information
-  @Column({ type: 'date', nullable: true })
-  interview_schedule_date: Date | null;
-
-  @Column({ type: 'time', nullable: true })
-  interview_schedule_time: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  interviewer_name: string | null;
-
-  // Candidate Status
-  @Column({ type: 'enum', enum: CandidateStatusType, nullable: true })
-  candidate_status: CandidateStatusType | null;
-
-  @Column({ type: 'date', nullable: true })
-  joining_date: Date | null;
-
-  // Salary Information
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  salary: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  currency: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  expected_salary: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  expected_currency: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  currency_type: string | null;
-
-  @Column({ type: 'enum', enum: RegisterCandidateStatus, default: RegisterCandidateStatus.PENDING, nullable: false })
-  status: RegisterCandidateStatus;
-
-  @Column({ type: 'varchar', nullable: true })
-  workflow_execution_id: string | null;
-
-  @OneToMany(() => RegisterCandidateExperienceActivity, (experienceActivity) => experienceActivity.request)
-  experience_activities: RegisterCandidateExperienceActivity[];
-  
-}
+import { Column, Entity, OneToMany } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { RegisterCandidateExperienceActivity } from './RegisterCandidateExperienceActivityModel';
+
+export enum RegisterCandidateStatus {
+  PENDING = "Pending",
+  ASSIGNED = "Assigned",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+export enum CandidateStatusType {
+  SELECTED = "Selected",
+  REJECTED = "Rejected",
+  JOINED = "Joined",
+  NOT_JOINED = "Not Joined"
+}
+
+@Entity({ name: 'register_candidate_requests' })
+export class RegisterCandidateRequests extends BaseModel {
+
+  // Common columns from register_vacancy_requests
+  @Column({ type: 'int', nullable: true })
+  req_user_department_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  req_user_section_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: 'int', nullable: false })
+  user_id: number;
+
+  // New columns - Personal Information
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  relationship: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  place_of_birth: string | null;
+
+  @Column({ type: 'date', nullable: true })
+  date_of_birth: Date | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  nationality: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  religion_and_sect: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  sub_religion_and_sect: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  present_residence: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  occupation_and_employer: string | null;
+
+  // Education Information
+  @Column({ type: 'text', nullable: true })
+  type_of_study_specializations_qualification: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  educational_institute: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  education_country: string | null;
+
+  @Column({ type: 'date', nullable: true })
+  education_period_from: Date | null;
+
+  @Column({ type: 'date', nullable: true })
+  education_period_to: Date | null;
+
+  // Note: Employment, Activity, and Charge Information fields have been moved to 
+  // register_candidate_experience_activity table to support multiple experience records
+
+  // First Address
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  address1_country_state: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  address1_street_no: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  address1_road_no: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  address1_flat_building_no: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  address1_po_box_telephone_fax: string | null;
+
+  // Second Address
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  address2_country_state: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  address2_street_no: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  address2_road_no: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  address2_flat_building_no: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  address2_po_box_telephone_fax: string | null;
+
+  // Reference Information
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  reference_full_name: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  reference_address_and_telephone: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  telephone_number: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  reference_employer: string | null;
+
+  // Vacancy Information
+  @Column({ type: 'int', nullable: true })
+  vacancy_id: number | null;
+
+  @Column({ type: 'text', nullable: true })
+  vacancy_description: string | null;
+
+  // Interview Information
+  @Column({ type: 'date', nullable: true })
+  interview_schedule_date: Date | null;
+
+  @Column({ type: 'time', nullable: true })
+  interview_schedule_time: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  interviewer_name: string | null;
+
+  // Candidate Status
+  @Column({ type: 'enum', enum: CandidateStatusType, nullable: true })
+  candidate_status: CandidateStatusType | null;
+
+  @Column({ type: 'date', nullable: true })
+  joining_date: Date | null;
+
+  // Salary Information
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  salary: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  currency: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  expected_salary: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  expected_currency: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  currency_type: string | null;
+
+  @Column({ type: 'enum', enum: RegisterCandidateStatus, default: RegisterCandidateStatus.PENDING, nullable: false })
+  status: RegisterCandidateStatus;
+
+  @Column({ type: 'varchar', nullable: true })
+  workflow_execution_id: string | null;
+
+  @OneToMany(() => RegisterCandidateExperienceActivity, (experienceActivity) => experienceActivity.request)
+  experience_activities: RegisterCandidateExperienceActivity[];
+  
+}