@platform-modules/foreign-ministry 1.3.165 → 1.3.167

package/.env

@@ -1,10 +1,19 @@
 # DB_HOST=localhost
-# DB_PORT=5432
+# DB_PORT=5433
 # DB_USER=postgres
-# DB_PASS=stevejobs
+# DB_PASS=123
 # 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=164.52.222.169
+DB_PORT=5432
+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/index.d.ts

@@ -187,6 +187,7 @@ export * from './models/DiplomaticTitlesMasterModel';
 export { TitleCategory } from './models/DiplomaticTitlesMasterModel';
 export * from './models/DiplomaticOrganizationMasterModel';
 export * from './models/CountryMasterModel';
+export * from './models/CityMasterModel';
 export * from './models/NationalityMasterModel';
 export * from './models/UniversalLanguageMasterModel';
 export * from './models/OfficeMasterModel';

package/dist/index.js

@@ -221,6 +221,7 @@ var DiplomaticTitlesMasterModel_1 = require("./models/DiplomaticTitlesMasterMode
 Object.defineProperty(exports, "TitleCategory", { enumerable: true, get: function () { return DiplomaticTitlesMasterModel_1.TitleCategory; } });
 __exportStar(require("./models/DiplomaticOrganizationMasterModel"), exports);
 __exportStar(require("./models/CountryMasterModel"), exports);
+__exportStar(require("./models/CityMasterModel"), exports);
 __exportStar(require("./models/NationalityMasterModel"), exports);
 __exportStar(require("./models/UniversalLanguageMasterModel"), exports);
 __exportStar(require("./models/OfficeMasterModel"), exports);

package/dist/models/CityMasterModel.d.ts

@@ -0,0 +1,8 @@
+import { BaseModel } from './BaseModel';
+export declare class CityMaster extends BaseModel {
+    country_id: number | null;
+    city_name: string;
+    city_code: string | null;
+    description: string | null;
+    constructor(city_name: string);
+}

package/dist/models/{MissionTravelClassConfigModel.js → CityMasterModel.js}

@@ -9,42 +9,33 @@ 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.MissionTravelClassConfig = void 0;
+exports.CityMaster = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
-const MissionTravelPersonModel_1 = require("./MissionTravelPersonModel");
-let MissionTravelClassConfig = class MissionTravelClassConfig extends BaseModel_1.BaseModel {
-    constructor(grade, position, travel_class, description) {
+let CityMaster = class CityMaster extends BaseModel_1.BaseModel {
+    constructor(city_name) {
         super();
-        this.grade = grade;
-        this.position = position;
-        this.travel_class = travel_class;
-        this.description = description;
-        this.is_active = true;
+        this.city_name = city_name;
     }
 };
-exports.MissionTravelClassConfig = MissionTravelClassConfig;
+exports.CityMaster = CityMaster;
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Object)
-], MissionTravelClassConfig.prototype, "grade", void 0);
+], CityMaster.prototype, "country_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
-    __metadata("design:type", Object)
-], MissionTravelClassConfig.prototype, "position", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'enum', enum: MissionTravelPersonModel_1.TravelClass, nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
     __metadata("design:type", String)
-], MissionTravelClassConfig.prototype, "travel_class", void 0);
+], CityMaster.prototype, "city_name", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
-    __metadata("design:type", Boolean)
-], MissionTravelClassConfig.prototype, "is_active", void 0);
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], CityMaster.prototype, "city_code", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", Object)
-], MissionTravelClassConfig.prototype, "description", void 0);
-exports.MissionTravelClassConfig = MissionTravelClassConfig = __decorate([
-    (0, typeorm_1.Entity)({ name: 'mission_travel_class_config' }),
-    __metadata("design:paramtypes", [Object, Object, String, Object])
-], MissionTravelClassConfig);
+], CityMaster.prototype, "description", void 0);
+exports.CityMaster = CityMaster = __decorate([
+    (0, typeorm_1.Entity)({ name: 'city_master' }),
+    __metadata("design:paramtypes", [String])
+], CityMaster);

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

@@ -26,4 +26,9 @@ export declare class LMSExternalCourseParticipationRequests extends BaseModel {
     comment: string | null;
     includePoliticalOpinion: string | null;
     course_id: number | null;
+    is_exam_required: string | null;
+    travel_ticket_amount: number | null;
+    transportation_amount: number | null;
+    accommodation_amount: number | null;
+    perdiem_amount: number | null;
 }

package/dist/models/LMSExternalCourseParticipationRequestModel.js

@@ -99,6 +99,26 @@ __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: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], LMSExternalCourseParticipationRequests.prototype, "is_exam_required", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: true }),
+    __metadata("design:type", Object)
+], LMSExternalCourseParticipationRequests.prototype, "travel_ticket_amount", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: true }),
+    __metadata("design:type", Object)
+], LMSExternalCourseParticipationRequests.prototype, "transportation_amount", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: true }),
+    __metadata("design:type", Object)
+], LMSExternalCourseParticipationRequests.prototype, "accommodation_amount", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: true }),
+    __metadata("design:type", Object)
+], LMSExternalCourseParticipationRequests.prototype, "perdiem_amount", void 0);
 exports.LMSExternalCourseParticipationRequests = LMSExternalCourseParticipationRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'lms_external_course_participation_requests' })
 ], LMSExternalCourseParticipationRequests);

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/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.165",
+ "version": "1.3.167",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "scripts": {

package/src/index.ts

@@ -187,6 +187,7 @@ export * from './models/DiplomaticTitlesMasterModel';
 export { TitleCategory } from './models/DiplomaticTitlesMasterModel';
 export * from './models/DiplomaticOrganizationMasterModel';
 export * from './models/CountryMasterModel';
+export * from './models/CityMasterModel';
 export * from './models/NationalityMasterModel';
 export * from './models/UniversalLanguageMasterModel';
 export * from './models/OfficeMasterModel';

package/src/models/CityMasterModel.ts

@@ -0,0 +1,22 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'city_master' })
+export class CityMaster extends BaseModel {
+  @Column({ type: 'int', nullable: true })
+  country_id: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  city_name: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  city_code: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  description: string | null;
+
+  constructor(city_name: string) {
+    super();
+    this.city_name = city_name;
+  }
+}

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;
+  
+}

package/src/models/LMSExternalCourseParticipationRequestModel.ts

@@ -69,4 +69,19 @@ export class LMSExternalCourseParticipationRequests extends BaseModel {
 
   @Column({ type: 'int', nullable: true })
   course_id: number | null;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  is_exam_required: string | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  travel_ticket_amount: number | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  transportation_amount: number | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  accommodation_amount: number | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  perdiem_amount: number | null;
 }