@platform-modules/foreign-ministry 1.3.119 → 1.3.120

package/src/models/DiplomaticRequestsModel.ts

@@ -1,157 +1,160 @@
-import { Column, Entity, OneToOne, OneToMany, ManyToOne, JoinColumn } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-// Import types only (not for runtime)
-import type { DiplomaticApprovals } from './DiplomaticApprovalsModel';
-import type { DiplomaticWorkFlow } from './DiplomaticWorkFlowModel';
-import type { DiplomaticAttachments } from './DiplomaticAttachmentsModel';
-import type { DiplomaticChats } from './DiplomaticChatsModel';
-import type { DiplomaticClubCardMembers } from './DiplomaticClubCardMembersModel';
-
-export enum DiplomaticRequestStatus {
-  DRAFT = "Draft",
-  SUBMITTED = "Submitted",
-  PENDING = "Pending",
-  IN_PROGRESS = "In Progress",
-  APPROVED = "Approved",
-  REJECTED = "Rejected",
-  COMPLETED = "Completed",
-  CANCELLED = "Cancelled"
-}
-
-@Entity({ name: 'diplomatic_club_card_requests' })
-export class DiplomaticRequests extends BaseModel {
-  @Column({ type: 'int' })
-  user_id: number;
-
-  @Column({ type: 'varchar', length: 100 })
-  employee_id: string;
-
-  @Column({ type: 'varchar', length: 255 })
-  employee_name: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  grade: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  designation_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  department_id: number | null;
-
-  @Column({ type: 'varchar', length: 255 })
-  email_address: string;
-
-  @Column({ type: 'varchar', length: 20 })
-  contact_number: string;
-
-  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
-  request_date: Date;
-
-  @Column({ type: 'enum', enum: DiplomaticRequestStatus, default: DiplomaticRequestStatus.PENDING })
-  request_status: DiplomaticRequestStatus;
-
-  @Column({ type: 'timestamp', nullable: true })
-  request_close_date: Date | null;
-
-  @Column({ type: 'date', nullable: true })
-  end_date: Date | null;
-
-  @Column({ type: 'text', nullable: true })
-  remarks: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  current_approval_level: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  current_approver_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  member_name: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  membership_type: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  diplomatic_title_id: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  location: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  request_type: string | null;
-
-  @Column({ type: 'date', nullable: true })
-  expiry_date: Date | null;
-
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  photo_url: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  membership_id: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  organization: string | null;
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
-  subscription_amount: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  section_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  reporting_manager: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  workflow_execution_id: string | null;
-
-  @Column({ type: 'json', nullable: true })
-  titles: any[] | null;
-
-  @OneToMany('DiplomaticClubCardMembers', 'diplomaticRequest', { nullable: true })
-  diplomaticClubCardMembers?: DiplomaticClubCardMembers[];
-
-  @OneToMany('DiplomaticApprovals', 'diplomaticRequest')
-  approvals?: DiplomaticApprovals[];
-
-  @OneToMany('DiplomaticWorkFlow', 'diplomaticRequest')
-  workflows?: DiplomaticWorkFlow[];
-
-  @OneToMany('DiplomaticAttachments', 'diplomaticRequest')
-  attachments?: DiplomaticAttachments[];
-
-  @OneToMany('DiplomaticChats', 'diplomaticRequest')
-  chats?: DiplomaticChats[];
-
-  constructor(
-    user_id: number,
-    employee_id: string,
-    employee_name: string,
-    email_address: string,
-    contact_number: string,
-    service_id: number | null,
-    sub_service_id: number | null,
-    section_id: number | null,
-    reporting_manager: number | null
-  ) {
-    super();
-    this.user_id = user_id;
-    this.employee_id = employee_id;
-    this.employee_name = employee_name;
-    this.email_address = email_address;
-    this.contact_number = contact_number;
-    this.request_date = new Date();
-    this.request_status = DiplomaticRequestStatus.PENDING;
-    this.service_id = service_id;
-    this.sub_service_id = sub_service_id;
-    this.section_id = section_id;
-    this.reporting_manager = reporting_manager;
-  }
-}
-
+import { Column, Entity, OneToOne, OneToMany, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+// Import types only (not for runtime)
+import type { DiplomaticApprovals } from './DiplomaticApprovalsModel';
+import type { DiplomaticWorkFlow } from './DiplomaticWorkFlowModel';
+import type { DiplomaticAttachments } from './DiplomaticAttachmentsModel';
+import type { DiplomaticChats } from './DiplomaticChatsModel';
+import type { DiplomaticClubCardMembers } from './DiplomaticClubCardMembersModel';
+
+export enum DiplomaticRequestStatus {
+  DRAFT = "Draft",
+  SUBMITTED = "Submitted",
+  PENDING = "Pending",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected",
+  COMPLETED = "Completed",
+  CANCELLED = "Cancelled"
+}
+
+@Entity({ name: 'diplomatic_club_card_requests' })
+export class DiplomaticRequests extends BaseModel {
+  @Column({ type: 'int' })
+  user_id: number;
+
+  @Column({ type: 'varchar', length: 100 })
+  employee_id: string;
+
+  @Column({ type: 'varchar', length: 255 })
+  employee_name: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  grade: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  designation_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  department_id: number | null;
+
+  @Column({ type: 'varchar', length: 255 })
+  email_address: string;
+
+  @Column({ type: 'varchar', length: 20 })
+  contact_number: string;
+
+  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+  request_date: Date;
+
+  @Column({ type: 'enum', enum: DiplomaticRequestStatus, default: DiplomaticRequestStatus.PENDING })
+  request_status: DiplomaticRequestStatus;
+
+  @Column({ type: 'timestamp', nullable: true })
+  request_close_date: Date | null;
+
+  @Column({ type: 'date', nullable: true })
+  end_date: Date | null;
+
+  @Column({ type: 'text', nullable: true })
+  remarks: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  current_approval_level: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  current_approver_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  member_name: string | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  member_name_in_arabic: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  membership_type: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  diplomatic_title_id: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  location: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  request_type: string | null;
+
+  @Column({ type: 'date', nullable: true })
+  expiry_date: Date | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  photo_url: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  membership_id: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  organization: string | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  subscription_amount: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  section_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  reporting_manager: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  workflow_execution_id: string | null;
+
+  @Column({ type: 'json', nullable: true })
+  titles: any[] | null;
+
+  @OneToMany('DiplomaticClubCardMembers', 'diplomaticRequest', { nullable: true })
+  diplomaticClubCardMembers?: DiplomaticClubCardMembers[];
+
+  @OneToMany('DiplomaticApprovals', 'diplomaticRequest')
+  approvals?: DiplomaticApprovals[];
+
+  @OneToMany('DiplomaticWorkFlow', 'diplomaticRequest')
+  workflows?: DiplomaticWorkFlow[];
+
+  @OneToMany('DiplomaticAttachments', 'diplomaticRequest')
+  attachments?: DiplomaticAttachments[];
+
+  @OneToMany('DiplomaticChats', 'diplomaticRequest')
+  chats?: DiplomaticChats[];
+
+  constructor(
+    user_id: number,
+    employee_id: string,
+    employee_name: string,
+    email_address: string,
+    contact_number: string,
+    service_id: number | null,
+    sub_service_id: number | null,
+    section_id: number | null,
+    reporting_manager: number | null
+  ) {
+    super();
+    this.user_id = user_id;
+    this.employee_id = employee_id;
+    this.employee_name = employee_name;
+    this.email_address = email_address;
+    this.contact_number = contact_number;
+    this.request_date = new Date();
+    this.request_status = DiplomaticRequestStatus.PENDING;
+    this.service_id = service_id;
+    this.sub_service_id = sub_service_id;
+    this.section_id = section_id;
+    this.reporting_manager = reporting_manager;
+  }
+}
+

package/src/models/JobsModel.ts

@@ -29,28 +29,12 @@ export class Jobs extends BaseModel {
     @Column({ type: 'text', nullable: true })
     job_description: string | null;
 
-    @Column({ type: 'varchar', length: 50, nullable: true })
-    out_of_marks: string | null;
-
-    @Column({ type: 'varchar', length: 50, nullable: true })
-    minimum_marks: string | null;
-
-    @Column({ type: 'date', nullable: true })
-    job_expiry_date: Date | null;
-
-    @Column({ type: 'varchar', length: 100, nullable: true })
-    experience_required: string | null;
-
     constructor(
         title: string,
         grade: number,
         description: string,
         location?: string | null,
-        job_description?: string | null,
-        out_of_marks?: string | null,
-        minimum_marks?: string | null,
-        job_expiry_date?: Date | string | null,
-        experience_required?: string | null
+        job_description?: string | null
     ) {
         super();
         this.title = title;
@@ -58,12 +42,6 @@ export class Jobs extends BaseModel {
         this.description = description;
         this.location = location || null;
         this.job_description = job_description || null;
-        this.out_of_marks = out_of_marks ?? null;
-        this.minimum_marks = minimum_marks ?? null;
-        this.job_expiry_date = job_expiry_date
-            ? (typeof job_expiry_date === 'string' ? new Date(job_expiry_date) : job_expiry_date)
-            : null;
-        this.experience_required = experience_required ?? null;
     }
 }