@platform-modules/foreign-ministry 1.3.78 → 1.3.80

package/dist/models/UserEmploymentDetailsModel.d.ts

@@ -6,6 +6,8 @@ import { BaseModel } from './BaseModel';
  */
 export declare class UserEmploymentDetails extends BaseModel {
     user_id: number;
+    job_title: string | null;
+    man_power_number: string | null;
     date_of_decree_issuance: Date | null;
     civil_service_number: string | null;
     information_number: string | null;
@@ -19,6 +21,7 @@ export declare class UserEmploymentDetails extends BaseModel {
     secondment_end_date: Date | null;
     disability_type: string | null;
     retirement_start_date: Date | null;
+    retirement_end_date: Date | null;
     contract_end_date: Date | null;
     job_type_group: string | null;
     entity_transferred_from: string | null;
@@ -26,6 +29,7 @@ export declare class UserEmploymentDetails extends BaseModel {
     entity_transferred_to: string | null;
     date_of_transfer_to: Date | null;
     job_description: string | null;
+    country_of_appointment: string | null;
     date_of_appointment: Date | null;
     appointment_grade: string | null;
     type_of_appointment: string | null;
@@ -33,6 +37,7 @@ export declare class UserEmploymentDetails extends BaseModel {
     mc_work: boolean | null;
     governorate_name: string | null;
     works_in_department: string | null;
+    office: string | null;
     full_name_of_mission: string | null;
     mission: string | null;
     description_of_mission: string | null;

package/dist/models/UserEmploymentDetailsModel.js

@@ -24,6 +24,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: false }),
     __metadata("design:type", Number)
 ], UserEmploymentDetails.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserEmploymentDetails.prototype, "job_title", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserEmploymentDetails.prototype, "man_power_number", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Object)
@@ -76,6 +84,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Object)
 ], UserEmploymentDetails.prototype, "retirement_start_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], UserEmploymentDetails.prototype, "retirement_end_date", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Object)
@@ -104,6 +116,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", Object)
 ], UserEmploymentDetails.prototype, "job_description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserEmploymentDetails.prototype, "country_of_appointment", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Object)
@@ -132,6 +148,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", Object)
 ], UserEmploymentDetails.prototype, "works_in_department", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserEmploymentDetails.prototype, "office", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", Object)

package/dist/models/user.d.ts

@@ -38,11 +38,20 @@ export declare class User extends BaseModel {
     qualification?: string;
     father_name?: string;
     spouse_name?: string;
-    children1_name?: string;
-    children2_name?: string;
+    father_age?: number;
+    mother_name?: string;
+    mother_age?: number;
+    spouse_age?: number;
+    children?: {
+        name: string;
+        age: number;
+    }[];
     language_preferences?: string;
     category: "FM" | "Embassy";
     mandc_number: number;
     is_services_blocked?: boolean;
-    constructor(employee_id?: number, employee_name?: string, employee_arabic_name?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, marital_status?: string, nationality?: string, email?: string, blood_group?: string, national_id?: number, mobile?: string, office_number?: string, department?: number, section?: number, grade?: number, location?: string, country?: string, is_admin?: boolean, division?: number, reporting_to?: number, address?: string, residential_status?: string, religion?: string, designation?: number, avatar?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, civil_employee_id?: number, qualification?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, language_preferences?: string, category?: "FM" | "Embassy", mandc_number?: number, is_services_blocked?: boolean);
+    constructor(employee_id?: number, employee_name?: string, employee_arabic_name?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, marital_status?: string, nationality?: string, email?: string, blood_group?: string, national_id?: number, mobile?: string, office_number?: string, department?: number, section?: number, grade?: number, location?: string, country?: string, is_admin?: boolean, division?: number, reporting_to?: number, address?: string, residential_status?: string, religion?: string, designation?: number, avatar?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, civil_employee_id?: number, qualification?: string, father_name?: string, father_age?: number, mother_name?: string, mother_age?: number, spouse_name?: string, spouse_age?: number, children?: {
+        name: string;
+        age: number;
+    }[], language_preferences?: string, category?: "FM" | "Embassy", mandc_number?: number, is_services_blocked?: boolean);
 }

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, office_number, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, fax_number, diplomatic_name, civil_employee_id, qualification, father_name, spouse_name, children1_name, children2_name, language_preferences, category, mandc_number, is_services_blocked) {
+    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, office_number, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, fax_number, diplomatic_name, civil_employee_id, qualification, father_name, father_age, mother_name, mother_age, spouse_name, spouse_age, children, language_preferences, category, mandc_number, is_services_blocked) {
         super();
         this.employee_id = employee_id;
         this.employee_name = employee_name;
@@ -52,9 +52,12 @@ let User = class User extends BaseModel_1.BaseModel {
         this.civil_employee_id = civil_employee_id;
         this.qualification = qualification;
         this.father_name = father_name;
+        this.father_age = father_age;
+        this.mother_name = mother_name;
+        this.mother_age = mother_age;
         this.spouse_name = spouse_name;
-        this.children1_name = children1_name;
-        this.children2_name = children2_name;
+        this.spouse_age = spouse_age;
+        this.children = children;
         this.language_preferences = language_preferences;
         this.category = category || "FM";
         this.mandc_number = mandc_number || 0;
@@ -215,13 +218,25 @@ __decorate([
     __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);
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], User.prototype, "father_age", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
-], User.prototype, "children2_name", void 0);
+], User.prototype, "mother_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], User.prototype, "mother_age", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], User.prototype, "spouse_age", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'jsonb', nullable: true }),
+    __metadata("design:type", Array)
+], User.prototype, "children", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
@@ -240,5 +255,5 @@ __decorate([
 ], User.prototype, "is_services_blocked", 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, String, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, String, Number, String, String, String, String, String, String, String, Number, Boolean])
+    __metadata("design:paramtypes", [Number, String, String, String, String, String, String, String, String, String, String, String, String, Number, String, String, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, String, Number, String, String, Number, String, Number, String, Number, Array, String, String, Number, Boolean])
 ], User);

package/package.json

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

package/src/models/DiplomaticClubCardMembersModel.ts

@@ -1,75 +1,75 @@
-import { Column, Entity, ManyToOne, JoinColumn, OneToMany } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { DiplomaticRequests } from "./DiplomaticRequestsModel";
-import type { DiplomaticClubCardPhotos } from './DiplomaticClubCardPhotosModel';
-
-export enum MembershipType {
-  SINGLE = "Single",
-  FAMILY = "Family"
-}
-
-export enum RequestType {
-  EMPLOYEE_SELF = "Employee Self",
-  NON_EMPLOYEE = "Non Employee"
-}
-
-export enum MemberType {
-  PRIMARY = "Primary",
-  FAMILY_MEMBER = "Family Member"
-}
-
-@Entity({ name: 'diplomatic_club_card_members' })
-export class DiplomaticClubCardMembers extends BaseModel {
-  @Column({ type: 'int' })
-  diplomatic_request_id: number;
-
-  @Column({ type: 'varchar', length: 255 })
-  family_member_name: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  relation: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  title: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  diplomatic_title_id: number | null;
-
-  @Column({ type: 'date', nullable: true })
-  expiry_date: Date | null;
-
-  @Column({ type: 'text', nullable: true })
-  photo_url: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  membership_id: string | null;
-
-  @ManyToOne(() => DiplomaticRequests, dr => dr.diplomaticClubCardMembers)
-  @JoinColumn({ name: 'diplomatic_request_id' })
-  diplomaticRequest?: DiplomaticRequests;
-
-  @OneToMany('DiplomaticClubCardPhotos', 'diplomaticMember', { nullable: true })
-  photos?: DiplomaticClubCardPhotos[];
-
-  constructor(
-    diplomatic_request_id: number,
-    family_member_name: string,
-    relation?: string | null,
-    title?: string | null,
-    diplomatic_title_id?: number | null,
-    expiry_date?: Date | null,
-    photo_url?: string | null,
-    membership_id?: string | null
-  ) {
-    super();
-    this.diplomatic_request_id = diplomatic_request_id;
-    this.family_member_name = family_member_name;
-    this.relation = relation || null;
-    this.title = title || null;
-    this.diplomatic_title_id = diplomatic_title_id || null;
-    this.expiry_date = expiry_date || null;
-    this.photo_url = photo_url || null;
-    this.membership_id = membership_id || null;
-  }
-}
-
+import { Column, Entity, ManyToOne, JoinColumn, OneToMany } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { DiplomaticRequests } from "./DiplomaticRequestsModel";
+import type { DiplomaticClubCardPhotos } from './DiplomaticClubCardPhotosModel';
+
+export enum MembershipType {
+  SINGLE = "Single",
+  FAMILY = "Family"
+}
+
+export enum RequestType {
+  EMPLOYEE_SELF = "Employee Self",
+  NON_EMPLOYEE = "Non Employee"
+}
+
+export enum MemberType {
+  PRIMARY = "Primary",
+  FAMILY_MEMBER = "Family Member"
+}
+
+@Entity({ name: 'diplomatic_club_card_members' })
+export class DiplomaticClubCardMembers extends BaseModel {
+  @Column({ type: 'int' })
+  diplomatic_request_id: number;
+
+  @Column({ type: 'varchar', length: 255 })
+  family_member_name: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  relation: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  title: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  diplomatic_title_id: number | null;
+
+  @Column({ type: 'date', nullable: true })
+  expiry_date: Date | null;
+
+  @Column({ type: 'text', nullable: true })
+  photo_url: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  membership_id: string | null;
+
+  @ManyToOne(() => DiplomaticRequests, dr => dr.diplomaticClubCardMembers)
+  @JoinColumn({ name: 'diplomatic_request_id' })
+  diplomaticRequest?: DiplomaticRequests;
+
+  @OneToMany('DiplomaticClubCardPhotos', 'diplomaticMember', { nullable: true })
+  photos?: DiplomaticClubCardPhotos[];
+
+  constructor(
+    diplomatic_request_id: number,
+    family_member_name: string,
+    relation?: string | null,
+    title?: string | null,
+    diplomatic_title_id?: number | null,
+    expiry_date?: Date | null,
+    photo_url?: string | null,
+    membership_id?: string | null
+  ) {
+    super();
+    this.diplomatic_request_id = diplomatic_request_id;
+    this.family_member_name = family_member_name;
+    this.relation = relation || null;
+    this.title = title || null;
+    this.diplomatic_title_id = diplomatic_title_id || null;
+    this.expiry_date = expiry_date || null;
+    this.photo_url = photo_url || null;
+    this.membership_id = membership_id || null;
+  }
+}
+

package/src/models/DiplomaticClubSubscriptionMasterModel.ts

@@ -1,26 +1,26 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'diplomatic_club_subscription_master' })
-export class DiplomaticClubSubscriptionMaster extends BaseModel {
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  subscription_type: string | null; // Type: Single or Family
-
-  @Column({ type: 'decimal', precision: 10, scale: 2 })
-  subscription_amount: number;
-
-  @Column({ type: 'varchar', length: 10, nullable: true })
-  currency: string | null;
-
-  constructor(
-    subscription_type: string,
-    subscription_amount: number,
-    currency?: string | null,
-  ) {
-    super();
-    this.subscription_type = subscription_type;
-    this.subscription_amount = subscription_amount;
-    this.currency = currency || null;
-  }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'diplomatic_club_subscription_master' })
+export class DiplomaticClubSubscriptionMaster extends BaseModel {
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  subscription_type: string | null; // Type: Single or Family
+
+  @Column({ type: 'decimal', precision: 10, scale: 2 })
+  subscription_amount: number;
+
+  @Column({ type: 'varchar', length: 10, nullable: true })
+  currency: string | null;
+
+  constructor(
+    subscription_type: string,
+    subscription_amount: number,
+    currency?: string | null,
+  ) {
+    super();
+    this.subscription_type = subscription_type;
+    this.subscription_amount = subscription_amount;
+    this.currency = currency || null;
+  }
+}
+