@platform-modules/civil-aviation-authority 1.0.51 → 1.0.53

package/.env

@@ -1,5 +1,5 @@
 DB_HOST=localhost
-DB_PORT=5432
+DB_PORT=5433
 DB_USER=postgres
-DB_PASS=Fa@123
+DB_PASS=123
 DB_NAME=CAA

package/dist/data-source.js

@@ -14,7 +14,7 @@ const ITServicesTypesMuscatModel_1 = require("./models/ITServicesTypesMuscatMode
 const CAAServices_1 = require("./models/CAAServices");
 const CAASubServices_1 = require("./models/CAASubServices");
 const ITApprovalSettings_1 = require("./models/ITApprovalSettings");
-const Workflows_1 = require("./models/Workflows");
+// import { Workflows } from './models/Workflows';
 const ItApprovalsModel_1 = require("./models/ItApprovalsModel");
 const ItWorkflowModel_1 = require("./models/ItWorkflowModel");
 const WorkflowDefinitions_1 = require("./models/WorkflowDefinitions");
@@ -27,6 +27,8 @@ const DirectorateModel_1 = require("./models/DirectorateModel");
 const PositionModel_1 = require("./models/PositionModel");
 const serviceBookmarksModel_1 = require("./models/serviceBookmarksModel");
 const contactInfoModel_1 = require("./models/contactInfoModel");
+const userRolesModel_1 = require("./models/userRolesModel");
+const roleRightsModel_1 = require("./models/roleRightsModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -45,7 +47,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         CAAServices_1.CAAServices,
         CAASubServices_1.CAASubServices,
         ITApprovalSettings_1.ITApprovalSettings,
-        Workflows_1.Workflows,
+        // Workflows, 
         ItApprovalsModel_1.ItApprovalDetails,
         ItWorkflowModel_1.ItWorkFlow,
         WorkflowDefinitions_1.WorkflowDefinitions,
@@ -57,6 +59,8 @@ exports.AppDataSource = new typeorm_1.DataSource({
         DirectorateModel_1.Directorate,
         PositionModel_1.Position,
         serviceBookmarksModel_1.ServiceBookmarks,
-        contactInfoModel_1.ContactInfo
+        contactInfoModel_1.ContactInfo,
+        userRolesModel_1.UserRole,
+        roleRightsModel_1.RoleRights
     ],
 });

package/dist/index.d.ts

@@ -7,7 +7,6 @@ export * from './models/ITServicesTypesMuscatModel';
 export * from './models/CAAServices';
 export * from './models/CAASubServices';
 export * from './models/ITApprovalSettings';
-export * from './models/Workflows';
 export * from './models/ItApprovalsModel';
 export * from './models/ItWorkflowModel';
 export * from './models/WorkflowDefinitions';
@@ -20,3 +19,5 @@ export * from './models/DirectorateModel';
 export * from './models/PositionModel';
 export * from './models/serviceBookmarksModel';
 export * from './models/contactInfoModel';
+export * from './models/userRolesModel';
+export * from './models/roleRightsModel';

package/dist/index.js

@@ -23,7 +23,7 @@ __exportStar(require("./models/ITServicesTypesMuscatModel"), exports);
 __exportStar(require("./models/CAAServices"), exports);
 __exportStar(require("./models/CAASubServices"), exports);
 __exportStar(require("./models/ITApprovalSettings"), exports);
-__exportStar(require("./models/Workflows"), exports);
+// export * from './models/Workflows';
 __exportStar(require("./models/ItApprovalsModel"), exports);
 __exportStar(require("./models/ItWorkflowModel"), exports);
 __exportStar(require("./models/WorkflowDefinitions"), exports);
@@ -36,3 +36,5 @@ __exportStar(require("./models/DirectorateModel"), exports);
 __exportStar(require("./models/PositionModel"), exports);
 __exportStar(require("./models/serviceBookmarksModel"), exports);
 __exportStar(require("./models/contactInfoModel"), exports);
+__exportStar(require("./models/userRolesModel"), exports);
+__exportStar(require("./models/roleRightsModel"), exports);

package/dist/models/ITServicesTypesModel.d.ts

@@ -0,0 +1,5 @@
+import { BaseModel } from './BaseModel';
+export declare class ITServicesTypes extends BaseModel {
+    name: string;
+    constructor(name: string);
+}

package/dist/models/ITServicesTypesModel.js

@@ -0,0 +1,29 @@
+"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.ITServicesTypes = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ITServicesTypes = class ITServicesTypes extends BaseModel_1.BaseModel {
+    constructor(name) {
+        super();
+        this.name = name;
+    }
+};
+exports.ITServicesTypes = ITServicesTypes;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], ITServicesTypes.prototype, "name", void 0);
+exports.ITServicesTypes = ITServicesTypes = __decorate([
+    (0, typeorm_1.Entity)({ name: 'IT_Services_Types' }),
+    __metadata("design:paramtypes", [String])
+], ITServicesTypes);

package/dist/models/Workflows.d.ts

@@ -1,9 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class Workflows extends BaseModel {
-    name: string;
-    service_id: number;
-    sub_service_id: number;
-    request_for: string;
-    levels: number;
-    constructor(name: string, service_id: number, sub_service_id: number, request_for: string, levels: number);
-}

package/dist/models/Workflows.js

@@ -1,50 +1,31 @@
 "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.Workflows = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-let Workflows = class Workflows extends BaseModel_1.BaseModel {
-    constructor(name, service_id, sub_service_id, request_for, levels) {
-        super();
-        this.name = name;
-        this.service_id = service_id;
-        this.sub_service_id = sub_service_id;
-        this.request_for = request_for;
-        this.levels = levels;
-    }
-};
-exports.Workflows = Workflows;
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
-    __metadata("design:type", String)
-], Workflows.prototype, "name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
-    __metadata("design:type", Number)
-], Workflows.prototype, "service_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
-    __metadata("design:type", Number)
-], Workflows.prototype, "sub_service_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 20, nullable: false }),
-    __metadata("design:type", String)
-], Workflows.prototype, "request_for", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], Workflows.prototype, "levels", void 0);
-exports.Workflows = Workflows = __decorate([
-    (0, typeorm_1.Entity)({ name: 'workflows' }),
-    (0, typeorm_1.Unique)(['service_id', 'sub_service_id', 'request_for']),
-    __metadata("design:paramtypes", [String, Number, Number, String, Number])
-], Workflows);
+// import { Column, Entity, Unique } from "typeorm";
+// import { BaseModel } from './BaseModel';
+// @Entity({ name: 'workflows' })
+// @Unique(['service_id', 'sub_service_id', 'request_for'])
+// export class Workflows extends BaseModel {
+//     @Column({ type: 'varchar', length: 100, nullable: false })
+//     name: string;
+//     @Column({ type: 'bigint', nullable: false })
+//     service_id: number;
+//     @Column({ type: 'bigint', nullable: false })
+//     sub_service_id: number;
+//     @Column({ type: 'varchar', length: 20, nullable: false })
+//     request_for: string; // 'Self' | 'Behalf of' | 'Internal'
+//     @Column({ type: 'int', nullable: false })
+//     levels: number;
+//     constructor(
+//         name: string,
+//         service_id: number,
+//         sub_service_id: number,
+//         request_for: string,
+//         levels: number,
+//     ) {
+//         super();
+//         this.name = name;
+//         this.service_id = service_id;
+//         this.sub_service_id = sub_service_id;
+//         this.request_for = request_for;
+//         this.levels = levels;
+//     }
+// }

package/dist/models/role.d.ts

@@ -9,14 +9,8 @@ Role
 Userrole Information will store
 */
 import { BaseModel } from './BaseModel';
-export interface Irole {
-    name: string;
-    id?: number;
-    is_deleted?: boolean;
-    created_by?: number;
-}
 export declare class Role extends BaseModel {
     name: string;
     is_deleted?: boolean;
-    constructor(name: string, is_deleted: boolean, userId: number);
+    constructor(name: string, is_deleted: boolean);
 }

package/dist/models/role.js

@@ -23,7 +23,7 @@ exports.Role = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let Role = class Role extends BaseModel_1.BaseModel {
-    constructor(name, is_deleted, userId) {
+    constructor(name, is_deleted) {
         super();
         this.name = name;
         this.is_deleted = is_deleted;
@@ -40,5 +40,5 @@ __decorate([
 ], Role.prototype, "is_deleted", void 0);
 exports.Role = Role = __decorate([
     (0, typeorm_1.Entity)({ name: 'role' }),
-    __metadata("design:paramtypes", [String, Boolean, Number])
+    __metadata("design:paramtypes", [String, Boolean])
 ], Role);

package/dist/models/roleRightsModel.d.ts

@@ -0,0 +1,16 @@
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model
+Role
+@usage
+Userrole Information will store
+*/
+import { BaseModel } from './BaseModel';
+export declare class RoleRights extends BaseModel {
+    user_role_id: number;
+    service_id: number;
+    constructor(user_role_id: number, service_id: number);
+}

package/dist/models/roleRightsModel.js

@@ -0,0 +1,44 @@
+"use strict";
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model
+Role
+@usage
+Userrole Information will store
+*/
+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.RoleRights = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let RoleRights = class RoleRights extends BaseModel_1.BaseModel {
+    constructor(user_role_id, service_id) {
+        super();
+        this.user_role_id = user_role_id;
+        this.service_id = service_id;
+    }
+};
+exports.RoleRights = RoleRights;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], RoleRights.prototype, "user_role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
+    __metadata("design:type", Number)
+], RoleRights.prototype, "service_id", void 0);
+exports.RoleRights = RoleRights = __decorate([
+    (0, typeorm_1.Entity)({ name: 'role_rights' }),
+    __metadata("design:paramtypes", [Number, Number])
+], RoleRights);

package/dist/models/user.d.ts

@@ -36,5 +36,9 @@ export declare class User extends BaseModel {
     extension_number?: number;
     diplomatic_name?: string;
     avatar?: 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;
+    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);
 }

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) {
+    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) {
         super();
         this.employee_id = employee_id;
         this.civil_employee_id = civil_employee_id;
@@ -50,6 +50,10 @@ let User = class User extends BaseModel_1.BaseModel {
         this.extension_number = extension_number;
         this.diplomatic_name = diplomatic_name;
         this.avatar = avatar;
+        this.father_name = father_name;
+        this.spouse_name = spouse_name;
+        this.children1_name = children1_name;
+        this.children2_name = children2_name;
     }
 };
 exports.User = User;
@@ -197,7 +201,23 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "avatar", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "father_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __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);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "children2_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, String, String, Number, 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])
 ], User);

package/dist/models/userRolesModel.d.ts

@@ -0,0 +1,18 @@
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model
+Role
+@usage
+Userrole Information will store
+*/
+import { BaseModel } from './BaseModel';
+export declare class UserRole extends BaseModel {
+    role_id: number;
+    user_id: number;
+    department_id: number;
+    section_id: number;
+    constructor(role_id: number, user_id: number, department_id: number, section_id: number);
+}

package/dist/models/userRolesModel.js

@@ -0,0 +1,54 @@
+"use strict";
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model
+Role
+@usage
+Userrole Information will store
+*/
+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.UserRole = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let UserRole = class UserRole extends BaseModel_1.BaseModel {
+    constructor(role_id, user_id, department_id, section_id) {
+        super();
+        this.role_id = role_id;
+        this.user_id = user_id;
+        this.department_id = department_id;
+        this.section_id = section_id;
+    }
+};
+exports.UserRole = UserRole;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
+    __metadata("design:type", Number)
+], UserRole.prototype, "role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
+    __metadata("design:type", Number)
+], UserRole.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], UserRole.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], UserRole.prototype, "section_id", void 0);
+exports.UserRole = UserRole = __decorate([
+    (0, typeorm_1.Entity)({ name: 'user_role' }),
+    __metadata("design:paramtypes", [Number, Number, Number, Number])
+], UserRole);

package/package.json

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

package/src/data-source.ts

@@ -11,7 +11,7 @@ import { ITServicesTypesMuscat } from './models/ITServicesTypesMuscatModel';
 import { CAAServices } from './models/CAAServices';
 import { CAASubServices } from './models/CAASubServices';
 import { ITApprovalSettings } from './models/ITApprovalSettings';
-import { Workflows } from './models/Workflows';
+// import { Workflows } from './models/Workflows';
 import { ItApprovalDetails } from './models/ItApprovalsModel';
 import { ItWorkFlow } from './models/ItWorkflowModel';
 import { WorkflowDefinitions } from './models/WorkflowDefinitions';
@@ -24,6 +24,8 @@ import { Directorate } from './models/DirectorateModel';
 import { Position } from './models/PositionModel';
 import { ServiceBookmarks } from './models/serviceBookmarksModel';
 import { ContactInfo } from './models/contactInfoModel';
+import { UserRole } from './models/userRolesModel';
+import { RoleRights } from './models/roleRightsModel';
 
 
 
@@ -45,7 +47,7 @@ export const AppDataSource = new DataSource({
     CAAServices, 
     CAASubServices, 
     ITApprovalSettings, 
-    Workflows, 
+    // Workflows, 
     ItApprovalDetails, 
     ItWorkFlow, 
     WorkflowDefinitions, 
@@ -57,6 +59,8 @@ export const AppDataSource = new DataSource({
     Directorate, 
     Position,
     ServiceBookmarks,
-    ContactInfo
+    ContactInfo,
+    UserRole,
+    RoleRights
   ],
 });

package/src/index.ts

@@ -7,7 +7,7 @@ export * from './models/ITServicesTypesMuscatModel';
 export * from './models/CAAServices';   
 export * from './models/CAASubServices';
 export * from './models/ITApprovalSettings';
-export * from './models/Workflows';
+// export * from './models/Workflows';
 export * from './models/ItApprovalsModel';
 export * from './models/ItWorkflowModel';
 export * from './models/WorkflowDefinitions';
@@ -20,3 +20,5 @@ export * from './models/DirectorateModel';
 export * from './models/PositionModel';
 export * from './models/serviceBookmarksModel';
 export * from './models/contactInfoModel';
+export * from './models/userRolesModel';
+export * from './models/roleRightsModel';

package/src/models/Workflows.ts

@@ -1,40 +1,40 @@
-import { Column, Entity, Unique } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'workflows' })
-@Unique(['service_id', 'sub_service_id', 'request_for'])
-export class Workflows extends BaseModel {
-
-    @Column({ type: 'varchar', length: 100, nullable: false })
-    name: string;
-
-    @Column({ type: 'bigint', nullable: false })
-    service_id: number;
-
-    @Column({ type: 'bigint', nullable: false })
-    sub_service_id: number;
-
-    @Column({ type: 'varchar', length: 20, nullable: false })
-    request_for: string; // 'Self' | 'Behalf of' | 'Internal'
-
-    @Column({ type: 'int', nullable: false })
-    levels: number;
-
-
-    constructor(
-        name: string,
-        service_id: number,
-        sub_service_id: number,
-        request_for: string,
-        levels: number,
-    ) {
-        super();
-        this.name = name;
-        this.service_id = service_id;
-        this.sub_service_id = sub_service_id;
-        this.request_for = request_for;
-        this.levels = levels;
-    }
-}
+// import { Column, Entity, Unique } from "typeorm";
+// import { BaseModel } from './BaseModel';
+
+// @Entity({ name: 'workflows' })
+// @Unique(['service_id', 'sub_service_id', 'request_for'])
+// export class Workflows extends BaseModel {
+
+//     @Column({ type: 'varchar', length: 100, nullable: false })
+//     name: string;
+
+//     @Column({ type: 'bigint', nullable: false })
+//     service_id: number;
+
+//     @Column({ type: 'bigint', nullable: false })
+//     sub_service_id: number;
+
+//     @Column({ type: 'varchar', length: 20, nullable: false })
+//     request_for: string; // 'Self' | 'Behalf of' | 'Internal'
+
+//     @Column({ type: 'int', nullable: false })
+//     levels: number;
+
+
+//     constructor(
+//         name: string,
+//         service_id: number,
+//         sub_service_id: number,
+//         request_for: string,
+//         levels: number,
+//     ) {
+//         super();
+//         this.name = name;
+//         this.service_id = service_id;
+//         this.sub_service_id = sub_service_id;
+//         this.request_for = request_for;
+//         this.levels = levels;
+//     }
+// }
 
 

package/src/models/role.ts

@@ -12,12 +12,6 @@ Userrole Information will store
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
-export interface Irole {
-    name: string;   
-    id?: number;
-    is_deleted?: boolean;
-    created_by?: number;
-}
 @Entity({ name: 'role' })
 export class Role extends BaseModel {
 
@@ -28,7 +22,7 @@ export class Role extends BaseModel {
     is_deleted?: boolean;  
 
 
-    constructor(name: string,is_deleted:boolean,userId: number) {
+    constructor(name: string, is_deleted:boolean) {
         super();
         this.name = name
         this.is_deleted = is_deleted

package/src/models/roleRightsModel.ts

@@ -0,0 +1,32 @@
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model 
+Role
+@usage
+Userrole Information will store 
+*/
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+@Entity({ name: 'role_rights' })
+export class RoleRights extends BaseModel {
+
+    @Column({ type: 'bigint', nullable: true })
+    user_role_id: number;
+
+    @Column({ type: 'bigint', nullable: false })
+    service_id: number;
+
+
+    constructor(user_role_id: number, service_id: number) {
+        super();
+        this.user_role_id = user_role_id
+        this.service_id = service_id
+    }
+}
+

package/src/models/user.ts

@@ -112,6 +112,19 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     avatar?: string;
 
+    @Column({ nullable: true })
+    father_name?: string;
+
+    @Column({ nullable: true })
+    spouse_name?: string;
+    
+    @Column({ nullable: true })
+    children1_name?: string;
+ 
+    @Column({ nullable: true })
+    children2_name?: string;
+
+    
     constructor(     
         employee_id?: number,
         civil_employee_id?: number,
@@ -147,7 +160,11 @@ export class User extends BaseModel {
         personal_email?: string,
         extension_number?: number,
         diplomatic_name?: string,
-        avatar?: string
+        avatar?: string,
+        father_name?: string,
+        spouse_name?: string,
+        children1_name?: string,
+        children2_name?: string
     ) {
         super();     
         this.employee_id = employee_id;
@@ -185,5 +202,9 @@ export class User extends BaseModel {
         this.extension_number = extension_number;
         this.diplomatic_name = diplomatic_name;
         this.avatar = avatar;
+        this.father_name = father_name;
+        this.spouse_name = spouse_name;
+        this.children1_name = children1_name;
+        this.children2_name = children2_name;
     }
 }

package/src/models/userRolesModel.ts

@@ -0,0 +1,39 @@
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model 
+Role
+@usage
+Userrole Information will store 
+*/
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+@Entity({ name: 'user_role' })
+export class UserRole extends BaseModel {
+
+    @Column({ type: 'bigint', nullable: false })
+    role_id: number;
+
+    @Column({ type: 'bigint', nullable: false })
+    user_id: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    department_id: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    section_id: number;
+
+    constructor(role_id: number, user_id: number, department_id: number, section_id: number) {
+        super();
+        this.role_id = role_id
+        this.user_id = user_id
+        this.department_id = department_id
+        this.section_id = section_id
+    }
+}
+