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

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/data-source.js

@@ -31,6 +31,8 @@ const contactInfoModel_1 = require("./models/contactInfoModel");
 const userRolesModel_1 = require("./models/userRolesModel");
 const roleRightsModel_1 = require("./models/roleRightsModel");
 const NotificationModel_1 = require("./models/NotificationModel");
+const ITRequestChatModel_1 = require("./models/ITRequestChatModel");
+const ITRequestAttachmentModel_1 = require("./models/ITRequestAttachmentModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -65,6 +67,8 @@ exports.AppDataSource = new typeorm_1.DataSource({
         contactInfoModel_1.ContactInfo,
         userRolesModel_1.UserRole,
         roleRightsModel_1.RoleRights,
-        NotificationModel_1.Notification
+        NotificationModel_1.Notification,
+        ITRequestChatModel_1.ITRequestChat,
+        ITRequestAttachmentModel_1.ITRequestAttachment
     ],
 });

package/dist/index.d.ts

@@ -23,3 +23,5 @@ export * from './models/contactInfoModel';
 export * from './models/userRolesModel';
 export * from './models/roleRightsModel';
 export * from './models/NotificationModel';
+export * from './models/ITRequestChatModel';
+export * from './models/ITRequestAttachmentModel';

package/dist/index.js

@@ -40,3 +40,5 @@ __exportStar(require("./models/contactInfoModel"), exports);
 __exportStar(require("./models/userRolesModel"), exports);
 __exportStar(require("./models/roleRightsModel"), exports);
 __exportStar(require("./models/NotificationModel"), exports);
+__exportStar(require("./models/ITRequestChatModel"), exports);
+__exportStar(require("./models/ITRequestAttachmentModel"), exports);

package/dist/models/CAAServices.d.ts

@@ -3,6 +3,5 @@ export declare class CAAServices extends BaseModel {
     code: string;
     name: string;
     description: string;
-    logo_url: string;
-    constructor(name: string, description: string, logo_url: string, code?: string);
+    constructor(name: string, description: string, code?: string);
 }

package/dist/models/CAAServices.js

@@ -13,11 +13,10 @@ exports.CAAServices = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let CAAServices = class CAAServices extends BaseModel_1.BaseModel {
-    constructor(name, description, logo_url, code) {
+    constructor(name, description, code) {
         super();
         this.name = name;
         this.description = description;
-        this.logo_url = logo_url;
         this.code = code || '';
     }
 };
@@ -34,11 +33,7 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: false }),
     __metadata("design:type", String)
 ], CAAServices.prototype, "description", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
-    __metadata("design:type", String)
-], CAAServices.prototype, "logo_url", void 0);
 exports.CAAServices = CAAServices = __decorate([
     (0, typeorm_1.Entity)({ name: 'caa_services' }),
-    __metadata("design:paramtypes", [String, String, String, String])
+    __metadata("design:paramtypes", [String, String, String])
 ], CAAServices);

package/dist/models/ITRequestAttachmentModel.d.ts

@@ -0,0 +1,15 @@
+import { BaseModel } from './BaseModel';
+import { ITHelpDeskRequests } from './ITHelpDeskModel';
+import { User } from './user';
+export declare class ITRequestAttachment extends BaseModel {
+    request_id: number;
+    request: ITHelpDeskRequests;
+    uploaded_by: number;
+    user: User;
+    file_url: string;
+    file_name: string;
+    file_type: string;
+    file_size: number | null;
+    description: string;
+    constructor(request_id: number, uploaded_by: number, file_url: string, file_name?: string, file_type?: string, file_size?: number, description?: string);
+}

package/dist/models/ITRequestAttachmentModel.js

@@ -0,0 +1,71 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ITRequestAttachment = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const ITHelpDeskModel_1 = require("./ITHelpDeskModel");
+const user_1 = require("./user");
+let ITRequestAttachment = class ITRequestAttachment extends BaseModel_1.BaseModel {
+    constructor(request_id, uploaded_by, file_url, file_name, file_type, file_size, description) {
+        super();
+        this.request_id = request_id;
+        this.uploaded_by = uploaded_by;
+        this.file_url = file_url;
+        this.file_name = file_name || '';
+        this.file_type = file_type || '';
+        this.file_size = file_size || null;
+        this.description = description || '';
+    }
+};
+exports.ITRequestAttachment = ITRequestAttachment;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], ITRequestAttachment.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => ITHelpDeskModel_1.ITHelpDeskRequests),
+    (0, typeorm_1.JoinColumn)({ name: 'request_id' }),
+    __metadata("design:type", ITHelpDeskModel_1.ITHelpDeskRequests)
+], ITRequestAttachment.prototype, "request", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], ITRequestAttachment.prototype, "uploaded_by", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => user_1.User),
+    (0, typeorm_1.JoinColumn)({ name: 'uploaded_by' }),
+    __metadata("design:type", user_1.User)
+], ITRequestAttachment.prototype, "user", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: false }),
+    __metadata("design:type", String)
+], ITRequestAttachment.prototype, "file_url", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", String)
+], ITRequestAttachment.prototype, "file_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", String)
+], ITRequestAttachment.prototype, "file_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Object)
+], ITRequestAttachment.prototype, "file_size", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], ITRequestAttachment.prototype, "description", void 0);
+exports.ITRequestAttachment = ITRequestAttachment = __decorate([
+    (0, typeorm_1.Entity)({ name: 'it_request_attachments' }),
+    __metadata("design:paramtypes", [Number, Number, String, String, String, Number, String])
+], ITRequestAttachment);

package/dist/models/ITRequestChatModel.d.ts

@@ -0,0 +1,12 @@
+import { BaseModel } from './BaseModel';
+import { ITHelpDeskRequests } from './ITHelpDeskModel';
+import { User } from './user';
+export declare class ITRequestChat extends BaseModel {
+    request_id: number;
+    request: ITHelpDeskRequests;
+    user_id: number;
+    user: User;
+    message: string;
+    is_internal: boolean;
+    constructor(request_id: number, user_id: number, message: string, is_internal?: boolean);
+}

package/dist/models/ITRequestChatModel.js

@@ -0,0 +1,56 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ITRequestChat = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const ITHelpDeskModel_1 = require("./ITHelpDeskModel");
+const user_1 = require("./user");
+let ITRequestChat = class ITRequestChat extends BaseModel_1.BaseModel {
+    constructor(request_id, user_id, message, is_internal) {
+        super();
+        this.request_id = request_id;
+        this.user_id = user_id;
+        this.message = message;
+        this.is_internal = is_internal || false;
+    }
+};
+exports.ITRequestChat = ITRequestChat;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], ITRequestChat.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => ITHelpDeskModel_1.ITHelpDeskRequests),
+    (0, typeorm_1.JoinColumn)({ name: 'request_id' }),
+    __metadata("design:type", ITHelpDeskModel_1.ITHelpDeskRequests)
+], ITRequestChat.prototype, "request", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], ITRequestChat.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => user_1.User),
+    (0, typeorm_1.JoinColumn)({ name: 'user_id' }),
+    __metadata("design:type", user_1.User)
+], ITRequestChat.prototype, "user", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: false }),
+    __metadata("design:type", String)
+], ITRequestChat.prototype, "message", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], ITRequestChat.prototype, "is_internal", void 0);
+exports.ITRequestChat = ITRequestChat = __decorate([
+    (0, typeorm_1.Entity)({ name: 'it_request_chat' }),
+    __metadata("design:paramtypes", [Number, Number, String, Boolean])
+], ITRequestChat);

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

package/src/data-source.ts

@@ -28,6 +28,8 @@ import { ContactInfo } from './models/contactInfoModel';
 import { UserRole } from './models/userRolesModel';
 import { RoleRights } from './models/roleRightsModel';
 import { Notification } from './models/NotificationModel';
+import { ITRequestChat } from './models/ITRequestChatModel';
+import { ITRequestAttachment } from './models/ITRequestAttachmentModel';
 
 
 
@@ -65,6 +67,8 @@ export const AppDataSource = new DataSource({
     ContactInfo,
     UserRole,
     RoleRights,
-    Notification
+    Notification,
+    ITRequestChat,
+    ITRequestAttachment
   ],
 });

package/src/index.ts

@@ -24,3 +24,5 @@ export * from './models/contactInfoModel';
 export * from './models/userRolesModel';
 export * from './models/roleRightsModel';
 export * from './models/NotificationModel';
+export * from './models/ITRequestChatModel';
+export * from './models/ITRequestAttachmentModel';

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/ITRequestAttachmentModel.ts

@@ -0,0 +1,57 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { ITHelpDeskRequests } from './ITHelpDeskModel';
+import { User } from './user';
+
+@Entity({ name: 'it_request_attachments' })
+export class ITRequestAttachment extends BaseModel {
+
+    @Column({ type: 'integer', nullable: false })
+    request_id: number;
+
+    @ManyToOne(() => ITHelpDeskRequests)
+    @JoinColumn({ name: 'request_id' })
+    request: ITHelpDeskRequests;
+
+    @Column({ type: 'integer', nullable: false })
+    uploaded_by: number;
+
+    @ManyToOne(() => User)
+    @JoinColumn({ name: 'uploaded_by' })
+    user: User;
+
+    @Column({ type: 'varchar', length: 500, nullable: false })
+    file_url: string;
+
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    file_name: string;
+
+    @Column({ type: 'varchar', length: 100, nullable: true })
+    file_type: string;
+
+    @Column({ type: 'bigint', nullable: true })
+    file_size: number | null;
+
+    @Column({ type: 'text', nullable: true })
+    description: string;
+
+    constructor(
+        request_id: number,
+        uploaded_by: number,
+        file_url: string,
+        file_name?: string,
+        file_type?: string,
+        file_size?: number,
+        description?: string
+    ) {
+        super();
+        this.request_id = request_id;
+        this.uploaded_by = uploaded_by;
+        this.file_url = file_url;
+        this.file_name = file_name || '';
+        this.file_type = file_type || '';
+        this.file_size = file_size || null;
+        this.description = description || '';
+    }
+}
+

package/src/models/ITRequestChatModel.ts

@@ -0,0 +1,42 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { ITHelpDeskRequests } from './ITHelpDeskModel';
+import { User } from './user';
+
+@Entity({ name: 'it_request_chat' })
+export class ITRequestChat extends BaseModel {
+
+    @Column({ type: 'integer', nullable: false })
+    request_id: number;
+
+    @ManyToOne(() => ITHelpDeskRequests)
+    @JoinColumn({ name: 'request_id' })
+    request: ITHelpDeskRequests;
+
+    @Column({ type: 'integer', nullable: false })
+    user_id: number;
+
+    @ManyToOne(() => User)
+    @JoinColumn({ name: 'user_id' })
+    user: User;
+
+    @Column({ type: 'text', nullable: false })
+    message: string;
+
+    @Column({ type: 'boolean', default: false })
+    is_internal: boolean;
+
+    constructor(
+        request_id: number,
+        user_id: number,
+        message: string,
+        is_internal?: boolean
+    ) {
+        super();
+        this.request_id = request_id;
+        this.user_id = user_id;
+        this.message = message;
+        this.is_internal = is_internal || false;
+    }
+}
+

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