@platform-modules/foreign-ministry 1.0.81 → 1.0.83

package/dist/models/FinancialApprovalsModel.d.ts

@@ -1,4 +1,5 @@
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
 export declare enum FinancialApprovalStatus {
     PENDING = "Pending",
     APPROVED = "Approved",
@@ -13,5 +14,6 @@ export declare class FinancialApprovals extends BaseModel {
     comment: string;
     approval_status: FinancialApprovalStatus;
     action_date: Date;
+    financialRequest?: FinancialRequests;
     constructor(financial_request_id: number, level: number, approver_role_id: number, approval_status: FinancialApprovalStatus);
 }

package/dist/models/FinancialApprovalsModel.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FinancialApprovals = exports.FinancialApprovalStatus = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
+const FinancialRequestsModel_1 = require("./FinancialRequestsModel");
 var FinancialApprovalStatus;
 (function (FinancialApprovalStatus) {
     FinancialApprovalStatus["PENDING"] = "Pending";
@@ -57,6 +58,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
     __metadata("design:type", Date)
 ], FinancialApprovals.prototype, "action_date", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => FinancialRequestsModel_1.FinancialRequests, fr => fr.approvals),
+    (0, typeorm_1.JoinColumn)({ name: 'financial_request_id' }),
+    __metadata("design:type", FinancialRequestsModel_1.FinancialRequests)
+], FinancialApprovals.prototype, "financialRequest", void 0);
 exports.FinancialApprovals = FinancialApprovals = __decorate([
     (0, typeorm_1.Entity)({ name: 'financial_approvals' }),
     __metadata("design:paramtypes", [Number, Number, Number, String])

package/dist/models/FinancialAttachmentsModel.d.ts

@@ -1,8 +1,10 @@
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
 export declare class FinancialAttachments extends BaseModel {
     financial_request_id: number;
     file_url: string;
     file_name: string;
     file_type: string;
+    financialRequest?: FinancialRequests;
     constructor(financial_request_id: number, file_url: string, file_name: string);
 }

package/dist/models/FinancialAttachmentsModel.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FinancialAttachments = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
+const FinancialRequestsModel_1 = require("./FinancialRequestsModel");
 let FinancialAttachments = class FinancialAttachments extends BaseModel_1.BaseModel {
     constructor(financial_request_id, file_url, file_name) {
         super();
@@ -38,6 +39,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
     __metadata("design:type", String)
 ], FinancialAttachments.prototype, "file_type", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => FinancialRequestsModel_1.FinancialRequests, fr => fr.attachments),
+    (0, typeorm_1.JoinColumn)({ name: 'financial_request_id' }),
+    __metadata("design:type", FinancialRequestsModel_1.FinancialRequests)
+], FinancialAttachments.prototype, "financialRequest", void 0);
 exports.FinancialAttachments = FinancialAttachments = __decorate([
     (0, typeorm_1.Entity)({ name: 'financial_attachments' }),
     __metadata("design:paramtypes", [Number, String, String])

package/dist/models/FinancialChatsModel.d.ts

@@ -1,7 +1,9 @@
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
 export declare class FinancialChats extends BaseModel {
     financial_request_id: number;
     content: string;
     sender_user_id: number;
+    financialRequest?: FinancialRequests;
     constructor(financial_request_id: number, content: string, sender_user_id: number);
 }

package/dist/models/FinancialChatsModel.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FinancialChats = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
+const FinancialRequestsModel_1 = require("./FinancialRequestsModel");
 let FinancialChats = class FinancialChats extends BaseModel_1.BaseModel {
     constructor(financial_request_id, content, sender_user_id) {
         super();
@@ -33,6 +34,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int' }),
     __metadata("design:type", Number)
 ], FinancialChats.prototype, "sender_user_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => FinancialRequestsModel_1.FinancialRequests, fr => fr.chats),
+    (0, typeorm_1.JoinColumn)({ name: 'financial_request_id' }),
+    __metadata("design:type", FinancialRequestsModel_1.FinancialRequests)
+], FinancialChats.prototype, "financialRequest", void 0);
 exports.FinancialChats = FinancialChats = __decorate([
     (0, typeorm_1.Entity)({ name: 'financial_chats' }),
     __metadata("design:paramtypes", [Number, String, Number])

package/dist/models/FinancialRequestsModel.d.ts

@@ -1,4 +1,14 @@
 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 declare enum FinancialRequestStatus {
     DRAFT = "Draft",
     SUBMITTED = "Submitted",
@@ -25,5 +35,15 @@ export declare class FinancialRequests extends BaseModel {
     remarks: string;
     current_approval_level: number;
     current_approver_id: number;
+    payslipRequest?: PayslipRequests;
+    salaryCertificateRequest?: SalaryCertificateRequests;
+    allowanceRequest?: AllowanceRequests;
+    reimbursementRequest?: ReimbursementRequests;
+    bankAccountChangeRequest?: BankAccountChangeRequests;
+    chats?: FinancialChats[];
+    approvals?: FinancialApprovals[];
+    workflows?: FinancialWorkFlow[];
+    attachments?: FinancialAttachments[];
+    requestType?: RequestTypeMaster;
     constructor(user_id: number, employee_id: string, employee_name: string, email_address: string, contact_number: string, request_type_id: number);
 }

package/dist/models/FinancialRequestsModel.js

@@ -12,6 +12,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FinancialRequests = exports.FinancialRequestStatus = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
+const PayslipRequestsModel_1 = require("./PayslipRequestsModel");
+const SalaryCertificateRequestsModel_1 = require("./SalaryCertificateRequestsModel");
+const AllowanceRequestsModel_1 = require("./AllowanceRequestsModel");
+const ReimbursementRequestsModel_1 = require("./ReimbursementRequestsModel");
+const BankAccountChangeRequestsModel_1 = require("./BankAccountChangeRequestsModel");
+const FinancialChatsModel_1 = require("./FinancialChatsModel");
+const FinancialApprovalsModel_1 = require("./FinancialApprovalsModel");
+const FinancialWorkFlowModel_1 = require("./FinancialWorkFlowModel");
+const FinancialAttachmentsModel_1 = require("./FinancialAttachmentsModel");
+const RequestTypeMasterModel_1 = require("./RequestTypeMasterModel");
 var FinancialRequestStatus;
 (function (FinancialRequestStatus) {
     FinancialRequestStatus["DRAFT"] = "Draft";
@@ -97,6 +107,47 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
 ], FinancialRequests.prototype, "current_approver_id", void 0);
+__decorate([
+    (0, typeorm_1.OneToOne)(() => PayslipRequestsModel_1.PayslipRequests, payslip => payslip.financialRequest, { nullable: true }),
+    __metadata("design:type", PayslipRequestsModel_1.PayslipRequests)
+], FinancialRequests.prototype, "payslipRequest", void 0);
+__decorate([
+    (0, typeorm_1.OneToOne)(() => SalaryCertificateRequestsModel_1.SalaryCertificateRequests, cert => cert.financial_request_id, { nullable: true }),
+    __metadata("design:type", SalaryCertificateRequestsModel_1.SalaryCertificateRequests)
+], FinancialRequests.prototype, "salaryCertificateRequest", void 0);
+__decorate([
+    (0, typeorm_1.OneToOne)(() => AllowanceRequestsModel_1.AllowanceRequests, allowance => allowance.financial_request_id, { nullable: true }),
+    __metadata("design:type", AllowanceRequestsModel_1.AllowanceRequests)
+], FinancialRequests.prototype, "allowanceRequest", void 0);
+__decorate([
+    (0, typeorm_1.OneToOne)(() => ReimbursementRequestsModel_1.ReimbursementRequests, reimb => reimb.financial_request_id, { nullable: true }),
+    __metadata("design:type", ReimbursementRequestsModel_1.ReimbursementRequests)
+], FinancialRequests.prototype, "reimbursementRequest", void 0);
+__decorate([
+    (0, typeorm_1.OneToOne)(() => BankAccountChangeRequestsModel_1.BankAccountChangeRequests, bank => bank.financial_request_id, { nullable: true }),
+    __metadata("design:type", BankAccountChangeRequestsModel_1.BankAccountChangeRequests)
+], FinancialRequests.prototype, "bankAccountChangeRequest", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => FinancialChatsModel_1.FinancialChats, chat => chat.financialRequest),
+    __metadata("design:type", Array)
+], FinancialRequests.prototype, "chats", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => FinancialApprovalsModel_1.FinancialApprovals, approval => approval.financialRequest),
+    __metadata("design:type", Array)
+], FinancialRequests.prototype, "approvals", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => FinancialWorkFlowModel_1.FinancialWorkFlow, workflow => workflow.financialRequest),
+    __metadata("design:type", Array)
+], FinancialRequests.prototype, "workflows", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => FinancialAttachmentsModel_1.FinancialAttachments, attachment => attachment.financialRequest),
+    __metadata("design:type", Array)
+], FinancialRequests.prototype, "attachments", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => RequestTypeMasterModel_1.RequestTypeMaster),
+    (0, typeorm_1.JoinColumn)({ name: 'request_type_id' }),
+    __metadata("design:type", RequestTypeMasterModel_1.RequestTypeMaster)
+], FinancialRequests.prototype, "requestType", void 0);
 exports.FinancialRequests = FinancialRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'financial_requests' }),
     __metadata("design:paramtypes", [Number, String, String, String, String, Number])

package/dist/models/FinancialWorkFlowModel.d.ts

@@ -1,4 +1,5 @@
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
 export declare enum FinancialWorkFlowStatus {
     COMPLETED = "Completed",
     NOT_YET_STARTED = "Not Yet Started",
@@ -12,5 +13,6 @@ export declare class FinancialWorkFlow extends BaseModel {
     approved_by_user_id: number;
     content: string;
     activity_date: Date;
+    financialRequest?: FinancialRequests;
     constructor(financial_request_id: number, status: FinancialWorkFlowStatus, approved_by_user_id: number, content: string);
 }

package/dist/models/FinancialWorkFlowModel.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FinancialWorkFlow = exports.FinancialWorkFlowStatus = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
+const FinancialRequestsModel_1 = require("./FinancialRequestsModel");
 var FinancialWorkFlowStatus;
 (function (FinancialWorkFlowStatus) {
     FinancialWorkFlowStatus["COMPLETED"] = "Completed";
@@ -55,6 +56,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' }),
     __metadata("design:type", Date)
 ], FinancialWorkFlow.prototype, "activity_date", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => FinancialRequestsModel_1.FinancialRequests, fr => fr.workflows),
+    (0, typeorm_1.JoinColumn)({ name: 'financial_request_id' }),
+    __metadata("design:type", FinancialRequestsModel_1.FinancialRequests)
+], FinancialWorkFlow.prototype, "financialRequest", void 0);
 exports.FinancialWorkFlow = FinancialWorkFlow = __decorate([
     (0, typeorm_1.Entity)({ name: 'financial_work_flows' }),
     __metadata("design:paramtypes", [Number, String, Number, String])

package/dist/models/PayslipRequestsModel.d.ts

@@ -1,8 +1,10 @@
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
 export declare class PayslipRequests extends BaseModel {
     financial_request_id: number;
     payslip_month: string;
     payslip_year: number;
     payslip_url: string;
+    financialRequest?: FinancialRequests;
     constructor(financial_request_id: number, payslip_month: string, payslip_year: number, payslip_url: string);
 }

package/dist/models/PayslipRequestsModel.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PayslipRequests = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
+const FinancialRequestsModel_1 = require("./FinancialRequestsModel");
 let PayslipRequests = class PayslipRequests extends BaseModel_1.BaseModel {
     constructor(financial_request_id, payslip_month, payslip_year, payslip_url) {
         super();
@@ -38,6 +39,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
     __metadata("design:type", String)
 ], PayslipRequests.prototype, "payslip_url", void 0);
+__decorate([
+    (0, typeorm_1.OneToOne)(() => FinancialRequestsModel_1.FinancialRequests, fr => fr.payslipRequest),
+    (0, typeorm_1.JoinColumn)({ name: 'financial_request_id' }),
+    __metadata("design:type", FinancialRequestsModel_1.FinancialRequests)
+], PayslipRequests.prototype, "financialRequest", void 0);
 exports.PayslipRequests = PayslipRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'payslip_requests' }),
     __metadata("design:paramtypes", [Number, String, Number, String])

package/dist/models/SalaryCertificateRequestsModel.d.ts

@@ -1,12 +1,9 @@
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from "./FinancialRequestsModel";
 export declare class SalaryCertificateRequests extends BaseModel {
     financial_request_id: number;
     certificate_purpose: string;
     certificate_url: string;
-    addressee_name: string;
-    addressee_details: string;
-    include_salary_details: boolean;
-    include_allowances: boolean;
-    certificate_language: string;
+    financialRequest?: FinancialRequests;
     constructor(financial_request_id: number, certificate_purpose: string, certificate_url: string);
 }

package/dist/models/SalaryCertificateRequestsModel.js

@@ -12,15 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SalaryCertificateRequests = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
+const FinancialRequestsModel_1 = require("./FinancialRequestsModel");
 let SalaryCertificateRequests = class SalaryCertificateRequests extends BaseModel_1.BaseModel {
     constructor(financial_request_id, certificate_purpose, certificate_url) {
         super();
         this.financial_request_id = financial_request_id;
         this.certificate_purpose = certificate_purpose;
         this.certificate_url = certificate_url;
-        this.include_salary_details = false;
-        this.include_allowances = false;
-        this.certificate_language = 'English';
     }
 };
 exports.SalaryCertificateRequests = SalaryCertificateRequests;
@@ -37,25 +35,10 @@ __decorate([
     __metadata("design:type", String)
 ], SalaryCertificateRequests.prototype, "certificate_url", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
-    __metadata("design:type", String)
-], SalaryCertificateRequests.prototype, "addressee_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
-    __metadata("design:type", String)
-], SalaryCertificateRequests.prototype, "addressee_details", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
-    __metadata("design:type", Boolean)
-], SalaryCertificateRequests.prototype, "include_salary_details", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
-    __metadata("design:type", Boolean)
-], SalaryCertificateRequests.prototype, "include_allowances", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
-    __metadata("design:type", String)
-], SalaryCertificateRequests.prototype, "certificate_language", void 0);
+    (0, typeorm_1.OneToOne)(() => FinancialRequestsModel_1.FinancialRequests, fr => fr.salaryCertificateRequest),
+    (0, typeorm_1.JoinColumn)({ name: 'financial_request_id' }),
+    __metadata("design:type", FinancialRequestsModel_1.FinancialRequests)
+], SalaryCertificateRequests.prototype, "financialRequest", void 0);
 exports.SalaryCertificateRequests = SalaryCertificateRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'salary_certificate_requests' }),
     __metadata("design:paramtypes", [Number, String, String])

package/package.json

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

package/src/models/FinancialApprovalsModel.ts

@@ -1,5 +1,6 @@
 import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
 
 export enum FinancialApprovalStatus {
   PENDING = "Pending",
@@ -31,6 +32,10 @@ export class FinancialApprovals extends BaseModel {
   @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,

package/src/models/FinancialAttachmentsModel.ts

@@ -1,5 +1,6 @@
 import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
 
 @Entity({ name: 'financial_attachments' })
 export class FinancialAttachments extends BaseModel {
@@ -15,6 +16,10 @@ export class FinancialAttachments extends BaseModel {
   @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,

package/src/models/FinancialChatsModel.ts

@@ -1,5 +1,6 @@
 import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
 
 @Entity({ name: 'financial_chats' })
 export class FinancialChats extends BaseModel {
@@ -12,6 +13,10 @@ export class FinancialChats extends BaseModel {
   @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;

package/src/models/FinancialRequestsModel.ts

@@ -1,5 +1,15 @@
 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",
@@ -59,6 +69,37 @@ export class FinancialRequests extends BaseModel {
   @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,

package/src/models/FinancialWorkFlowModel.ts

@@ -1,5 +1,6 @@
 import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
 
 export enum FinancialWorkFlowStatus {
   COMPLETED = "Completed",
@@ -28,6 +29,10 @@ export class FinancialWorkFlow extends BaseModel {
   @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,

package/src/models/PayslipRequestsModel.ts

@@ -1,5 +1,6 @@
 import { Column, Entity, OneToOne, JoinColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from './FinancialRequestsModel';
 
 @Entity({ name: 'payslip_requests' })
 export class PayslipRequests extends BaseModel {
@@ -15,6 +16,10 @@ export class PayslipRequests extends BaseModel {
   @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;

package/src/models/SalaryCertificateRequestsModel.ts

@@ -1,5 +1,6 @@
 import { Column, Entity, OneToOne, JoinColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from "./FinancialRequestsModel";
 
 @Entity({ name: 'salary_certificate_requests' })
 export class SalaryCertificateRequests extends BaseModel {
@@ -12,29 +13,16 @@ export class SalaryCertificateRequests extends BaseModel {
   @Column({ type: 'varchar', length: 500, nullable: true })
   certificate_url: string;
 
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  addressee_name: string;
 
-  @Column({ type: 'text', nullable: true })
-  addressee_details: string;
-
-  @Column({ type: 'boolean', default: false })
-  include_salary_details: boolean;
-
-  @Column({ type: 'boolean', default: false })
-  include_allowances: boolean;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  certificate_language: string; // English, Arabic
+  @OneToOne(() => FinancialRequests, fr => fr.salaryCertificateRequest)
+  @JoinColumn({ name: 'financial_request_id' })
+  financialRequest?: FinancialRequests;
 
   constructor(financial_request_id: number, certificate_purpose: string, certificate_url: string) {
     super();
     this.financial_request_id = financial_request_id;
     this.certificate_purpose = certificate_purpose;
     this.certificate_url = certificate_url;
-    this.include_salary_details = false;
-    this.include_allowances = false;
-    this.certificate_language = 'English';
   }
 }