@platform-modules/foreign-ministry 1.0.82 → 1.0.84

package/dist/models/FinancialRequestsModel.d.ts

@@ -1,14 +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';
+import type { PayslipRequests } from './PayslipRequestsModel';
+import type { SalaryCertificateRequests } from './SalaryCertificateRequestsModel';
+import type { AllowanceRequests } from './AllowanceRequestsModel';
+import type { ReimbursementRequests } from './ReimbursementRequestsModel';
+import type { BankAccountChangeRequests } from './BankAccountChangeRequestsModel';
+import type { FinancialChats } from './FinancialChatsModel';
+import type { FinancialApprovals } from './FinancialApprovalsModel';
+import type { FinancialWorkFlow } from './FinancialWorkFlowModel';
+import type { FinancialAttachments } from './FinancialAttachmentsModel';
+import type { RequestTypeMaster } from './RequestTypeMasterModel';
 export declare enum FinancialRequestStatus {
     DRAFT = "Draft",
     SUBMITTED = "Submitted",

package/dist/models/FinancialRequestsModel.js

@@ -12,16 +12,6 @@ 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";
@@ -108,45 +98,45 @@ __decorate([
     __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)
+    (0, typeorm_1.OneToOne)('PayslipRequests', 'financialRequest', { nullable: true }),
+    __metadata("design:type", Function)
 ], 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)
+    (0, typeorm_1.OneToOne)('SalaryCertificateRequests', 'financialRequest', { nullable: true }),
+    __metadata("design:type", Function)
 ], 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)
+    (0, typeorm_1.OneToOne)('AllowanceRequests', 'financialRequest', { nullable: true }),
+    __metadata("design:type", Function)
 ], 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)
+    (0, typeorm_1.OneToOne)('ReimbursementRequests', 'financialRequest', { nullable: true }),
+    __metadata("design:type", Function)
 ], 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)
+    (0, typeorm_1.OneToOne)('BankAccountChangeRequests', 'financialRequest', { nullable: true }),
+    __metadata("design:type", Function)
 ], FinancialRequests.prototype, "bankAccountChangeRequest", void 0);
 __decorate([
-    (0, typeorm_1.OneToMany)(() => FinancialChatsModel_1.FinancialChats, chat => chat.financialRequest),
+    (0, typeorm_1.OneToMany)('FinancialChats', 'financialRequest'),
     __metadata("design:type", Array)
 ], FinancialRequests.prototype, "chats", void 0);
 __decorate([
-    (0, typeorm_1.OneToMany)(() => FinancialApprovalsModel_1.FinancialApprovals, approval => approval.financialRequest),
+    (0, typeorm_1.OneToMany)('FinancialApprovals', 'financialRequest'),
     __metadata("design:type", Array)
 ], FinancialRequests.prototype, "approvals", void 0);
 __decorate([
-    (0, typeorm_1.OneToMany)(() => FinancialWorkFlowModel_1.FinancialWorkFlow, workflow => workflow.financialRequest),
+    (0, typeorm_1.OneToMany)('FinancialWorkFlow', 'financialRequest'),
     __metadata("design:type", Array)
 ], FinancialRequests.prototype, "workflows", void 0);
 __decorate([
-    (0, typeorm_1.OneToMany)(() => FinancialAttachmentsModel_1.FinancialAttachments, attachment => attachment.financialRequest),
+    (0, typeorm_1.OneToMany)('FinancialAttachments', 'financialRequest'),
     __metadata("design:type", Array)
 ], FinancialRequests.prototype, "attachments", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(() => RequestTypeMasterModel_1.RequestTypeMaster),
+    (0, typeorm_1.ManyToOne)('RequestTypeMaster'),
     (0, typeorm_1.JoinColumn)({ name: 'request_type_id' }),
-    __metadata("design:type", RequestTypeMasterModel_1.RequestTypeMaster)
+    __metadata("design:type", Function)
 ], FinancialRequests.prototype, "requestType", void 0);
 exports.FinancialRequests = FinancialRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'financial_requests' }),

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

package/src/models/FinancialRequestsModel.ts

@@ -1,15 +1,17 @@
 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';
+
+// Import types only (not for runtime)
+import type { PayslipRequests } from './PayslipRequestsModel';
+import type { SalaryCertificateRequests } from './SalaryCertificateRequestsModel';
+import type { AllowanceRequests } from './AllowanceRequestsModel';
+import type { ReimbursementRequests } from './ReimbursementRequestsModel';
+import type { BankAccountChangeRequests } from './BankAccountChangeRequestsModel';
+import type { FinancialChats } from './FinancialChatsModel';
+import type { FinancialApprovals } from './FinancialApprovalsModel';
+import type { FinancialWorkFlow } from './FinancialWorkFlowModel';
+import type { FinancialAttachments } from './FinancialAttachmentsModel';
+import type { RequestTypeMaster } from './RequestTypeMasterModel';
 
 export enum FinancialRequestStatus {
   DRAFT = "Draft",
@@ -69,34 +71,34 @@ export class FinancialRequests extends BaseModel {
   @Column({ type: 'int', nullable: true })
   current_approver_id: number;
 
-  @OneToOne(() => PayslipRequests, payslip => payslip.financialRequest, { nullable: true })
+  @OneToOne('PayslipRequests', 'financialRequest', { nullable: true })
   payslipRequest?: PayslipRequests;
 
-  @OneToOne(() => SalaryCertificateRequests, cert => cert.financial_request_id, { nullable: true })
+  @OneToOne('SalaryCertificateRequests', 'financialRequest', { nullable: true })
   salaryCertificateRequest?: SalaryCertificateRequests;
 
-  @OneToOne(() => AllowanceRequests, allowance => allowance.financial_request_id, { nullable: true })
+  @OneToOne('AllowanceRequests', 'financialRequest', { nullable: true })
   allowanceRequest?: AllowanceRequests;
 
-  @OneToOne(() => ReimbursementRequests, reimb => reimb.financial_request_id, { nullable: true })
+  @OneToOne('ReimbursementRequests', 'financialRequest', { nullable: true })
   reimbursementRequest?: ReimbursementRequests;
 
-  @OneToOne(() => BankAccountChangeRequests, bank => bank.financial_request_id, { nullable: true })
+  @OneToOne('BankAccountChangeRequests', 'financialRequest', { nullable: true })
   bankAccountChangeRequest?: BankAccountChangeRequests;
 
-  @OneToMany(() => FinancialChats, chat => chat.financialRequest)
+  @OneToMany('FinancialChats', 'financialRequest')
   chats?: FinancialChats[];
 
-  @OneToMany(() => FinancialApprovals, approval => approval.financialRequest)
+  @OneToMany('FinancialApprovals', 'financialRequest')
   approvals?: FinancialApprovals[];
 
-  @OneToMany(() => FinancialWorkFlow, workflow => workflow.financialRequest)
+  @OneToMany('FinancialWorkFlow', 'financialRequest')
   workflows?: FinancialWorkFlow[];
 
-  @OneToMany(() => FinancialAttachments, attachment => attachment.financialRequest)
+  @OneToMany('FinancialAttachments', 'financialRequest')
   attachments?: FinancialAttachments[];
 
-  @ManyToOne(() => RequestTypeMaster)
+  @ManyToOne('RequestTypeMaster')
   @JoinColumn({ name: 'request_type_id' })
   requestType?: RequestTypeMaster;
 

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