@platform-modules/foreign-ministry 1.2.39 → 1.2.100

package/src/models/DiplomaticRequestsModel.ts

@@ -1,157 +1,154 @@
-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_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_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;
+
+  @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/GeneralServiceChatsModel.ts

@@ -12,12 +12,6 @@ export class GeneralServiceChats extends BaseModel {
   @Column({ type: 'int' })
   sender_user_id: number;
 
-  @Column({ type: 'int', nullable: true })
-  sender_role_id: number | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  status: string | null;
-
   @Column({ type: 'int', nullable: true })
   service_id: number | null;  // For filtering and multi-service support
 
@@ -32,9 +26,7 @@ export class GeneralServiceChats extends BaseModel {
     content: string,
     sender_user_id: number,
     service_id?: number | null,
-    sub_service_id?: number | null,
-    sender_role_id?: number | null,
-    status?: string | null
+    sub_service_id?: number | null
   ) {
     super();
     this.request_id = request_id;
@@ -42,8 +34,6 @@ export class GeneralServiceChats extends BaseModel {
     this.sender_user_id = sender_user_id;
     this.service_id = service_id || null;
     this.sub_service_id = sub_service_id || null;
-    this.sender_role_id = sender_role_id || null;
-    this.status = status || null;
   }
 }
 

package/src/models/LeaveConfigModel.ts

@@ -1,72 +1,72 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum enumFrequency {
-    Monthly = 'Monthly',
-    Yearly = 'Yearly',
-}
-
-//This model is used to store the Financial Grade declaration on the Admin Side
-@Entity({ name: 'leave_configuration' })
-export class LeaveConfiguration extends BaseModel {
-
-    @Column({ type: 'varchar', nullable: true })
-    category: string;
-
-    @Column({ type: 'int', nullable: true })
-    MandC_id: number;
-
-    @Column({ type: 'int', nullable: true })
-    leave_type_id: number;
-
-    @Column({ type: 'varchar', nullable: true })
-    frequency: enumFrequency;
-
-    @Column({ type: 'varchar', nullable: true })
-    region: string;
-
-    @Column({ type: 'varchar', nullable: true })
-    country: string;
-
-    @Column({ type: 'varchar', nullable: true })
-    location: string;
-
-    @Column({ nullable: true, default: false })
-    is_carryforward: boolean;
-
-    @Column({ type: 'int', nullable: true, default: 0 })
-    carryforward_limit: number;
-
-    @Column({ type: 'date', nullable: true })
-    from_date: Date;
-
-    @Column({ type: 'date', nullable: true })
-    to_date: Date;
-
-    @Column({ type: 'varchar', nullable: true })
-    reason: string;
-
-    @Column({ type: 'int', nullable: true })
-    emergency_balance_days: number | null;
-
-    @Column({ type: 'date', nullable: true })
-    last_credited: Date | null;
-
-    constructor(category: string, MandC_id: number, leave_type_id: number, frequency: enumFrequency, region: string, country: string, location: string, is_carryforward: boolean, carryforward_limit: number, from_date: Date, to_date: Date, reason: string, emergency_balance_days?: number|null, last_credited?: Date|null) {
-        super();
-        this.category = category;
-        this.MandC_id = MandC_id;
-        this.leave_type_id = leave_type_id;
-        this.frequency = frequency;
-        this.region = region;
-        this.country = country;
-        this.location = location;
-        this.is_carryforward = is_carryforward;
-        this.carryforward_limit = carryforward_limit;
-        this.from_date = from_date;
-        this.to_date = to_date;
-        this.reason = reason;
-        this.emergency_balance_days = emergency_balance_days ?? null;
-        this.last_credited = last_credited ?? null;
-    }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum enumFrequency {
+    Monthly = 'Monthly',
+    Yearly = 'Yearly',
+}
+
+//This model is used to store the Financial Grade declaration on the Admin Side
+@Entity({ name: 'leave_configuration' })
+export class LeaveConfiguration extends BaseModel {
+
+    @Column({ type: 'varchar', nullable: true })
+    category: string;
+
+    @Column({ type: 'int', nullable: true })
+    MandC_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    leave_type_id: number;
+
+    @Column({ type: 'varchar', nullable: true })
+    frequency: enumFrequency;
+
+    @Column({ type: 'varchar', nullable: true })
+    region: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    country: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    location: string;
+
+    @Column({ nullable: true, default: false })
+    is_carryforward: boolean;
+
+    @Column({ type: 'int', nullable: true, default: 0 })
+    carryforward_limit: number;
+
+    @Column({ type: 'date', nullable: true })
+    from_date: Date;
+
+    @Column({ type: 'date', nullable: true })
+    to_date: Date;
+
+    @Column({ type: 'varchar', nullable: true })
+    reason: string;
+
+    @Column({ type: 'int', nullable: true })
+    emergency_balance_days: number | null;
+
+    @Column({ type: 'date', nullable: true })
+    last_credited: Date | null;
+
+    constructor(category: string, MandC_id: number, leave_type_id: number, frequency: enumFrequency, region: string, country: string, location: string, is_carryforward: boolean, carryforward_limit: number, from_date: Date, to_date: Date, reason: string, emergency_balance_days?: number|null, last_credited?: Date|null) {
+        super();
+        this.category = category;
+        this.MandC_id = MandC_id;
+        this.leave_type_id = leave_type_id;
+        this.frequency = frequency;
+        this.region = region;
+        this.country = country;
+        this.location = location;
+        this.is_carryforward = is_carryforward;
+        this.carryforward_limit = carryforward_limit;
+        this.from_date = from_date;
+        this.to_date = to_date;
+        this.reason = reason;
+        this.emergency_balance_days = emergency_balance_days ?? null;
+        this.last_credited = last_credited ?? null;
+    }
 }