@platform-modules/civil-aviation-authority 2.0.17 → 2.0.18

package/.env

@@ -1,11 +1,11 @@
-DB_HOST=localhost
-DB_PORT=5433
-DB_USER=postgres
-DB_PASS=123
-DB_NAME=CAA
+# DB_HOST=localhost
+# DB_PORT=5433
+# DB_USER=postgres
+# DB_PASS=123
+# DB_NAME=CAA
 
-# DB_HOST=164.52.222.169
-# DB_PORT=5432
-# DB_USER=postgres_admin_user
-# DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
-# DB_NAME=CAA
+DB_HOST=164.52.222.169
+DB_PORT=5432
+DB_USER=postgres_admin_user
+DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+DB_NAME=CAA

package/dist/models/user.d.ts

@@ -21,7 +21,7 @@ export declare class User extends BaseModel {
     mobile?: string;
     office_number?: string;
     department?: number;
-    category?: string;
+    category: "CAA" | "Embassy";
     directorate?: string;
     section?: number;
     position?: number;
@@ -34,6 +34,7 @@ export declare class User extends BaseModel {
     passport_number?: string;
     personal_email?: string;
     extension_number?: number;
+    fax_number?: string;
     diplomatic_name?: string;
     avatar?: string;
     father_name?: string;
@@ -41,5 +42,5 @@ export declare class User extends BaseModel {
     children1_name?: string;
     children2_name?: string;
     address?: string;
-    constructor(employee_id?: number, civil_employee_id?: number, employee_name?: string, employee_arabic_name?: string, person_type?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, qualification?: string, marital_status?: string, nationality?: string, email?: string, blood_type?: string, national_id?: number, manpower_id?: number, mobile?: string, office_number?: string, department?: number, category?: string, directorate?: string, section?: number, position?: number, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string, passport_number?: string, personal_email?: string, extension_number?: number, diplomatic_name?: string, avatar?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, address?: string);
+    constructor(employee_id?: number, civil_employee_id?: number, employee_name?: string, employee_arabic_name?: string, person_type?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, qualification?: string, marital_status?: string, nationality?: string, email?: string, blood_type?: string, national_id?: number, manpower_id?: number, mobile?: string, office_number?: string, department?: number, category?: "CAA" | "Embassy", directorate?: string, section?: number, position?: number, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, avatar?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, address?: string);
 }

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, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name, passport_number, personal_email, extension_number, diplomatic_name, avatar, father_name, spouse_name, children1_name, children2_name, address) {
+    constructor(employee_id, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name, passport_number, personal_email, extension_number, fax_number, diplomatic_name, avatar, father_name, spouse_name, children1_name, children2_name, address) {
         super();
         this.employee_id = employee_id;
         this.civil_employee_id = civil_employee_id;
@@ -36,7 +36,7 @@ let User = class User extends BaseModel_1.BaseModel {
         this.mobile = mobile;
         this.office_number = office_number;
         this.department = department;
-        this.category = category;
+        this.category = category || "CAA";
         this.directorate = directorate;
         this.section = section;
         this.position = position;
@@ -48,6 +48,7 @@ let User = class User extends BaseModel_1.BaseModel {
         this.passport_number = passport_number;
         this.personal_email = personal_email;
         this.extension_number = extension_number;
+        this.fax_number = fax_number;
         this.diplomatic_name = diplomatic_name;
         this.avatar = avatar;
         this.father_name = father_name;
@@ -143,7 +144,7 @@ __decorate([
     __metadata("design:type", Number)
 ], User.prototype, "department", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
+    (0, typeorm_1.Column)({ type: "enum", enum: ["CAA", "Embassy"], nullable: false, default: "CAA" }),
     __metadata("design:type", String)
 ], User.prototype, "category", void 0);
 __decorate([
@@ -194,6 +195,10 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", Number)
 ], User.prototype, "extension_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 20, nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "fax_number", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
@@ -224,5 +229,5 @@ __decorate([
 ], User.prototype, "address", void 0);
 exports.User = User = __decorate([
     (0, typeorm_1.Entity)({ name: 'users' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, Number, String, String, Number, Number, String, Number, String, Number, String, String, String, Number, String, String, String, String, String, String, String])
+    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, Number, String, String, Number, Number, String, Number, String, Number, String, String, String, Number, String, String, String, String, String, String, String, String])
 ], User);

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.0.17",
+  "version": "2.0.18",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/models/user.ts

@@ -67,8 +67,8 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     department?: number;
 
-    @Column({ nullable: true })
-    category?: string;
+    @Column({ type: "enum", enum: ["CAA", "Embassy"], nullable: false, default: "CAA" })
+    category: "CAA" | "Embassy"; // Mandatory
 
     @Column({ nullable: true })
     directorate?: string;
@@ -106,6 +106,9 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     extension_number?: number;
 
+    @Column({ type: "varchar", length: 20, nullable: true })
+    fax_number?: string; // Optional
+
     @Column({ nullable: true })
     diplomatic_name?: string;
 
@@ -149,7 +152,7 @@ export class User extends BaseModel {
         mobile?: string,
         office_number?: string,
         department?: number,
-        category?: string,
+        category?: "CAA" | "Embassy",
         directorate?: string,
         section?: number,
         position?: number,
@@ -161,6 +164,7 @@ export class User extends BaseModel {
         passport_number?: string,
         personal_email?: string,
         extension_number?: number,
+        fax_number?: string,
         diplomatic_name?: string,
         avatar?: string,
         father_name?: string,
@@ -191,7 +195,7 @@ export class User extends BaseModel {
         this.mobile = mobile;
         this.office_number = office_number;
         this.department = department;
-        this.category = category;
+        this.category = category || "CAA";
         this.directorate = directorate;
         this.section = section;
         this.position = position;
@@ -203,6 +207,7 @@ export class User extends BaseModel {
         this.passport_number = passport_number;
         this.personal_email = personal_email;
         this.extension_number = extension_number;
+        this.fax_number = fax_number;
         this.diplomatic_name = diplomatic_name;
         this.avatar = avatar;
         this.father_name = father_name;