@platform-modules/foreign-ministry 1.0.80 → 1.0.82

package/dist/models/user.js

@@ -13,7 +13,7 @@ exports.User = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let User = class User extends BaseModel_1.BaseModel {
-    constructor(employee_id, employee_name, employee_arabic_name, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, marital_status, nationality, email, blood_group, national_id, mobile, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, diplomatic_name, civil_employee_id, qualification, father_name, spouse_name, children1_name, children2_name) {
+    constructor(employee_id, employee_name, employee_arabic_name, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, marital_status, nationality, email, blood_group, national_id, mobile, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, diplomatic_name, civil_employee_id, qualification) {
         super();
         this.employee_id = employee_id;
         this.employee_name = employee_name;
@@ -49,10 +49,6 @@ let User = class User extends BaseModel_1.BaseModel {
         this.diplomatic_name = diplomatic_name;
         this.civil_employee_id = civil_employee_id;
         this.qualification = qualification;
-        this.father_name = father_name;
-        this.spouse_name = spouse_name;
-        this.children1_name = children1_name;
-        this.children2_name = children2_name;
     }
 };
 exports.User = User;
@@ -192,23 +188,7 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "qualification", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], User.prototype, "father_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], User.prototype, "spouse_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], User.prototype, "children1_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], User.prototype, "children2_name", void 0);
 exports.User = User = __decorate([
     (0, typeorm_1.Entity)({ name: 'users' }),
-    __metadata("design:paramtypes", [Number, String, String, String, String, String, String, String, String, String, String, String, String, Number, String, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, Number, String, String, String, String, String])
+    __metadata("design:paramtypes", [Number, String, String, String, String, String, String, String, String, String, String, String, String, Number, String, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, Number, String])
 ], User);

package/package.json

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

package/src/data-source.ts

@@ -50,11 +50,6 @@ import { MessageReadStatus } from './models/MessageReadStatusModel';
 import { ShiftDetails } from './models/ShifttimesModel';
 import { AttendanceDetails } from './models/AttendanceModel';
 import { UserShift } from './models/UserShiftModel';
-import { Holidays } from './models/HolidaysModel';
-import { UserRole } from './models/userRolesModel';
-import { RoleRights } from './models/roleRightsModel';
-import { PortalFeedback } from './models/PortalFeedbackModel';
-import { Notification } from './models/NotificationModel';
 
 
 export const AppDataSource = new DataSource({
@@ -64,7 +59,7 @@ export const AppDataSource = new DataSource({
   username: process.env.DB_USER || 'postgres',
   password: process.env.DB_PASS || 'postgres',
   database: process.env.DB_NAME || 'common_models',
-  synchronize: true, // auto-create tables (disable in prod)
+  synchronize: false, // auto-create tables (disable in prod)
   logging: false,
   entities: [
     User,
@@ -110,11 +105,6 @@ export const AppDataSource = new DataSource({
     MessageReadStatus,
     ShiftDetails,
     AttendanceDetails,
-    UserShift,
-    Holidays,
-    UserRole,
-    RoleRights,
-    PortalFeedback,
-    Notification
+    UserShift
   ],
 });

package/src/index.ts

@@ -42,8 +42,16 @@ export * from './models/ShifttimesModel';
 export * from './models/AttendanceModel';
 export * from './models/contactInfoModel';
 export * from './models/UserShiftModel';
-export * from './models/HolidaysModel';
-export * from './models/userRolesModel';
-export * from './models/roleRightsModel';
-export * from './models/PortalFeedbackModel';
-export * from './models/NotificationModel';
+export * from './models/FinancialRequestsModel';
+export * from './models/PayslipRequestsModel';
+export * from './models/SalaryCertificateRequestsModel';
+export * from './models/AllowanceRequestsModel';
+export * from './models/ReimbursementRequestsModel';
+export * from './models/BankAccountChangeRequestsModel';
+export * from './models/FinancialChatsModel';
+export * from './models/FinancialApprovalsModel';
+export * from './models/FinancialWorkFlowModel';
+export * from './models/FinancialAttachmentsModel';
+export * from './models/RequestTypeMasterModel';
+export * from './models/FinancialSettingsModel';
+export * from './models/AllowanceTypesModel';

package/src/models/AllowanceRequestsModel.ts

@@ -0,0 +1,38 @@
+import { Column, Entity, OneToOne, JoinColumn, ManyToOne } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'allowance_requests' })
+export class AllowanceRequests extends BaseModel {
+  @Column({ type: 'int', unique: true })
+  financial_request_id: number;
+
+  @Column({ type: 'int' })
+  allowance_type_id: number;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2 })
+  allowance_amount: number;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  approved_allowance_amount: number;
+
+  @Column({ type: 'boolean', default: false })
+  currency : string;
+
+
+  constructor(
+    financial_request_id: number,
+    allowance_type_id: number,
+    allowance_amount: number,
+    approved_allowance_amount: number,
+    currency: string
+
+  ) {
+    super();
+    this.financial_request_id = financial_request_id;
+    this.allowance_type_id = allowance_type_id;
+    this.allowance_amount = allowance_amount;
+    this.approved_allowance_amount = approved_allowance_amount;
+    this.currency = currency;
+  }
+}
+

package/src/models/AllowanceTypesModel.ts

@@ -0,0 +1,26 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'allowance_types' })
+export class AllowanceTypes extends BaseModel {
+  @Column({ type: 'varchar', length: 100, unique: true })
+  allowance_code: string; // HOUSING, TRANSPORT, EDUCATION, etc.
+
+  @Column({ type: 'varchar', length: 255 })
+  allowance_name: string;
+
+  @Column({ type: 'text', nullable: true })
+  description: string;
+
+
+  @Column({ type: 'boolean', default: true })
+  is_active: boolean;
+
+  constructor(allowance_code: string, allowance_name: string) {
+    super();
+    this.allowance_code = allowance_code;
+    this.allowance_name = allowance_name;
+    this.is_active = true;
+  }
+}
+

package/src/models/BankAccountChangeRequestsModel.ts

@@ -0,0 +1,50 @@
+import { Column, Entity, OneToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'bank_account_change_requests' })
+export class BankAccountChangeRequests extends BaseModel {
+  @Column({ type: 'int', unique: true })
+  financial_request_id: number;
+
+  // Old Bank Details
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  old_bank_name: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  old_account_number: string;
+
+
+  // New Bank Details
+  @Column({ type: 'varchar', length: 100 })
+  new_bank_name: string;
+
+  @Column({ type: 'varchar', length: 50 })
+  new_account_number: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  new_account_name: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  new_branch_ifsc_code: string;
+
+  @Column({ type: 'text' })
+  reason_for_change: string;
+
+  constructor(
+    financial_request_id: number,
+    new_bank_name: string,
+    new_account_number: string,
+    new_account_name: string,
+    new_branch_ifsc_code: string,
+    reason_for_change: string,
+  ) {
+    super();
+    this.financial_request_id = financial_request_id;
+    this.new_bank_name = new_bank_name;
+    this.new_account_number = new_account_number;
+    this.new_account_name = new_account_name;
+    this.new_branch_ifsc_code = new_branch_ifsc_code;
+    this.reason_for_change = reason_for_change;
+  }
+}
+

package/src/models/FMServices.ts

@@ -14,7 +14,7 @@ export class FMServices extends BaseModel {
     @Column({ nullable: false })
     description: string;
 
-    @Column({ nullable: true })
+    @Column({ nullable: false })
     logo_url: string;
 
     constructor(     

package/src/models/FinancialApprovalsModel.ts

@@ -0,0 +1,52 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
+
+export enum FinancialApprovalStatus {
+  PENDING = "Pending",
+  APPROVED = "Approved",
+  REJECTED = "Rejected",
+  SKIPPED = "Skipped"
+}
+
+@Entity({ name: 'financial_approvals' })
+export class FinancialApprovals extends BaseModel {
+  @Column({ type: 'int' })
+  financial_request_id: number;
+
+  @Column({ type: 'int' })
+  level: number;
+
+  @Column({ type: 'int', nullable: true })
+  approver_user_id: number;
+
+  @Column({ type: 'int' })
+  approver_role_id: number;
+
+  @Column({ type: 'text', nullable: true })
+  comment: string;
+
+  @Column({ type: 'enum', enum: FinancialApprovalStatus, default: FinancialApprovalStatus.PENDING })
+  approval_status: FinancialApprovalStatus;
+
+  @Column({ type: 'timestamp', nullable: true })
+  action_date: Date;
+
+  @ManyToOne(() => FinancialRequests, fr => fr.approvals)
+  @JoinColumn({ name: 'financial_request_id' })
+  financialRequest?: FinancialRequests;
+
+  constructor(
+    financial_request_id: number,
+    level: number,
+    approver_role_id: number,
+    approval_status: FinancialApprovalStatus
+  ) {
+    super();
+    this.financial_request_id = financial_request_id;
+    this.level = level;
+    this.approver_role_id = approver_role_id;
+    this.approval_status = approval_status;
+  }
+}
+

package/src/models/FinancialAttachmentsModel.ts

@@ -0,0 +1,35 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
+
+@Entity({ name: 'financial_attachments' })
+export class FinancialAttachments extends BaseModel {
+  @Column({ type: 'int' })
+  financial_request_id: number;
+
+  @Column({ type: 'varchar', length: 500 })
+  file_url: string;
+
+  @Column({ type: 'varchar', length: 255 })
+  file_name: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  file_type: string; // PDF, JPG, PNG, etc.
+
+  @ManyToOne(() => FinancialRequests, fr => fr.attachments)
+  @JoinColumn({ name: 'financial_request_id' })
+  financialRequest?: FinancialRequests;
+
+  constructor(
+    financial_request_id: number,
+    file_url: string,
+    file_name: string
+  ) {
+    super();
+    this.financial_request_id = financial_request_id;
+    this.file_url = file_url;
+    this.file_name = file_name;
+    this.file_type = 'PDF';
+  }
+}
+

package/src/models/FinancialChatsModel.ts

@@ -0,0 +1,27 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
+
+@Entity({ name: 'financial_chats' })
+export class FinancialChats extends BaseModel {
+  @Column({ type: 'int' })
+  financial_request_id: number;
+
+  @Column({ type: 'text' })
+  content: string;
+
+  @Column({ type: 'int' })
+  sender_user_id: number;
+
+  @ManyToOne(() => FinancialRequests, fr => fr.chats)
+  @JoinColumn({ name: 'financial_request_id' })
+  financialRequest?: FinancialRequests;
+
+  constructor(financial_request_id: number, content: string, sender_user_id: number) {
+    super();
+    this.financial_request_id = financial_request_id;
+    this.content = content;
+    this.sender_user_id = sender_user_id;
+  }
+}
+

package/src/models/FinancialRequestsModel.ts

@@ -0,0 +1,122 @@
+import { Column, Entity, OneToOne, OneToMany, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { PayslipRequests } from './PayslipRequestsModel';
+import { SalaryCertificateRequests } from './SalaryCertificateRequestsModel';
+import { AllowanceRequests } from './AllowanceRequestsModel';
+import { ReimbursementRequests } from './ReimbursementRequestsModel';
+import { BankAccountChangeRequests } from './BankAccountChangeRequestsModel';
+import { FinancialChats } from './FinancialChatsModel';
+import { FinancialApprovals } from './FinancialApprovalsModel';
+import { FinancialWorkFlow } from './FinancialWorkFlowModel';
+import { FinancialAttachments } from './FinancialAttachmentsModel';
+import { RequestTypeMaster } from './RequestTypeMasterModel';
+
+export enum FinancialRequestStatus {
+  DRAFT = "Draft",
+  SUBMITTED = "Submitted",
+  PENDING = "Pending",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected",
+  COMPLETED = "Completed",
+  CANCELLED = "Cancelled"
+}
+
+@Entity({ name: 'financial_requests' })
+export class FinancialRequests 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;
+
+  @Column({ type: 'int', nullable: true })
+  designation_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  department_id: number;
+
+  @Column({ type: 'varchar', length: 255 })
+  email_address: string;
+
+  @Column({ type: 'varchar', length: 20 })
+  contact_number: string;
+
+  @Column({ type: 'int' })
+  request_type_id: number;
+
+  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+  request_date: Date;
+
+  @Column({ type: 'enum', enum: FinancialRequestStatus, default: FinancialRequestStatus.PENDING })
+  request_status: FinancialRequestStatus;
+
+  @Column({ type: 'timestamp', nullable: true })
+  request_close_date: Date;
+
+  @Column({ type: 'text', nullable: true })
+  remarks: string;
+
+  @Column({ type: 'int', nullable: true })
+  current_approval_level: number;
+
+  @Column({ type: 'int', nullable: true })
+  current_approver_id: number;
+
+  @OneToOne(() => PayslipRequests, payslip => payslip.financialRequest, { nullable: true })
+  payslipRequest?: PayslipRequests;
+
+  @OneToOne(() => SalaryCertificateRequests, cert => cert.financial_request_id, { nullable: true })
+  salaryCertificateRequest?: SalaryCertificateRequests;
+
+  @OneToOne(() => AllowanceRequests, allowance => allowance.financial_request_id, { nullable: true })
+  allowanceRequest?: AllowanceRequests;
+
+  @OneToOne(() => ReimbursementRequests, reimb => reimb.financial_request_id, { nullable: true })
+  reimbursementRequest?: ReimbursementRequests;
+
+  @OneToOne(() => BankAccountChangeRequests, bank => bank.financial_request_id, { nullable: true })
+  bankAccountChangeRequest?: BankAccountChangeRequests;
+
+  @OneToMany(() => FinancialChats, chat => chat.financialRequest)
+  chats?: FinancialChats[];
+
+  @OneToMany(() => FinancialApprovals, approval => approval.financialRequest)
+  approvals?: FinancialApprovals[];
+
+  @OneToMany(() => FinancialWorkFlow, workflow => workflow.financialRequest)
+  workflows?: FinancialWorkFlow[];
+
+  @OneToMany(() => FinancialAttachments, attachment => attachment.financialRequest)
+  attachments?: FinancialAttachments[];
+
+  @ManyToOne(() => RequestTypeMaster)
+  @JoinColumn({ name: 'request_type_id' })
+  requestType?: RequestTypeMaster;
+
+  constructor(
+    user_id: number,
+    employee_id: string,
+    employee_name: string,
+    email_address: string,
+    contact_number: string,
+    request_type_id: number
+  ) {
+    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_type_id = request_type_id;
+    this.request_date = new Date();
+    this.request_status = FinancialRequestStatus.PENDING;
+  }
+}
+

package/src/models/FinancialSettingsModel.ts

@@ -0,0 +1,30 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'financial_settings' })
+export class FinancialSettings extends BaseModel {
+  @Column({ type: 'int' })
+  service_id: number;
+
+  @Column({ type: 'int' })
+  approval_level: number;
+
+  @Column({ type: 'int' })
+  approver_role_id: number;
+
+  @Column({ type: 'boolean', default: true })
+  is_active: boolean;
+
+  constructor(
+    service_id: number,
+    approval_level: number,
+    approver_role_id: number,
+  ) {
+    super();
+    this.service_id = service_id;
+    this.approval_level = approval_level;
+    this.approver_role_id = approver_role_id;
+    this.is_active = true;
+  }
+}
+

package/src/models/FinancialWorkFlowModel.ts

@@ -0,0 +1,51 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
+
+export enum FinancialWorkFlowStatus {
+  COMPLETED = "Completed",
+  NOT_YET_STARTED = "Not Yet Started",
+  PENDING = "Pending",
+  IN_PROGRESS = "In Progress"
+}
+
+@Entity({ name: 'financial_work_flows' })
+export class FinancialWorkFlow extends BaseModel {
+  @Column({ type: 'int' })
+  financial_request_id: number;
+
+  @Column({ type: 'int', nullable: true, default: 0 })
+  financial_approval_id: number;
+
+  @Column({ type: 'enum', enum: FinancialWorkFlowStatus, default: FinancialWorkFlowStatus.NOT_YET_STARTED })
+  status: FinancialWorkFlowStatus;
+
+  @Column({ type: 'int', nullable: true })
+  approved_by_user_id: number;
+
+  @Column({ type: 'varchar', length: 500 })
+  content: string;
+
+  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+  activity_date: Date;
+
+  @ManyToOne(() => FinancialRequests, fr => fr.workflows)
+  @JoinColumn({ name: 'financial_request_id' })
+  financialRequest?: FinancialRequests;
+
+  constructor(
+    financial_request_id: number,
+    status: FinancialWorkFlowStatus,
+    approved_by_user_id: number,
+    content: string
+  ) {
+    super();
+    this.financial_request_id = financial_request_id;
+    this.status = status;
+    this.approved_by_user_id = approved_by_user_id;
+    this.content = content;
+    this.financial_approval_id = 0;
+    this.activity_date = new Date();
+  }
+}
+

package/src/models/PayslipRequestsModel.ts

@@ -0,0 +1,31 @@
+import { Column, Entity, OneToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
+
+@Entity({ name: 'payslip_requests' })
+export class PayslipRequests extends BaseModel {
+  @Column({ type: 'int', unique: true })
+  financial_request_id: number;
+
+  @Column({ type: 'varchar', length: 7 })
+  payslip_month: string; // Format: 2025-01
+
+  @Column({ type: 'int', nullable: true })
+  payslip_year: number;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  payslip_url: string;
+
+  @OneToOne(() => FinancialRequests, fr => fr.payslipRequest)
+  @JoinColumn({ name: 'financial_request_id' })
+  financialRequest?: FinancialRequests;
+
+  constructor(financial_request_id: number, payslip_month: string, payslip_year: number, payslip_url: string) {
+    super();
+    this.financial_request_id = financial_request_id;
+    this.payslip_month = payslip_month;
+    this.payslip_year = payslip_year;
+    this.payslip_url = payslip_url;
+  }
+}
+

package/src/models/ReimbursementRequestsModel.ts

@@ -0,0 +1,58 @@
+import { Column, Entity, OneToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'reimbursement_requests' })
+export class ReimbursementRequests extends BaseModel {
+  @Column({ type: 'int', unique: true })
+  financial_request_id: number;
+
+  @Column({ type: 'text' })
+  expense_description: string;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2 })
+  price: number;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2 })
+  quantity: number;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2 })
+  amount: number;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2 })
+  total_amount: number;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  approved_amount: number;
+
+  @Column({ type: 'boolean', default: false })
+  payment_processed: boolean;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  payment_mode: string;
+
+  @Column({ type: 'date', nullable: true })
+  payment_date: Date;
+
+  constructor(
+    financial_request_id: number,
+    amount: number,
+    quantity: number,
+    total_amount: number, 
+    approved_amount: number,
+    payment_mode: string,
+    payment_date: Date,
+    expense_description: string
+  ) {
+    super();
+    this.financial_request_id = financial_request_id;
+    this.amount = amount;
+    this.quantity = quantity;
+    this.total_amount = total_amount;
+    this.approved_amount = approved_amount;
+    this.payment_mode = payment_mode;
+    this.payment_date = payment_date;
+    this.expense_description = expense_description;
+    this.payment_processed = false;
+  }
+}
+