@platform-modules/civil-aviation-authority 2.0.0 → 2.0.1

package/.env

@@ -1,5 +1,9 @@
-DB_HOST=localhost
+DB_HOST=164.52.222.169
 DB_PORT=5432
-DB_USER=postgres
-DB_PASS=stevejobs
-DB_NAME=CAA
+DB_USER=postgres_admin_user
+DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+DB_NAME=CAA
+
+# TYPEORM_HOST =164.52.222.169
+# TYPEORM_USERNAME = postgres_admin_user
+# TYPEORM_PASSWORD = pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn

package/dist/models/WorkflowDefinitions.d.ts

@@ -7,10 +7,10 @@ export declare class WorkflowDefinitions extends BaseModel {
     version: number;
     is_active: boolean;
     service_type: 'internal' | 'external' | 'none';
-    service_id: number;
+    service_id: number | null;
     service: CAAServices;
-    sub_service_id: number;
+    sub_service_id: number | null;
     sub_service: CAASubServices;
     status: 'draft' | 'published';
-    constructor(name: string, description?: string, version?: number, is_active?: boolean, service_id?: number, sub_service_id?: number, status?: 'draft' | 'published', service_type?: 'internal' | 'external' | 'none');
+    constructor(name: string, description?: string, version?: number, is_active?: boolean, service_id?: number | null, sub_service_id?: number | null, status?: 'draft' | 'published', service_type?: 'internal' | 'external' | 'none');
 }

package/dist/models/WorkflowDefinitions.js

@@ -21,8 +21,8 @@ let WorkflowDefinitions = class WorkflowDefinitions extends BaseModel_1.BaseMode
         this.description = description || '';
         this.version = version || 1;
         this.is_active = is_active !== undefined ? is_active : true;
-        this.service_id = service_id || 0;
-        this.sub_service_id = sub_service_id || 0;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
         this.status = status || 'draft';
         this.service_type = service_type || 'none';
     }
@@ -54,8 +54,8 @@ __decorate([
     __metadata("design:type", String)
 ], WorkflowDefinitions.prototype, "service_type", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
-    __metadata("design:type", Number)
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Object)
 ], WorkflowDefinitions.prototype, "service_id", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => CAAServices_1.CAAServices),
@@ -63,8 +63,8 @@ __decorate([
     __metadata("design:type", CAAServices_1.CAAServices)
 ], WorkflowDefinitions.prototype, "service", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
-    __metadata("design:type", Number)
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Object)
 ], WorkflowDefinitions.prototype, "sub_service_id", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => CAASubServices_1.CAASubServices),
@@ -82,5 +82,5 @@ __decorate([
 ], WorkflowDefinitions.prototype, "status", void 0);
 exports.WorkflowDefinitions = WorkflowDefinitions = __decorate([
     (0, typeorm_1.Entity)({ name: 'workflow_definitions' }),
-    __metadata("design:paramtypes", [String, String, Number, Boolean, Number, Number, String, String])
+    __metadata("design:paramtypes", [String, String, Number, Boolean, Object, Object, String, String])
 ], WorkflowDefinitions);

package/dist/models/user.d.ts

@@ -40,5 +40,6 @@ export declare class User extends BaseModel {
     spouse_name?: string;
     children1_name?: string;
     children2_name?: 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?: 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);
 }

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) {
+    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) {
         super();
         this.employee_id = employee_id;
         this.civil_employee_id = civil_employee_id;
@@ -54,6 +54,7 @@ let User = class User extends BaseModel_1.BaseModel {
         this.spouse_name = spouse_name;
         this.children1_name = children1_name;
         this.children2_name = children2_name;
+        this.address = address;
     }
 };
 exports.User = User;
@@ -217,7 +218,11 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "children2_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], 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])
+    __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])
 ], User);

package/package.json

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

package/src/models/CAAServices.ts

@@ -14,19 +14,15 @@ export class CAAServices extends BaseModel {
     @Column({ nullable: false })
     description: string;
 
-    @Column({ nullable: false })
-    logo_url: string;
 
     constructor(     
         name: string,
         description: string,
-        logo_url: string,
         code?: string
     ) {
         super();     
         this.name = name;
         this.description = description;
-        this.logo_url = logo_url;
         this.code = code || '';
     }
 }

package/src/models/WorkflowDefinitions.ts

@@ -26,15 +26,15 @@ export class WorkflowDefinitions extends BaseModel {
     })
     service_type: 'internal' | 'external' | 'none';
 
-    @Column({ type: 'bigint', nullable: false })
-    service_id: number;
+    @Column({ type: 'bigint', nullable: true })
+    service_id: number | null;
 
     @ManyToOne(() => CAAServices)
     @JoinColumn({ name: 'service_id' })
     service: CAAServices;
 
-    @Column({ type: 'bigint', nullable: false })
-    sub_service_id: number;
+    @Column({ type: 'bigint', nullable: true })
+    sub_service_id: number | null;
 
     @ManyToOne(() => CAASubServices)
     @JoinColumn({ name: 'sub_service_id' })
@@ -53,8 +53,8 @@ export class WorkflowDefinitions extends BaseModel {
         description?: string,
         version?: number,
         is_active?: boolean,
-        service_id?: number,
-        sub_service_id?: number,
+        service_id?: number | null,
+        sub_service_id?: number | null,
         status?: 'draft' | 'published',
         service_type?: 'internal' | 'external' | 'none'
     ) {
@@ -63,8 +63,8 @@ export class WorkflowDefinitions extends BaseModel {
         this.description = description || '';
         this.version = version || 1;
         this.is_active = is_active !== undefined ? is_active : true;
-        this.service_id = service_id || 0;
-        this.sub_service_id = sub_service_id || 0;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
         this.status = status || 'draft';
         this.service_type = service_type || 'none';
     }

package/src/models/user.ts

@@ -124,6 +124,8 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     children2_name?: string;
 
+    @Column({ nullable: true })
+    address?: string;
     
     constructor(     
         employee_id?: number,
@@ -164,7 +166,8 @@ export class User extends BaseModel {
         father_name?: string,
         spouse_name?: string,
         children1_name?: string,
-        children2_name?: string
+        children2_name?: string,
+        address?: string
     ) {
         super();     
         this.employee_id = employee_id;
@@ -206,5 +209,6 @@ export class User extends BaseModel {
         this.spouse_name = spouse_name;
         this.children1_name = children1_name;
         this.children2_name = children2_name;
+        this.address = address;
     }
 }