@platform-modules/civil-aviation-authority 1.0.35 → 1.0.37

package/dist/data-source.js

@@ -17,6 +17,13 @@ const ITApprovalSettings_1 = require("./models/ITApprovalSettings");
 const Workflows_1 = require("./models/Workflows");
 const ItApprovalsModel_1 = require("./models/ItApprovalsModel");
 const ItWorkflowModel_1 = require("./models/ItWorkflowModel");
+const WorkflowDefinitions_1 = require("./models/WorkflowDefinitions");
+const WorkflowTask_1 = require("./models/WorkflowTask");
+const DepartmentsModel_1 = require("./models/DepartmentsModel");
+const SectionModel_1 = require("./models/SectionModel");
+const WorkflowHierarchy_1 = require("./models/WorkflowHierarchy");
+const WorkflowTaskNames_1 = require("./models/WorkflowTaskNames");
+const DirectorateModel_1 = require("./models/DirectorateModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -26,5 +33,5 @@ exports.AppDataSource = new typeorm_1.DataSource({
     database: process.env.DB_NAME || 'common_models',
     synchronize: true, // auto-create tables (disable in prod)
     logging: false,
-    entities: [user_1.User, user_sessions_1.userSessions, role_1.Role, ITHelpDeskModel_1.ITHelpDeskRequests, ITServicesTypesSalalahModel_1.ITServicesTypesSalalah, ITServicesTypesMuscatModel_1.ITServicesTypesMuscat, CAAServices_1.CAAServices, CAASubServices_1.CAASubServices, ITApprovalSettings_1.ITApprovalSettings, Workflows_1.Workflows, ItApprovalsModel_1.ItApprovalDetails, ItWorkflowModel_1.ItWorkFlow],
+    entities: [user_1.User, user_sessions_1.userSessions, role_1.Role, ITHelpDeskModel_1.ITHelpDeskRequests, ITServicesTypesSalalahModel_1.ITServicesTypesSalalah, ITServicesTypesMuscatModel_1.ITServicesTypesMuscat, CAAServices_1.CAAServices, CAASubServices_1.CAASubServices, ITApprovalSettings_1.ITApprovalSettings, Workflows_1.Workflows, ItApprovalsModel_1.ItApprovalDetails, ItWorkflowModel_1.ItWorkFlow, WorkflowDefinitions_1.WorkflowDefinitions, WorkflowTask_1.WorkflowTask, DepartmentsModel_1.Departments, SectionModel_1.UserSections, WorkflowHierarchy_1.WorkflowHierarchy, WorkflowTaskNames_1.WorkflowTaskNames, DirectorateModel_1.Directorate],
 });

package/dist/index.d.ts

@@ -10,6 +10,10 @@ export * from './models/ITApprovalSettings';
 export * from './models/Workflows';
 export * from './models/ItApprovalsModel';
 export * from './models/ItWorkflowModel';
+export * from './models/WorkflowDefinitions';
+export * from './models/WorkflowTask';
 export * from './models/DepartmentsModel';
-export * from './models/DirectorateModel';
 export * from './models/SectionModel';
+export * from './models/WorkflowHierarchy';
+export * from './models/WorkflowTaskNames';
+export * from './models/DirectorateModel';

package/dist/index.js

@@ -26,6 +26,10 @@ __exportStar(require("./models/ITApprovalSettings"), exports);
 __exportStar(require("./models/Workflows"), exports);
 __exportStar(require("./models/ItApprovalsModel"), exports);
 __exportStar(require("./models/ItWorkflowModel"), exports);
+__exportStar(require("./models/WorkflowDefinitions"), exports);
+__exportStar(require("./models/WorkflowTask"), exports);
 __exportStar(require("./models/DepartmentsModel"), exports);
-__exportStar(require("./models/DirectorateModel"), exports);
 __exportStar(require("./models/SectionModel"), exports);
+__exportStar(require("./models/WorkflowHierarchy"), exports);
+__exportStar(require("./models/WorkflowTaskNames"), exports);
+__exportStar(require("./models/DirectorateModel"), exports);

package/dist/models/WorkflowDefinitions.d.ts

@@ -0,0 +1,10 @@
+import { BaseModel } from './BaseModel';
+export declare class WorkflowDefinitions extends BaseModel {
+    name: string;
+    description: string;
+    version: number;
+    is_active: boolean;
+    service_type: string;
+    status: 'draft' | 'published';
+    constructor(name: string, description?: string, version?: number, is_active?: boolean, service_type?: string, status?: 'draft' | 'published');
+}

package/dist/models/WorkflowDefinitions.js

@@ -0,0 +1,59 @@
+"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.WorkflowDefinitions = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let WorkflowDefinitions = class WorkflowDefinitions extends BaseModel_1.BaseModel {
+    constructor(name, description, version, is_active, service_type, status) {
+        super();
+        this.name = name;
+        this.description = description || '';
+        this.version = version || 1;
+        this.is_active = is_active !== undefined ? is_active : true;
+        this.service_type = service_type || '';
+        this.status = status || 'draft';
+    }
+};
+exports.WorkflowDefinitions = WorkflowDefinitions;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    __metadata("design:type", String)
+], WorkflowDefinitions.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], WorkflowDefinitions.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', default: 1 }),
+    __metadata("design:type", Number)
+], WorkflowDefinitions.prototype, "version", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
+    __metadata("design:type", Boolean)
+], WorkflowDefinitions.prototype, "is_active", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", String)
+], WorkflowDefinitions.prototype, "service_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: 'varchar',
+        length: 20,
+        default: 'draft',
+        enum: ['draft', 'published']
+    }),
+    __metadata("design:type", String)
+], WorkflowDefinitions.prototype, "status", void 0);
+exports.WorkflowDefinitions = WorkflowDefinitions = __decorate([
+    (0, typeorm_1.Entity)({ name: 'workflow_definitions' }),
+    __metadata("design:paramtypes", [String, String, Number, Boolean, String, String])
+], WorkflowDefinitions);

package/dist/models/WorkflowHierarchy.d.ts

@@ -0,0 +1,11 @@
+import { BaseModel } from './BaseModel';
+import { WorkflowDefinitions } from './WorkflowDefinitions';
+export declare class WorkflowHierarchy extends BaseModel {
+    workflow_definition_id: number;
+    department_id: number;
+    approval_level_id: number;
+    step_order: number;
+    is_required: boolean;
+    workflow_definition: WorkflowDefinitions;
+    constructor(workflow_definition_id: number, department_id: number, approval_level_id: number, step_order: number, is_required?: boolean);
+}

package/dist/models/WorkflowHierarchy.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.WorkflowHierarchy = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const WorkflowDefinitions_1 = require("./WorkflowDefinitions");
+let WorkflowHierarchy = class WorkflowHierarchy extends BaseModel_1.BaseModel {
+    constructor(workflow_definition_id, department_id, approval_level_id, step_order, is_required) {
+        super();
+        this.workflow_definition_id = workflow_definition_id;
+        this.department_id = department_id;
+        this.approval_level_id = approval_level_id;
+        this.step_order = step_order;
+        this.is_required = is_required !== undefined ? is_required : true;
+    }
+};
+exports.WorkflowHierarchy = WorkflowHierarchy;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], WorkflowHierarchy.prototype, "workflow_definition_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], WorkflowHierarchy.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], WorkflowHierarchy.prototype, "approval_level_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], WorkflowHierarchy.prototype, "step_order", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
+    __metadata("design:type", Boolean)
+], WorkflowHierarchy.prototype, "is_required", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => WorkflowDefinitions_1.WorkflowDefinitions, { onDelete: 'CASCADE' }),
+    (0, typeorm_1.JoinColumn)({ name: 'workflow_definition_id' }),
+    __metadata("design:type", WorkflowDefinitions_1.WorkflowDefinitions)
+], WorkflowHierarchy.prototype, "workflow_definition", void 0);
+exports.WorkflowHierarchy = WorkflowHierarchy = __decorate([
+    (0, typeorm_1.Entity)({ name: 'workflow_hierarchy' }),
+    (0, typeorm_1.Unique)(['workflow_definition_id', 'step_order']),
+    __metadata("design:paramtypes", [Number, Number, Number, Number, Boolean])
+], WorkflowHierarchy);

package/dist/models/WorkflowTask.d.ts

@@ -0,0 +1,7 @@
+import { BaseModel } from './BaseModel';
+export declare class WorkflowTask extends BaseModel {
+    task_id: number;
+    name: string;
+    task_type: string;
+    constructor(name: string, task_id?: number, task_type?: string);
+}

package/dist/models/WorkflowTask.js

@@ -0,0 +1,39 @@
+"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.WorkflowTask = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let WorkflowTask = class WorkflowTask extends BaseModel_1.BaseModel {
+    constructor(name, task_id, task_type) {
+        super();
+        this.name = name;
+        this.task_id = task_id || 0;
+        this.task_type = task_type || '';
+    }
+};
+exports.WorkflowTask = WorkflowTask;
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)(),
+    __metadata("design:type", Number)
+], WorkflowTask.prototype, "task_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    __metadata("design:type", String)
+], WorkflowTask.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 200, nullable: true }),
+    __metadata("design:type", String)
+], WorkflowTask.prototype, "task_type", void 0);
+exports.WorkflowTask = WorkflowTask = __decorate([
+    (0, typeorm_1.Entity)({ name: 'workflow_tasks' }),
+    __metadata("design:paramtypes", [String, Number, String])
+], WorkflowTask);

package/dist/models/WorkflowTaskNames.d.ts

@@ -0,0 +1,8 @@
+import { BaseModel } from './BaseModel';
+export declare class WorkflowTaskNames extends BaseModel {
+    name: string;
+    task_id: number;
+    description: string;
+    task_type: string;
+    constructor(name: string, task_id: number, description: string, task_type: string);
+}

package/dist/models/WorkflowTaskNames.js

@@ -0,0 +1,44 @@
+"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.WorkflowTaskNames = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let WorkflowTaskNames = class WorkflowTaskNames extends BaseModel_1.BaseModel {
+    constructor(name, task_id, description, task_type) {
+        super();
+        this.name = name;
+        this.task_id = task_id;
+        this.description = description;
+        this.task_type = task_type;
+    }
+};
+exports.WorkflowTaskNames = WorkflowTaskNames;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    __metadata("design:type", String)
+], WorkflowTaskNames.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], WorkflowTaskNames.prototype, "task_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 200, nullable: true }),
+    __metadata("design:type", String)
+], WorkflowTaskNames.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 200, nullable: true }),
+    __metadata("design:type", String)
+], WorkflowTaskNames.prototype, "task_type", void 0);
+exports.WorkflowTaskNames = WorkflowTaskNames = __decorate([
+    (0, typeorm_1.Entity)({ name: 'workflow_task_names' }),
+    __metadata("design:paramtypes", [String, Number, String, String])
+], WorkflowTaskNames);

package/dist/models/user.d.ts

@@ -20,15 +20,15 @@ export declare class User extends BaseModel {
     manpower_id?: number;
     mobile?: string;
     office_number?: string;
-    department?: number;
+    department?: string;
     category?: string;
     directorate?: string;
-    section?: number;
-    position?: number;
+    section?: string;
+    position?: string;
     arabic_position?: string;
     grade?: number;
     location?: string;
     supervisor_emp_id?: number;
     supervisor_emp_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);
+    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?: string, category?: string, directorate?: string, section?: string, position?: string, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string);
 }

package/dist/models/user.js

@@ -130,7 +130,7 @@ __decorate([
 ], User.prototype, "office_number", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
+    __metadata("design:type", String)
 ], User.prototype, "department", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
@@ -142,11 +142,11 @@ __decorate([
 ], User.prototype, "directorate", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
+    __metadata("design:type", String)
 ], User.prototype, "section", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
+    __metadata("design:type", String)
 ], User.prototype, "position", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
@@ -170,5 +170,5 @@ __decorate([
 ], User.prototype, "supervisor_emp_name", 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])
+    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, String, String, String, String, String, String, Number, String, Number, String])
 ], User);

package/package.json

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

package/src/data-source.ts

@@ -14,9 +14,13 @@ import { ITApprovalSettings } from './models/ITApprovalSettings';
 import { Workflows } from './models/Workflows';
 import { ItApprovalDetails } from './models/ItApprovalsModel';
 import { ItWorkFlow } from './models/ItWorkflowModel';
+import { WorkflowDefinitions } from './models/WorkflowDefinitions';
+import { WorkflowTask } from './models/WorkflowTask';
 import { Departments } from './models/DepartmentsModel';
-import { Directorate } from './models/DirectorateModel';
 import { UserSections } from './models/SectionModel';
+import { WorkflowHierarchy } from './models/WorkflowHierarchy';
+import { WorkflowTaskNames } from './models/WorkflowTaskNames';
+import { Directorate } from './models/DirectorateModel';
 export const AppDataSource = new DataSource({
   type: 'postgres',
   host: process.env.DB_HOST || 'localhost',
@@ -26,5 +30,5 @@ export const AppDataSource = new DataSource({
   database: process.env.DB_NAME || 'common_models',
   synchronize: true, // auto-create tables (disable in prod)
   logging: false,
-  entities: [User,userSessions,Role, ITHelpDeskRequests, ITServicesTypesSalalah, ITServicesTypesMuscat, CAAServices, CAASubServices, ITApprovalSettings, Workflows, ItApprovalDetails, ItWorkFlow],
+  entities: [User,userSessions,Role, ITHelpDeskRequests, ITServicesTypesSalalah, ITServicesTypesMuscat, CAAServices, CAASubServices, ITApprovalSettings, Workflows, ItApprovalDetails, ItWorkFlow, WorkflowDefinitions, WorkflowTask, Departments, UserSections, WorkflowHierarchy, WorkflowTaskNames, Directorate],
 });

package/src/index.ts

@@ -10,6 +10,11 @@ export * from './models/ITApprovalSettings';
 export * from './models/Workflows';
 export * from './models/ItApprovalsModel';
 export * from './models/ItWorkflowModel';
+export * from './models/WorkflowDefinitions';
+export * from './models/WorkflowTask';
 export * from './models/DepartmentsModel';
-export * from './models/DirectorateModel';
 export * from './models/SectionModel';
+export * from './models/WorkflowHierarchy';
+export * from './models/WorkflowTaskNames';
+export * from './models/DirectorateModel';
+

package/src/models/CAAServices.ts

@@ -24,9 +24,9 @@ export class CAAServices extends BaseModel {
         code?: string
     ) {
         super();     
-        this.name = name
-        this.description = description
-        this.logo_url = logo_url
-        this.code = code || ''
+        this.name = name;
+        this.description = description;
+        this.logo_url = logo_url;
+        this.code = code || '';
     }
 }

package/src/models/WorkflowDefinitions.ts

@@ -0,0 +1,45 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'workflow_definitions' })
+export class WorkflowDefinitions extends BaseModel {
+
+    @Column({ type: 'varchar', length: 100, nullable: false})
+    name: string;
+
+    @Column({ type: 'text', nullable: true })
+    description: string;
+
+    @Column({ type: 'integer', default: 1 })
+    version: number;
+
+    @Column({ type: 'boolean', default: true })
+    is_active: boolean;
+
+    @Column({ type: 'varchar', length: 50, nullable: true })
+    service_type: string;
+
+    @Column({ 
+        type: 'varchar', 
+        length: 20, 
+        default: 'draft',
+        enum: ['draft', 'published']
+    })
+    status: 'draft' | 'published' ;
+    constructor(
+        name: string,
+        description?: string,
+        version?: number,
+        is_active?: boolean,
+        service_type?: string,
+        status?: 'draft' | 'published' 
+    ) {
+        super();
+        this.name = name;
+        this.description = description || '';
+        this.version = version || 1;
+        this.is_active = is_active !== undefined ? is_active : true;
+        this.service_type = service_type || '';
+        this.status = status || 'draft';
+    }
+}

package/src/models/WorkflowHierarchy.ts

@@ -0,0 +1,42 @@
+import { Column, Entity, ManyToOne, JoinColumn, Unique } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { WorkflowDefinitions } from './WorkflowDefinitions';
+
+@Entity({ name: 'workflow_hierarchy' })
+@Unique(['workflow_definition_id', 'step_order'])
+export class WorkflowHierarchy extends BaseModel {
+
+    @Column({ type: 'integer', nullable: false })
+    workflow_definition_id: number;
+
+    @Column({ type: 'integer', nullable: false })
+    department_id: number;
+
+    @Column({ type: 'integer', nullable: false })
+    approval_level_id: number;
+
+    @Column({ type: 'integer', nullable: false })
+    step_order: number;
+
+    @Column({ type: 'boolean', default: true })
+    is_required: boolean;
+
+    @ManyToOne(() => WorkflowDefinitions, { onDelete: 'CASCADE' })
+    @JoinColumn({ name: 'workflow_definition_id' })
+    workflow_definition: WorkflowDefinitions;
+
+    constructor(
+        workflow_definition_id: number,
+        department_id: number,
+        approval_level_id: number,
+        step_order: number,
+        is_required?: boolean
+    ) {
+        super();
+        this.workflow_definition_id = workflow_definition_id;
+        this.department_id = department_id;
+        this.approval_level_id = approval_level_id;
+        this.step_order = step_order;
+        this.is_required = is_required !== undefined ? is_required : true;
+    }
+}

package/src/models/WorkflowTask.ts

@@ -0,0 +1,26 @@
+import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'workflow_tasks' })
+export class WorkflowTask extends BaseModel {
+
+    @PrimaryGeneratedColumn()
+    task_id: number;
+
+    @Column({ type: 'varchar', length: 100, nullable: false })
+    name: string;
+
+    @Column({ type: 'varchar', length: 200, nullable: true })
+    task_type: string;
+
+    constructor(
+        name: string,
+        task_id?: number,
+        task_type?: string
+    ) {
+        super();
+        this.name = name;
+        this.task_id = task_id || 0;
+        this.task_type = task_type || '';
+    }
+}

package/src/models/WorkflowTaskNames.ts

@@ -0,0 +1,31 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'workflow_task_names' })
+export class WorkflowTaskNames extends BaseModel {
+
+    @Column({ type: 'varchar', length: 100, nullable: false })
+    name: string;
+
+    @Column({ type: 'integer', nullable: false })
+    task_id: number;
+     
+    @Column({ type: 'varchar', length: 200, nullable: true })
+    description: string;
+
+    @Column({ type: 'varchar', length: 200, nullable: true })
+    task_type: string;
+
+    constructor(
+        name: string,
+        task_id: number,
+        description: string,
+        task_type: string
+    ) {
+        super();
+        this.name = name;
+        this.task_id = task_id;
+        this.description = description;
+        this.task_type = task_type;
+    }
+}

package/src/models/user.ts

@@ -65,7 +65,7 @@ export class User extends BaseModel {
     office_number?: string;
 
     @Column({ nullable: true })
-    department?: number;
+    department?: string;
 
     @Column({ nullable: true })
     category?: string;
@@ -74,10 +74,10 @@ export class User extends BaseModel {
     directorate?: string;
 
     @Column({ nullable: true })
-    section?: number;
+    section?: string;
 
     @Column({ nullable: true })
-    position?: number;
+    position?: string;
 
     @Column({ nullable: true })
     arabic_position?: string;
@@ -115,11 +115,11 @@ export class User extends BaseModel {
         manpower_id?: number,
         mobile?: string,
         office_number?: string,
-        department?: number,
+        department?: string,
         category?: string,
         directorate?: string,
-        section?: number,
-        position?: number,
+        section?: string,
+        position?: string,
         arabic_position?: string,
         grade?: number,
         location?: string,