@platform-modules/civil-aviation-authority 2.2.101 → 2.2.200

package/.env

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

package/dist/data-source.js

@@ -69,11 +69,8 @@ const SecurityAwarenessApprovalModel_1 = require("./models/SecurityAwarenessAppr
 const SecurityAwarenessAttachmentModel_1 = require("./models/SecurityAwarenessAttachmentModel");
 const SecurityAwarenessChatModel_1 = require("./models/SecurityAwarenessChatModel");
 const SecurityAwarenessWorkflowModel_1 = require("./models/SecurityAwarenessWorkflowModel");
-const AirportEntryPermitModel_1 = require("./models/AirportEntryPermitModel");
-const AirportEntryPermitApprovalModel_1 = require("./models/AirportEntryPermitApprovalModel");
-const AirportEntryPermitWorkflowModel_1 = require("./models/AirportEntryPermitWorkflowModel");
-const AirportEntryPermitChatModel_1 = require("./models/AirportEntryPermitChatModel");
-const AirportEntryPermitAttachmentModel_1 = require("./models/AirportEntryPermitAttachmentModel");
+const GroupNamesModel_1 = require("./models/GroupNamesModel");
+const GroupModel_1 = require("./models/GroupModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -147,10 +144,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         SecurityAwarenessAttachmentModel_1.SecurityAwarenessAttachment,
         SecurityAwarenessChatModel_1.SecurityAwarenessChat,
         SecurityAwarenessWorkflowModel_1.SecurityAwarenessWorkFlow,
-        AirportEntryPermitModel_1.AirportEntryPermit,
-        AirportEntryPermitApprovalModel_1.AirportEntryPermitApproval,
-        AirportEntryPermitWorkflowModel_1.AirportEntryPermitWorkFlow,
-        AirportEntryPermitChatModel_1.AirportEntryPermitChat,
-        AirportEntryPermitAttachmentModel_1.AirportEntryPermitAttachment
+        GroupNamesModel_1.GroupNames,
+        GroupModel_1.Group
     ],
 });

package/dist/index.d.ts

@@ -58,8 +58,5 @@ export * from './models/SecurityAwarenessApprovalModel';
 export * from './models/SecurityAwarenessAttachmentModel';
 export * from './models/SecurityAwarenessChatModel';
 export * from './models/SecurityAwarenessWorkflowModel';
-export * from './models/AirportEntryPermitModel';
-export * from './models/AirportEntryPermitApprovalModel';
-export * from './models/AirportEntryPermitWorkflowModel';
-export * from './models/AirportEntryPermitChatModel';
-export * from './models/AirportEntryPermitAttachmentModel';
+export * from './models/GroupNamesModel';
+export * from './models/GroupModel';

package/dist/index.js

@@ -78,8 +78,5 @@ __exportStar(require("./models/SecurityAwarenessApprovalModel"), exports);
 __exportStar(require("./models/SecurityAwarenessAttachmentModel"), exports);
 __exportStar(require("./models/SecurityAwarenessChatModel"), exports);
 __exportStar(require("./models/SecurityAwarenessWorkflowModel"), exports);
-__exportStar(require("./models/AirportEntryPermitModel"), exports);
-__exportStar(require("./models/AirportEntryPermitApprovalModel"), exports);
-__exportStar(require("./models/AirportEntryPermitWorkflowModel"), exports);
-__exportStar(require("./models/AirportEntryPermitChatModel"), exports);
-__exportStar(require("./models/AirportEntryPermitAttachmentModel"), exports);
+__exportStar(require("./models/GroupNamesModel"), exports);
+__exportStar(require("./models/GroupModel"), exports);

package/dist/models/AccessCardApprovalModel.js

@@ -54,7 +54,7 @@ __decorate([
     __metadata("design:type", Number)
 ], AccessCardApproval.prototype, "level", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Number)
 ], AccessCardApproval.prototype, "approver_role_id", void 0);
 __decorate([

package/dist/models/GroupModel.d.ts

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

package/dist/models/{ITServicesTypesSalalahModel.js → GroupModel.js}

@@ -1,4 +1,14 @@
 "use strict";
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model
+Group
+@usage
+Group 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);
@@ -9,26 +19,26 @@ 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.ITServicesTypesSalalah = void 0;
+exports.Group = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
-let ITServicesTypesSalalah = class ITServicesTypesSalalah extends BaseModel_1.BaseModel {
-    constructor(name, name_in_arabic) {
+let Group = class Group extends BaseModel_1.BaseModel {
+    constructor(group_id, user_id) {
         super();
-        this.name = name;
-        this.name_in_arabic = name_in_arabic;
+        this.group_id = group_id;
+        this.user_id = user_id;
     }
 };
-exports.ITServicesTypesSalalah = ITServicesTypesSalalah;
+exports.Group = Group;
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
-    __metadata("design:type", String)
-], ITServicesTypesSalalah.prototype, "name", void 0);
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
+    __metadata("design:type", Number)
+], Group.prototype, "group_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
-    __metadata("design:type", String)
-], ITServicesTypesSalalah.prototype, "name_in_arabic", void 0);
-exports.ITServicesTypesSalalah = ITServicesTypesSalalah = __decorate([
-    (0, typeorm_1.Entity)({ name: 'it_services_types_salalah' }),
-    __metadata("design:paramtypes", [String, String])
-], ITServicesTypesSalalah);
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
+    __metadata("design:type", Number)
+], Group.prototype, "user_id", void 0);
+exports.Group = Group = __decorate([
+    (0, typeorm_1.Entity)({ name: 'Groups' }),
+    __metadata("design:paramtypes", [Number, Number])
+], Group);

package/dist/models/GroupNamesModel.d.ts

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

package/dist/models/{ITServicesTypesMuscatModel.js → GroupNamesModel.js}

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

package/dist/models/ITRequestChatModel.d.ts

@@ -4,9 +4,13 @@ import { User } from './user';
 export declare class ITRequestChat extends BaseModel {
     request_id: number;
     request: ITHelpDeskRequests;
+    service_id: number | null;
+    sub_service_id: number | null;
     user_id: number;
     user: User;
+    role_id: number | null;
     message: string;
+    status: string | null;
     is_internal: boolean;
-    constructor(request_id: number, user_id: number, message: string, is_internal?: boolean);
+    constructor(request_id: number, user_id: number, message: string, is_internal?: boolean, service_id?: number | null, sub_service_id?: number | null, role_id?: number | null, status?: string | null);
 }

package/dist/models/ITRequestChatModel.js

@@ -15,11 +15,15 @@ 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) {
+    constructor(request_id, user_id, message, is_internal, service_id, sub_service_id, role_id, status) {
         super();
         this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
         this.user_id = user_id;
+        this.role_id = role_id || null;
         this.message = message;
+        this.status = status || null;
         this.is_internal = is_internal || false;
     }
 };
@@ -33,6 +37,14 @@ __decorate([
     (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: true }),
+    __metadata("design:type", Object)
+], ITRequestChat.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ITRequestChat.prototype, "sub_service_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
@@ -42,15 +54,23 @@ __decorate([
     (0, typeorm_1.JoinColumn)({ name: 'user_id' }),
     __metadata("design:type", user_1.User)
 ], ITRequestChat.prototype, "user", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ITRequestChat.prototype, "role_id", 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: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], ITRequestChat.prototype, "status", 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])
+    __metadata("design:paramtypes", [Number, Number, String, Boolean, Object, Object, Object, Object])
 ], ITRequestChat);

package/dist/models/ItWorkflowModel.d.ts

@@ -11,5 +11,9 @@ export declare class ItWorkFlow extends BaseModel {
     order: number | null;
     content: string;
     status: workFlowStatus;
-    constructor(request_id: number, content: string, status: workFlowStatus, order?: number, service_id?: number | null, sub_service_id?: number | null);
+    user_id: number | null;
+    role_id: number | null;
+    department_id: number | null;
+    section_id: number | null;
+    constructor(request_id: number, content: string, status: workFlowStatus, order?: number, service_id?: number | null, sub_service_id?: number | null, user_id?: number | null, role_id?: number | null, department_id?: number | null, section_id?: number | null);
 }

package/dist/models/ItWorkflowModel.js

@@ -20,7 +20,7 @@ var workFlowStatus;
 })(workFlowStatus || (exports.workFlowStatus = workFlowStatus = {}));
 //This model is used to store the store the leave apporval matrix(HOD, Manager, HR, Director) based on leave type along with the levels
 let ItWorkFlow = class ItWorkFlow extends BaseModel_1.BaseModel {
-    constructor(request_id, content, status, order, service_id, sub_service_id) {
+    constructor(request_id, content, status, order, service_id, sub_service_id, user_id, role_id, department_id, section_id) {
         super();
         this.request_id = request_id;
         this.content = content;
@@ -28,6 +28,10 @@ let ItWorkFlow = class ItWorkFlow extends BaseModel_1.BaseModel {
         this.order = order || null;
         this.service_id = service_id ?? null;
         this.sub_service_id = sub_service_id ?? null;
+        this.user_id = user_id || null;
+        this.role_id = role_id || null;
+        this.department_id = department_id || null;
+        this.section_id = section_id || null;
     }
 };
 exports.ItWorkFlow = ItWorkFlow;
@@ -55,7 +59,23 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'enum', enum: workFlowStatus, default: workFlowStatus.NOT_YET_STARTED, nullable: false }),
     __metadata("design:type", String)
 ], ItWorkFlow.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ItWorkFlow.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ItWorkFlow.prototype, "role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ItWorkFlow.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ItWorkFlow.prototype, "section_id", void 0);
 exports.ItWorkFlow = ItWorkFlow = __decorate([
     (0, typeorm_1.Entity)({ name: 'it_work_flows' }),
-    __metadata("design:paramtypes", [Number, String, String, Number, Object, Object])
+    __metadata("design:paramtypes", [Number, String, String, Number, Object, Object, Object, Object, Object, Object])
 ], ItWorkFlow);

package/dist/models/SecurityAwarenessRequestModel.d.ts

@@ -21,9 +21,10 @@ export declare class SecurityAwarenessRequest extends BaseModel {
     phone_number: string;
     place: string | null;
     description: string | null;
-    event_date_time: Date | null;
+    event_date: Date | null;
+    event_time: string | null;
     media_coverage_required: MediaCoverageRequired;
     status: SecurityAwarenessRequestStatus;
     workflow_execution_id: string | null;
-    constructor(req_user_department_id: number | null, req_user_section_id: number | null, service_id: number, sub_service_id: number, user_id: number, title: string, date_of_submission: Date, phone_number: string, place: string | null, description: string | null, event_date_time: Date | null, media_coverage_required: MediaCoverageRequired, status: SecurityAwarenessRequestStatus, workflow_execution_id?: string | null);
+    constructor(req_user_department_id: number | null, req_user_section_id: number | null, service_id: number, sub_service_id: number, user_id: number, title: string, date_of_submission: Date, phone_number: string, place: string | null, description: string | null, event_date: Date | null, event_time: string | null, media_coverage_required: MediaCoverageRequired, status: SecurityAwarenessRequestStatus, workflow_execution_id?: string | null);
 }

package/dist/models/SecurityAwarenessRequestModel.js

@@ -26,7 +26,7 @@ var MediaCoverageRequired;
     MediaCoverageRequired["NO"] = "No";
 })(MediaCoverageRequired || (exports.MediaCoverageRequired = MediaCoverageRequired = {}));
 let SecurityAwarenessRequest = class SecurityAwarenessRequest extends BaseModel_1.BaseModel {
-    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, title, date_of_submission, phone_number, place, description, event_date_time, media_coverage_required, status, workflow_execution_id) {
+    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, title, date_of_submission, phone_number, place, description, event_date, event_time, media_coverage_required, status, workflow_execution_id) {
         super();
         this.req_user_department_id = req_user_department_id ?? null;
         this.req_user_section_id = req_user_section_id ?? null;
@@ -38,7 +38,8 @@ let SecurityAwarenessRequest = class SecurityAwarenessRequest extends BaseModel_
         this.phone_number = phone_number;
         this.place = place ?? null;
         this.description = description ?? null;
-        this.event_date_time = event_date_time ?? null;
+        this.event_date = event_date ?? null;
+        this.event_time = event_time ?? null;
         this.media_coverage_required = media_coverage_required;
         this.status = status;
         this.workflow_execution_id = workflow_execution_id ?? null;
@@ -86,9 +87,13 @@ __decorate([
     __metadata("design:type", Object)
 ], SecurityAwarenessRequest.prototype, "description", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "timestamp", nullable: true }),
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
     __metadata("design:type", Object)
-], SecurityAwarenessRequest.prototype, "event_date_time", void 0);
+], SecurityAwarenessRequest.prototype, "event_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "time", nullable: true }),
+    __metadata("design:type", Object)
+], SecurityAwarenessRequest.prototype, "event_time", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
@@ -113,5 +118,5 @@ __decorate([
 ], SecurityAwarenessRequest.prototype, "workflow_execution_id", void 0);
 exports.SecurityAwarenessRequest = SecurityAwarenessRequest = __decorate([
     (0, typeorm_1.Entity)({ name: 'security_awareness_requests' }),
-    __metadata("design:paramtypes", [Object, Object, Number, Number, Number, String, Date, String, Object, Object, Object, String, String, Object])
+    __metadata("design:paramtypes", [Object, Object, Number, Number, Number, String, Date, String, Object, Object, Object, Object, String, String, Object])
 ], SecurityAwarenessRequest);

package/package.json

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

package/src/data-source.ts

@@ -67,11 +67,8 @@ import { SecurityAwarenessApproval } from './models/SecurityAwarenessApprovalMod
 import { SecurityAwarenessAttachment } from './models/SecurityAwarenessAttachmentModel';
 import { SecurityAwarenessChat } from './models/SecurityAwarenessChatModel';
 import { SecurityAwarenessWorkFlow } from './models/SecurityAwarenessWorkflowModel';
-import { AirportEntryPermit } from './models/AirportEntryPermitModel';
-import { AirportEntryPermitApproval } from './models/AirportEntryPermitApprovalModel';
-import { AirportEntryPermitWorkFlow } from './models/AirportEntryPermitWorkflowModel';
-import { AirportEntryPermitChat } from './models/AirportEntryPermitChatModel';
-import { AirportEntryPermitAttachment } from './models/AirportEntryPermitAttachmentModel';
+import { GroupNames } from './models/GroupNamesModel';
+import { Group } from './models/GroupModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -146,10 +143,7 @@ export const AppDataSource = new DataSource({
     SecurityAwarenessAttachment,
     SecurityAwarenessChat,
     SecurityAwarenessWorkFlow,
-    AirportEntryPermit,
-    AirportEntryPermitApproval,
-    AirportEntryPermitWorkFlow,
-    AirportEntryPermitChat,
-    AirportEntryPermitAttachment
+    GroupNames,
+    Group
   ],
 });

package/src/index.ts

@@ -62,8 +62,5 @@ export * from './models/SecurityAwarenessApprovalModel';
 export * from './models/SecurityAwarenessAttachmentModel';
 export * from './models/SecurityAwarenessChatModel';
 export * from './models/SecurityAwarenessWorkflowModel';
-export * from './models/AirportEntryPermitModel';
-export * from './models/AirportEntryPermitApprovalModel';
-export * from './models/AirportEntryPermitWorkflowModel';
-export * from './models/AirportEntryPermitChatModel';
-export * from './models/AirportEntryPermitAttachmentModel';
+export * from './models/GroupNamesModel';
+export * from './models/GroupModel';

package/src/models/AccessCardApprovalModel.ts

@@ -22,7 +22,7 @@ export class AccessCardApproval extends BaseModel {
   @Column({ type: "integer", nullable: false })
   level: number;
 
-  @Column({ type: "integer", nullable: false })
+  @Column({ type: "integer", nullable: true })
   approver_role_id: number;
 
   @Column({ type: "integer", nullable: true })

package/src/models/GroupModel.ts

@@ -0,0 +1,31 @@
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model 
+Group
+@usage
+Group Information will store 
+*/
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+@Entity({ name: 'Groups' })
+export class Group extends BaseModel {
+
+    @Column({ type: 'bigint', nullable: false })
+    group_id: number;
+
+    @Column({ type: 'bigint', nullable: false })
+    user_id: number;
+
+    constructor(group_id: number, user_id: number) {
+        super();
+        this.group_id = group_id
+        this.user_id = user_id
+    }
+}
+

package/src/models/GroupNamesModel.ts

@@ -0,0 +1,22 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'group_names' })
+export class GroupNames extends BaseModel {
+
+    @Column({ nullable: false })
+    name: string;
+
+    @Column({ nullable: false })
+    description: string;
+
+    constructor(     
+        name: string,
+        description: string
+    ) {
+        super();     
+        this.name = name;
+        this.description = description;
+    }
+}
+

package/src/models/ITRequestChatModel.ts

@@ -1,42 +1,62 @@
-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;
-    }
-}
-
+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: true })
+    service_id: number | null;
+
+    @Column({ type: 'integer', nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: 'integer', nullable: false })
+    user_id: number;
+
+    @ManyToOne(() => User)
+    @JoinColumn({ name: 'user_id' })
+    user: User;
+
+    @Column({ type: 'integer', nullable: true })
+    role_id: number | null;
+
+    @Column({ type: 'text', nullable: false })
+    message: string;
+
+    @Column({ type: 'text', nullable: true })
+    status: string | null;
+
+    @Column({ type: 'boolean', default: false })
+    is_internal: boolean;
+
+    constructor(
+        request_id: number,
+        user_id: number,
+        message: string,
+        is_internal?: boolean,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        role_id?: number | null,
+        status?: string | null
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.user_id = user_id;
+        this.role_id = role_id || null;
+        this.message = message;
+        this.status = status || null;
+        this.is_internal = is_internal || false;
+    }
+}
+