@platform-modules/foreign-ministry 1.0.82 → 1.0.83

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

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