@platform-modules/foreign-ministry 1.3.175 → 1.3.179

package/.env

@@ -1,10 +1,5 @@
-# DB_HOST=localhost
-# DB_PORT=5432
-# DB_USER=postgres
-# DB_PASS=stevejobs
-# DB_NAME=FM
-
-DB_HOST = 164.52.222.169
-DB_USER = postgres_admin_user
-DB_PASS = pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
-DB_NAME= FM
+DB_HOST=localhost
+DB_PORT=5432
+DB_USER=postgres
+DB_PASS=Fa@123
+DB_NAME=FM

package/dist/index.d.ts

@@ -284,14 +284,6 @@ export * from './models/GiftsModel';
 export * from './models/GiftAttachmentModel';
 export * from './models/ProjectModel';
 export * from './models/TemplateModel';
-export * from './models/ProjectScopeModel';
-export * from './models/ProjectMilestonesModel';
-export * from './models/ProjectInvoicesModel';
-export * from './models/ProjectResourcesModel';
-export * from './models/ProjectResourceUsersModel';
-export * from './models/ProjectFaqModel';
-export * from './models/ProjectFaqReactionsModel';
-export * from './models/ProjectContactsModel';
 export * from './models/EmployeeMilestonesModel';
 export * from './models/EmployeeMilestoneDetailsModel';
 export * from './models/MissionTravelPassportExpiryNotificationConfigModel';

package/dist/index.js

@@ -357,14 +357,6 @@ __exportStar(require("./models/GiftsModel"), exports);
 __exportStar(require("./models/GiftAttachmentModel"), exports);
 __exportStar(require("./models/ProjectModel"), exports);
 __exportStar(require("./models/TemplateModel"), exports);
-__exportStar(require("./models/ProjectScopeModel"), exports);
-__exportStar(require("./models/ProjectMilestonesModel"), exports);
-__exportStar(require("./models/ProjectInvoicesModel"), exports);
-__exportStar(require("./models/ProjectResourcesModel"), exports);
-__exportStar(require("./models/ProjectResourceUsersModel"), exports);
-__exportStar(require("./models/ProjectFaqModel"), exports);
-__exportStar(require("./models/ProjectFaqReactionsModel"), exports);
-__exportStar(require("./models/ProjectContactsModel"), exports);
 // Employee Milestones Models
 __exportStar(require("./models/EmployeeMilestonesModel"), exports);
 __exportStar(require("./models/EmployeeMilestoneDetailsModel"), exports);

package/dist/models/EmbassyMasterModel.d.ts

@@ -0,0 +1,16 @@
+import { BaseModel } from './BaseModel';
+export declare class EmbassyMaster extends BaseModel {
+    embassy_name: string;
+    embassy_name_arabic: string | null;
+    country_id: number | null;
+    city: string | null;
+    address: string | null;
+    phone: string | null;
+    fax: string | null;
+    email: string | null;
+    website: string | null;
+    description: string | null;
+    is_active: boolean;
+    display_order: number;
+    constructor(embassy_name: string);
+}

package/dist/models/EmbassyMasterModel.js

@@ -0,0 +1,75 @@
+"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.EmbassyMaster = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let EmbassyMaster = class EmbassyMaster extends BaseModel_1.BaseModel {
+    constructor(embassy_name) {
+        super();
+        this.embassy_name = embassy_name;
+        this.is_active = true;
+        this.display_order = 0;
+    }
+};
+exports.EmbassyMaster = EmbassyMaster;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], EmbassyMaster.prototype, "embassy_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "embassy_name_arabic", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "country_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "city", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "address", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "phone", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "fax", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "email", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "website", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
+    __metadata("design:type", Boolean)
+], EmbassyMaster.prototype, "is_active", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', default: 0 }),
+    __metadata("design:type", Number)
+], EmbassyMaster.prototype, "display_order", void 0);
+exports.EmbassyMaster = EmbassyMaster = __decorate([
+    (0, typeorm_1.Entity)({ name: 'embassy_master' }),
+    __metadata("design:paramtypes", [String])
+], EmbassyMaster);

package/dist/models/ProjectModel.d.ts

@@ -1,14 +1,9 @@
 import { BaseModel } from './BaseModel';
 export declare class Projects extends BaseModel {
     project_name: string;
-    project_objective: string;
-    project_benefits: string;
-    project_risks: string;
-    project_challenges: string;
-    project_description: string;
-    project_status: string;
-    roadmap_link: string;
+    project_purpose: string;
+    roadmap_link: string | null;
     template_ids: number[] | null;
     project_version: string;
-    constructor(project_name?: string, project_objective?: string, project_benefits?: string, project_risks?: string, project_challenges?: string, project_description?: string, project_status?: string, roadmap_link?: string | null, template_ids?: number[] | null, project_version?: string);
+    constructor(project_name?: string, project_purpose?: string, roadmap_link?: string | null, template_ids?: number[] | null, project_version?: string);
 }

package/dist/models/ProjectModel.js

@@ -13,17 +13,12 @@ exports.Projects = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let Projects = class Projects extends BaseModel_1.BaseModel {
-    constructor(project_name, project_objective, project_benefits, project_risks, project_challenges, project_description, project_status, roadmap_link, template_ids, project_version) {
+    constructor(project_name, project_purpose, roadmap_link, template_ids, project_version) {
         super();
         this.project_name = project_name || '';
-        this.project_objective = project_objective || '';
-        this.project_benefits = project_benefits || '';
-        this.project_risks = project_risks || '';
-        this.project_challenges = project_challenges || '';
-        this.project_description = project_description || '';
-        this.project_status = project_status || '';
-        this.roadmap_link = roadmap_link || '';
-        this.template_ids = template_ids || [];
+        this.project_purpose = project_purpose || '';
+        this.roadmap_link = roadmap_link ?? null;
+        this.template_ids = template_ids ?? null;
         this.project_version = project_version || '';
     }
 };
@@ -33,42 +28,22 @@ __decorate([
     __metadata("design:type", String)
 ], Projects.prototype, "project_name", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
-    __metadata("design:type", String)
-], Projects.prototype, "project_objective", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
-    __metadata("design:type", String)
-], Projects.prototype, "project_benefits", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
-    __metadata("design:type", String)
-], Projects.prototype, "project_risks", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    (0, typeorm_1.Column)({ type: 'text' }),
     __metadata("design:type", String)
-], Projects.prototype, "project_challenges", void 0);
+], Projects.prototype, "project_purpose", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
-    __metadata("design:type", String)
-], Projects.prototype, "project_description", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
-    __metadata("design:type", String)
-], Projects.prototype, "project_status", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
-    __metadata("design:type", String)
+    __metadata("design:type", Object)
 ], Projects.prototype, "roadmap_link", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'jsonb', nullable: true }),
     __metadata("design:type", Object)
 ], Projects.prototype, "template_ids", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100 }),
     __metadata("design:type", String)
 ], Projects.prototype, "project_version", void 0);
 exports.Projects = Projects = __decorate([
     (0, typeorm_1.Entity)({ name: 'projects' }),
-    __metadata("design:paramtypes", [String, String, String, String, String, String, String, Object, Object, String])
+    __metadata("design:paramtypes", [String, String, Object, Object, String])
 ], Projects);

package/dist/models/TelephoneDirectoryModel.d.ts

@@ -13,6 +13,9 @@ export declare class TelephoneDirectory extends BaseModel {
     extension_number: string;
     fax_number: string;
     location: string;
+    external_department: string;
+    external_position: string;
+    external_diplomatic_title: string;
     department_id: number;
     employee_id: number | null;
     street: string;
@@ -23,5 +26,5 @@ export declare class TelephoneDirectory extends BaseModel {
     photo_url: string;
     service_id: number;
     sub_service_id: number;
-    constructor(select_type?: "personal" | "department" | "organization", category?: "FM" | "Embassy" | "M&C" | "external", name?: string, position?: string, diplomatic_title?: string, embassy_id?: number | null, contextual_search?: string | null, email?: string, contact_number?: string, extension_number?: string, fax_number?: string, location?: string, department_id?: number, employee_id?: number, street?: string, city?: string, state?: string, zip_code?: string, country?: string, photo_url?: string, service_id?: number, sub_service_id?: number);
+    constructor(select_type?: "personal" | "department" | "organization", category?: "FM" | "Embassy" | "M&C" | "external", name?: string, position?: string, diplomatic_title?: string, embassy_id?: number | null, contextual_search?: string | null, email?: string, contact_number?: string, extension_number?: string, fax_number?: string, location?: string, external_department?: string, external_position?: string, external_diplomatic_title?: string, department_id?: number, employee_id?: number, street?: string, city?: string, state?: string, zip_code?: string, country?: string, photo_url?: string, service_id?: number, sub_service_id?: number);
 }

package/dist/models/TelephoneDirectoryModel.js

@@ -13,7 +13,7 @@ exports.TelephoneDirectory = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let TelephoneDirectory = class TelephoneDirectory extends BaseModel_1.BaseModel {
-    constructor(select_type, category, name, position, diplomatic_title, embassy_id, contextual_search, email, contact_number, extension_number, fax_number, location, department_id, employee_id, street, city, state, zip_code, country, photo_url, service_id, sub_service_id) {
+    constructor(select_type, category, name, position, diplomatic_title, embassy_id, contextual_search, email, contact_number, extension_number, fax_number, location, external_department, external_position, external_diplomatic_title, department_id, employee_id, street, city, state, zip_code, country, photo_url, service_id, sub_service_id) {
         super();
         this.select_type = select_type || "personal";
         this.category = category || "FM";
@@ -27,6 +27,9 @@ let TelephoneDirectory = class TelephoneDirectory extends BaseModel_1.BaseModel
         this.extension_number = extension_number || "";
         this.fax_number = fax_number || "";
         this.location = location || "";
+        this.external_department = external_department || "";
+        this.external_position = external_position || "";
+        this.external_diplomatic_title = external_diplomatic_title || "";
         this.department_id = department_id || 0;
         this.employee_id = employee_id || 0;
         this.street = street || "";
@@ -92,6 +95,18 @@ __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
     __metadata("design:type", String)
 ], TelephoneDirectory.prototype, "location", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", String)
+], TelephoneDirectory.prototype, "external_department", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", String)
+], TelephoneDirectory.prototype, "external_position", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", String)
+], TelephoneDirectory.prototype, "external_diplomatic_title", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", Number)
@@ -134,5 +149,5 @@ __decorate([
 ], TelephoneDirectory.prototype, "sub_service_id", void 0);
 exports.TelephoneDirectory = TelephoneDirectory = __decorate([
     (0, typeorm_1.Entity)({ name: "telephone_directory" }),
-    __metadata("design:paramtypes", [String, String, String, String, String, Object, Object, String, String, String, String, String, Number, Number, String, String, String, String, String, String, Number, Number])
+    __metadata("design:paramtypes", [String, String, String, String, String, Object, Object, String, String, String, String, String, String, String, String, Number, Number, String, String, String, String, String, String, Number, Number])
 ], TelephoneDirectory);

package/dist/models/UserDependentsModel.d.ts

@@ -0,0 +1,18 @@
+import { BaseModel } from './BaseModel';
+export declare class UserDependents extends BaseModel {
+    user_id: number;
+    first_name: string | null;
+    last_name: string | null;
+    family_name: string | null;
+    dob: Date | null;
+    age: number | null;
+    relation_type: string | null;
+    passport_available: boolean;
+    passport_number: string | null;
+    passport_type: string | null;
+    passport_issue_date: Date | null;
+    passport_place_of_issue: string | null;
+    passport_expiry_date: Date | null;
+    is_active: boolean;
+    constructor(user_id?: number, first_name?: string, last_name?: string, family_name?: string, dob?: Date, age?: number, relation_type?: string, passport_available?: boolean, passport_number?: string, passport_type?: string, passport_issue_date?: Date, passport_place_of_issue?: string, passport_expiry_date?: Date);
+}

package/dist/models/UserDependentsModel.js

@@ -0,0 +1,94 @@
+"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.UserDependents = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let UserDependents = class UserDependents extends BaseModel_1.BaseModel {
+    constructor(user_id, first_name, last_name, family_name, dob, age, relation_type, passport_available, passport_number, passport_type, passport_issue_date, passport_place_of_issue, passport_expiry_date) {
+        super();
+        this.user_id = user_id || 0;
+        this.first_name = first_name || null;
+        this.last_name = last_name || null;
+        this.family_name = family_name || null;
+        this.dob = dob || null;
+        this.age = age || null;
+        this.relation_type = relation_type || null;
+        this.passport_available = passport_available || false;
+        this.passport_number = passport_number || null;
+        this.passport_type = passport_type || null;
+        this.passport_issue_date = passport_issue_date || null;
+        this.passport_place_of_issue = passport_place_of_issue || null;
+        this.passport_expiry_date = passport_expiry_date || null;
+        this.is_active = true;
+    }
+};
+exports.UserDependents = UserDependents;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], UserDependents.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "first_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "last_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "family_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "dob", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "age", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "relation_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], UserDependents.prototype, "passport_available", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "passport_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "passport_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "passport_issue_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "passport_place_of_issue", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "passport_expiry_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
+    __metadata("design:type", Boolean)
+], UserDependents.prototype, "is_active", void 0);
+exports.UserDependents = UserDependents = __decorate([
+    (0, typeorm_1.Entity)({ name: 'user_dependents' }),
+    __metadata("design:paramtypes", [Number, String, String, String, Date, Number, String, Boolean, String, String, Date, String, Date])
+], UserDependents);

package/package.json

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

package/src/index.ts

@@ -295,14 +295,6 @@ export * from './models/GiftsModel';
 export * from './models/GiftAttachmentModel';
 export * from './models/ProjectModel';
 export * from './models/TemplateModel';
-export * from './models/ProjectScopeModel';
-export * from './models/ProjectMilestonesModel';
-export * from './models/ProjectInvoicesModel';
-export * from './models/ProjectResourcesModel';
-export * from './models/ProjectResourceUsersModel';
-export * from './models/ProjectFaqModel';
-export * from './models/ProjectFaqReactionsModel';
-export * from './models/ProjectContactsModel';
 
 // Employee Milestones Models
 export * from './models/EmployeeMilestonesModel';

package/src/models/DiplomaticAcademyRequestModel.ts

@@ -1,80 +1,80 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum DiplomaticAcademyStatus {
-  SUBMITTED = "Submitted",
-  PENDING = "Pending",
-  ASSIGNED = "Assigned",
-  IN_PROGRESS = "In Progress",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-@Entity({ name: 'diplomatic_academy_requests' })
-export class DiplomaticAcademyRequests extends BaseModel {
-
-  // Common columns
-  @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;
-
-  // Diplomatic Academy specific columns
-  @Column({ type: 'varchar', length: 500, nullable: false })
-  course_name: string;
-
-  @Column({ type: 'jsonb', nullable: true })
-  cost_details: {
-    material_price?: number;
-    transportation?: number;
-    accommodation?: number;
-    allowances?: number;
-    food?: number;
-    present?: number;
-  } | null;
-
-  @Column({ type: 'int', nullable: false })
-  estimated_participants: number;
-
-  @Column({ type: 'date', nullable: false })
-  timeline_date_from: Date;
-
-  @Column({ type: 'date', nullable: false })
-  timeline_date_to: Date;
-
-  @Column({ type: 'time', nullable: true })
-  timeline_time_from: string | null;
-
-  @Column({ type: 'time', nullable: true })
-  timeline_time_to: string | null;
-
-  @Column({ type: 'jsonb', nullable: false })
-  participants_details: Array<{
-    full_name: string;
-    passport: string;
-    age: number;
-    qualifications: string;
-    experience: string;
-    institution: string;
-  }>;
-
-  @Column({ type: 'enum', enum: DiplomaticAcademyStatus, default: DiplomaticAcademyStatus.PENDING, nullable: false })
-  status: DiplomaticAcademyStatus;
-
-  @Column({ type: 'int', nullable: true })
-  course_id: number | null;
-
-  @Column({ type: 'varchar', nullable: true })
-  workflow_execution_id: string | null;
-  
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum DiplomaticAcademyStatus {
+  SUBMITTED = "Submitted",
+  PENDING = "Pending",
+  ASSIGNED = "Assigned",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: 'diplomatic_academy_requests' })
+export class DiplomaticAcademyRequests extends BaseModel {
+
+  // Common columns
+  @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;
+
+  // Diplomatic Academy specific columns
+  @Column({ type: 'varchar', length: 500, nullable: false })
+  course_name: string;
+
+  @Column({ type: 'jsonb', nullable: true })
+  cost_details: {
+    material_price?: number;
+    transportation?: number;
+    accommodation?: number;
+    allowances?: number;
+    food?: number;
+    present?: number;
+  } | null;
+
+  @Column({ type: 'int', nullable: false })
+  estimated_participants: number;
+
+  @Column({ type: 'date', nullable: false })
+  timeline_date_from: Date;
+
+  @Column({ type: 'date', nullable: false })
+  timeline_date_to: Date;
+
+  @Column({ type: 'time', nullable: true })
+  timeline_time_from: string | null;
+
+  @Column({ type: 'time', nullable: true })
+  timeline_time_to: string | null;
+
+  @Column({ type: 'jsonb', nullable: false })
+  participants_details: Array<{
+    full_name: string;
+    passport: string;
+    age: number;
+    qualifications: string;
+    experience: string;
+    institution: string;
+  }>;
+
+  @Column({ type: 'enum', enum: DiplomaticAcademyStatus, default: DiplomaticAcademyStatus.PENDING, nullable: false })
+  status: DiplomaticAcademyStatus;
+
+  @Column({ type: 'int', nullable: true })
+  course_id: number | null;
+
+  @Column({ type: 'varchar', nullable: true })
+  workflow_execution_id: string | null;
+  
+}