@platform-modules/foreign-ministry 1.3.333 → 1.3.335

package/.env

@@ -1,10 +1,10 @@
-# DB_HOST=localhost
-# DB_PORT=5432
-# DB_USER=postgres
-# DB_PASS=stevejobs
-# DB_NAME=FM
-
-DB_HOST = 164.52.222.169
-DB_USER = postgres_admin_user
-DB_PASS = pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
-DB_NAME=FM
+# DB_HOST=localhost
+# DB_PORT=5432
+# DB_USER=postgres
+# DB_PASS=stevejobs
+# DB_NAME=FM
+
+DB_HOST = 164.52.222.169
+DB_USER = postgres_admin_user
+DB_PASS = pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+DB_NAME=FM

package/dist/helpers/services-notification-config.helper.js

@@ -80,7 +80,7 @@ async function collectFmServicesNotificationConfigRecipients(manager, params) {
  * Inserts portal notifications for users resolved from `services_notification_configs`.
  */
 async function sendFmServicesNotificationConfigNotifications(manager, params) {
-    const { serviceId, subServiceId, pendingCount, requestId, status, approvalLevel, shortProductName, requestTypeKey, routePath, createdBy, logPrefix = '[FM notification config]', } = params;
+    const { serviceId, subServiceId, pendingCount, requestId, status, shortProductName, requestTypeKey, routePath, createdBy, logPrefix = '[FM notification config]', } = params;
     if (!serviceId || !subServiceId)
         return { sentCount: 0 };
     const notificationConfigs = await manager
@@ -126,10 +126,7 @@ async function sendFmServicesNotificationConfigNotifications(manager, params) {
             console.warn(`${logPrefix} No users found for ${notificationConfig.trigger} config (dept ${notificationConfig.department_id}${notificationConfig.section_id != null ? `, section ${notificationConfig.section_id}` : ''})`);
             continue;
         }
-        const isEveryApproval = notificationConfig.trigger === ServicesNotificationConfigsModel_1.ServicesNotificationTriggerType.EVERY_APPROVAL;
-        const notificationTitle = isEveryApproval
-            ? `${shortProductName} Request ${status} at Level ${approvalLevel}`
-            : `${shortProductName} Request ${status}`;
+        const notificationTitle = `${shortProductName} Request ${status}`;
         const notificationData = `${shortProductName} request #${requestId} has been ${status}.`;
         for (const ur of userRoles) {
             const targetUserId = ur.user_id;
@@ -160,7 +157,6 @@ async function sendFmServicesNotificationConfigNotifications(manager, params) {
                         requestId,
                         requestType: requestTypeKey,
                         status,
-                        level: approvalLevel,
                         timestamp: new Date().toISOString(),
                     },
                     is_read: false,

package/dist/helpers/sla-request-status.helper.d.ts

@@ -0,0 +1,3 @@
+export declare function resolveSlaRequestStatusFromNative(nativeStatus: unknown, fallback?: string): string;
+/** Maps portal/native request status to a value stored on `sla_requests.status`. */
+export declare function mapPortalRequestStatusToSla(status: string): string | null;

package/dist/helpers/sla-request-status.helper.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveSlaRequestStatusFromNative = resolveSlaRequestStatusFromNative;
+exports.mapPortalRequestStatusToSla = mapPortalRequestStatusToSla;
+const SlaRequestModel_1 = require("../models/SlaRequestModel");
+const SLA_MIRROR_STATUS_CANONICAL = {
+    pending: SlaRequestModel_1.SlaRequestStatus.PENDING,
+    "in progress": SlaRequestModel_1.SlaRequestStatus.IN_PROGRESS,
+    approved: SlaRequestModel_1.SlaRequestStatus.APPROVED,
+    rejected: SlaRequestModel_1.SlaRequestStatus.REJECTED,
+    assigned: SlaRequestModel_1.SlaRequestStatus.ASSIGNED,
+    completed: SlaRequestModel_1.SlaRequestStatus.COMPLETED,
+    closed: "Closed",
+    returned: "Returned",
+    rfc: "RFC",
+    "request for change": "Request For Change"
+};
+function resolveSlaRequestStatusFromNative(nativeStatus, fallback = SlaRequestModel_1.SlaRequestStatus.PENDING) {
+    const trimmed = String(nativeStatus ?? "").trim();
+    if (!trimmed) {
+        return fallback;
+    }
+    const canonical = SLA_MIRROR_STATUS_CANONICAL[trimmed.toLowerCase()];
+    return canonical ?? trimmed;
+}
+/** Maps portal/native request status to a value stored on `sla_requests.status`. */
+function mapPortalRequestStatusToSla(status) {
+    const resolved = resolveSlaRequestStatusFromNative(status, "");
+    if (!resolved) {
+        return null;
+    }
+    if (String(status || "").trim().toLowerCase() === "cancelled") {
+        return SlaRequestModel_1.SlaRequestStatus.REJECTED;
+    }
+    return resolved;
+}

package/dist/models/CityMasterModel.d.ts

@@ -2,6 +2,7 @@ import { BaseModel } from './BaseModel';
 export declare class CityMaster extends BaseModel {
     country_id: number | null;
     city_name: string;
+    city_arabic_name: string | null;
     city_code: string | null;
     description: string | null;
     constructor(city_name: string);

package/dist/models/CityMasterModel.js

@@ -27,6 +27,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
     __metadata("design:type", String)
 ], CityMaster.prototype, "city_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], CityMaster.prototype, "city_arabic_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
     __metadata("design:type", Object)

package/dist/models/DepartmentsModel.d.ts

@@ -1,6 +1,7 @@
 import { BaseModel } from './BaseModel';
 export declare class Departments extends BaseModel {
     department_name: string;
+    department_arabic_name: string | null;
     department_code: string;
     department_description: string;
     undersecretary_department_id: number | null;

package/dist/models/DepartmentsModel.js

@@ -27,6 +27,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 64, nullable: false }),
     __metadata("design:type", String)
 ], Departments.prototype, "department_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], Departments.prototype, "department_arabic_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 64, nullable: false }),
     __metadata("design:type", String)

package/dist/models/DiplomaticTitlesMasterModel.d.ts

@@ -5,6 +5,7 @@ export declare enum TitleCategory {
 }
 export declare class DiplomaticTitlesMaster extends BaseModel {
     title: string;
+    diplomatic_title_arabic_name: string | null;
     category: TitleCategory;
     constructor(title: string, category: TitleCategory);
 }

package/dist/models/DiplomaticTitlesMasterModel.js

@@ -29,6 +29,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
     __metadata("design:type", String)
 ], DiplomaticTitlesMaster.prototype, "title", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], DiplomaticTitlesMaster.prototype, "diplomatic_title_arabic_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'enum', enum: TitleCategory, nullable: false, default: TitleCategory.EMPLOYEE }),
     __metadata("design:type", String)

package/dist/models/GroupNamesModel.d.ts

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

package/dist/models/GroupNamesModel.js

@@ -24,6 +24,10 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: false }),
     __metadata("design:type", String)
 ], GroupNames.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], GroupNames.prototype, "group_arabic_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)

package/dist/models/LocationModel.d.ts

@@ -1,6 +1,7 @@
 export declare class Location {
     id: number;
     name: string;
+    location_arabic_name: string | null;
     description: string;
     is_active: boolean;
     is_deleted: boolean;

package/dist/models/LocationModel.js

@@ -28,6 +28,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
     __metadata("design:type", String)
 ], Location.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], Location.prototype, "location_arabic_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", String)

package/dist/models/SectionModel.d.ts

@@ -1,6 +1,7 @@
 import { BaseModel } from './BaseModel';
 export declare class Sections extends BaseModel {
     section_name: string;
+    section_arabic_name: string | null;
     section_code: string;
     section_description: string;
     department_id: number;

package/dist/models/SectionModel.js

@@ -27,6 +27,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 64, nullable: false }),
     __metadata("design:type", String)
 ], Sections.prototype, "section_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], Sections.prototype, "section_arabic_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 64, nullable: false }),
     __metadata("design:type", String)

package/dist/models/SlaRequestModel.d.ts

@@ -3,7 +3,9 @@ export declare enum SlaRequestStatus {
     PENDING = "Pending",
     IN_PROGRESS = "In Progress",
     APPROVED = "Approved",
-    REJECTED = "Rejected"
+    REJECTED = "Rejected",
+    ASSIGNED = "Assigned",
+    COMPLETED = "Completed"
 }
 export declare class SlaRequest extends BaseModel {
     req_user_department_id: number | null;
@@ -11,7 +13,7 @@ export declare class SlaRequest extends BaseModel {
     service_id: number | null;
     sub_service_id: number | null;
     user_id: number;
-    status: SlaRequestStatus;
+    status: string;
     workflow_execution_id: string | null;
     request_id: number;
     request_obj: Record<string, unknown>;

package/dist/models/SlaRequestModel.js

@@ -18,6 +18,8 @@ var SlaRequestStatus;
     SlaRequestStatus["IN_PROGRESS"] = "In Progress";
     SlaRequestStatus["APPROVED"] = "Approved";
     SlaRequestStatus["REJECTED"] = "Rejected";
+    SlaRequestStatus["ASSIGNED"] = "Assigned";
+    SlaRequestStatus["COMPLETED"] = "Completed";
 })(SlaRequestStatus || (exports.SlaRequestStatus = SlaRequestStatus = {}));
 let SlaRequest = class SlaRequest extends BaseModel_1.BaseModel {
     constructor() {
@@ -49,8 +51,8 @@ __decorate([
 ], SlaRequest.prototype, "user_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({
-        type: "enum",
-        enum: SlaRequestStatus,
+        type: "varchar",
+        length: 64,
         default: SlaRequestStatus.PENDING,
         nullable: false
     }),

package/dist/models/role.d.ts

@@ -11,6 +11,7 @@ Userrole Information will store
 import { BaseModel } from './BaseModel';
 export declare class Role extends BaseModel {
     name: string;
+    arabic_name: string | null;
     is_deleted?: boolean;
-    constructor(name: string, is_deleted: boolean);
+    constructor(name: string, is_deleted: boolean, arabic_name?: string | null);
 }

package/dist/models/role.js

@@ -23,10 +23,11 @@ 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) {
+    constructor(name, is_deleted, arabic_name = null) {
         super();
         this.name = name;
         this.is_deleted = is_deleted;
+        this.arabic_name = arabic_name;
     }
 };
 exports.Role = Role;
@@ -34,11 +35,15 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], Role.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], Role.prototype, "arabic_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", Boolean)
 ], Role.prototype, "is_deleted", void 0);
 exports.Role = Role = __decorate([
     (0, typeorm_1.Entity)({ name: 'role' }),
-    __metadata("design:paramtypes", [String, Boolean])
+    __metadata("design:paramtypes", [String, Boolean, Object])
 ], Role);

package/package.json

@@ -1,35 +1,35 @@
-{
- "name": "@platform-modules/foreign-ministry",
- "version": "1.3.333",
- "main": "dist/index.js",
- "types": "dist/index.d.ts",
- "exports": {
-  ".": {
-   "types": "./dist/index.d.ts",
-   "default": "./dist/index.js"
-  },
-  "./sla-report-views": {
-   "types": "./dist/sla-report-views.d.ts",
-   "default": "./dist/sla-report-views.js"
-  }
- },
- "scripts": {
-  "build": "tsc",
-  "dev": "ts-node src/scripts.ts",
-  "sync:sla-sql": "node scripts/sync-sla-reports-sql.js"
- },
- "publishConfig": {
-  "access": "public"
- },
- "dependencies": {
-  "moment-timezone": "^0.6.0",
-  "pg": "^8.16.0",
-  "typeorm": "^0.3.17"
- },
- "devDependencies": {
-  "@types/moment-timezone": "^0.5.30",
-  "dotenv": "^16.5.0",
-  "ts-node": "^10.9.2",
-  "typescript": "^5.2.0"
- }
-}
+{
+ "name": "@platform-modules/foreign-ministry",
+ "version": "1.3.335",
+ "main": "dist/index.js",
+ "types": "dist/index.d.ts",
+ "exports": {
+  ".": {
+   "types": "./dist/index.d.ts",
+   "default": "./dist/index.js"
+  },
+  "./sla-report-views": {
+   "types": "./dist/sla-report-views.d.ts",
+   "default": "./dist/sla-report-views.js"
+  }
+ },
+ "scripts": {
+  "build": "tsc",
+  "dev": "ts-node src/scripts.ts",
+  "sync:sla-sql": "node scripts/sync-sla-reports-sql.js"
+ },
+ "publishConfig": {
+  "access": "public"
+ },
+ "dependencies": {
+  "moment-timezone": "^0.6.0",
+  "pg": "^8.16.0",
+  "typeorm": "^0.3.17"
+ },
+ "devDependencies": {
+  "@types/moment-timezone": "^0.5.30",
+  "dotenv": "^16.5.0",
+  "ts-node": "^10.9.2",
+  "typescript": "^5.2.0"
+ }
+}

package/sql/sla-reports-sync.manifest.json

@@ -1,4 +1,5 @@
 [
+  "sla_requests_status_to_varchar.sql",
   "vw_sla_my_requests.sql",
   "vw_sla_approvals.sql",
   "sla_reports_procedures.sql",

package/sql/sla_requests_status_to_varchar.sql

@@ -0,0 +1,28 @@
+-- Store sla_requests.status as varchar (not enum) so Assigned / Completed and future values work without enum migrations.
+
+DO $$
+BEGIN
+  IF EXISTS (
+    SELECT 1
+    FROM information_schema.columns
+    WHERE table_schema = 'public'
+      AND table_name = 'sla_requests'
+      AND column_name = 'status'
+      AND udt_name = 'sla_requests_status_enum'
+  ) THEN
+    ALTER TABLE sla_requests
+      ALTER COLUMN status TYPE varchar(64) USING status::text;
+  ELSIF EXISTS (
+    SELECT 1
+    FROM information_schema.columns
+    WHERE table_schema = 'public'
+      AND table_name = 'sla_requests'
+      AND column_name = 'status'
+      AND character_maximum_length IS DISTINCT FROM 64
+  ) THEN
+    ALTER TABLE sla_requests
+      ALTER COLUMN status TYPE varchar(64) USING status::text;
+  END IF;
+END $$;
+
+

package/src/helpers/services-notification-config.helper.ts

@@ -133,7 +133,6 @@ export async function sendFmServicesNotificationConfigNotifications(
     pendingCount,
     requestId,
     status,
-    approvalLevel,
     shortProductName,
     requestTypeKey,
     routePath,
@@ -194,10 +193,7 @@ export async function sendFmServicesNotificationConfigNotifications(
       continue;
     }
 
-    const isEveryApproval = notificationConfig.trigger === ServicesNotificationTriggerType.EVERY_APPROVAL;
-    const notificationTitle = isEveryApproval
-      ? `${shortProductName} Request ${status} at Level ${approvalLevel}`
-      : `${shortProductName} Request ${status}`;
+    const notificationTitle = `${shortProductName} Request ${status}`;
     const notificationData = `${shortProductName} request #${requestId} has been ${status}.`;
 
     for (const ur of userRoles) {
@@ -230,7 +226,6 @@ export async function sendFmServicesNotificationConfigNotifications(
               requestId,
               requestType: requestTypeKey,
               status,
-              level: approvalLevel,
               timestamp: new Date().toISOString(),
             },
             is_read: false,

package/src/models/CityMasterModel.ts

@@ -9,6 +9,9 @@ export class CityMaster extends BaseModel {
   @Column({ type: 'varchar', length: 255, nullable: false })
   city_name: string;
 
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  city_arabic_name: string | null;
+
   @Column({ type: 'varchar', length: 50, nullable: true })
   city_code: string | null;
 

package/src/models/DepartmentsModel.ts

@@ -7,6 +7,9 @@ export class Departments extends BaseModel {
     @Column({ type: 'varchar', length: 64, nullable: false })
     department_name: string;
 
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    department_arabic_name: string | null;
+
     @Column({ type: 'varchar', length: 64, nullable: false})
     department_code: string;
 

package/src/models/DiplomaticTitlesMasterModel.ts

@@ -11,6 +11,9 @@ export class DiplomaticTitlesMaster extends BaseModel {
   @Column({ type: 'varchar', length: 255, nullable: false })
   title: string; // Diplomatic title name
 
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  diplomatic_title_arabic_name: string | null;
+
   @Column({ type: 'enum', enum: TitleCategory, nullable: false,default: TitleCategory.EMPLOYEE})
   category: TitleCategory; // Category: Employee or Non Employee
 

package/src/models/GroupNamesModel.ts

@@ -8,6 +8,9 @@ export class GroupNames extends BaseModel {
     @Column({ nullable: false })
     name: string;
 
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    group_arabic_name: string | null;
+
     @Column({ nullable: true })
     description: string;
 

package/src/models/LocationModel.ts

@@ -14,6 +14,9 @@ export class Location {
   @Column({ type: 'varchar', length: 255, nullable: false })
   name: string;
 
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  location_arabic_name: string | null;
+
   @Column({ type: 'text', nullable: true })
   description: string;
 

package/src/models/SectionModel.ts

@@ -1,36 +1,39 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'sections' })
-export class Sections extends BaseModel {
-
-    @Column({ type: 'varchar', length: 64, nullable: false })
-    section_name: string;
-
-    @Column({ type: 'varchar', length: 64, nullable: false })
-    section_code: string;
-
-    @Column({ nullable: false })
-    section_description: string;
-
-    @Column({ type: 'bigint', nullable: true })
-    department_id: number;
-
-    @Column({ nullable: true , default: false})
-    is_followup_sec?: boolean;
-
-    constructor(     
-        section_name: string,
-        section_code: string,
-        section_description: string,
-        department_id: number,
-        is_followup_sec: boolean
-    ) {
-        super();     
-        this.section_name = section_name
-        this.section_code = section_code
-        this.section_description = section_description
-        this.department_id = department_id
-        this.is_followup_sec = is_followup_sec
-    }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'sections' })
+export class Sections extends BaseModel {
+
+    @Column({ type: 'varchar', length: 64, nullable: false })
+    section_name: string;
+
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    section_arabic_name: string | null;
+
+    @Column({ type: 'varchar', length: 64, nullable: false })
+    section_code: string;
+
+    @Column({ nullable: false })
+    section_description: string;
+
+    @Column({ type: 'bigint', nullable: true })
+    department_id: number;
+
+    @Column({ nullable: true , default: false})
+    is_followup_sec?: boolean;
+
+    constructor(     
+        section_name: string,
+        section_code: string,
+        section_description: string,
+        department_id: number,
+        is_followup_sec: boolean
+    ) {
+        super();     
+        this.section_name = section_name
+        this.section_code = section_code
+        this.section_description = section_description
+        this.department_id = department_id
+        this.is_followup_sec = is_followup_sec
+    }
 }

package/src/models/SlaRequestModel.ts

@@ -1,55 +1,57 @@
-import { Column, Entity, Index } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum SlaRequestStatus {
-    PENDING = "Pending",
-    IN_PROGRESS = "In Progress",
-    APPROVED = "Approved",
-    REJECTED = "Rejected"
-}
-
-@Entity({ name: "sla_requests" })
-// @Index("uq_sla_requests_request_id", ["request_id"])
-@Index("idx_sla_requests_user_id", ["user_id"])
-@Index("idx_sla_requests_service_subservice", ["service_id", "sub_service_id"])
-@Index("idx_sla_requests_workflow_execution_id", ["workflow_execution_id"])
-@Index("idx_sla_requests_status", ["status"])
-export class SlaRequest extends BaseModel {
-    @Column({ type: "int", nullable: true })
-    req_user_department_id: number | null;
-
-    @Column({ type: "int", nullable: true })
-    req_user_section_id: number | null;
-
-    @Column({ type: "int", nullable: true })
-    service_id: number | null;
-
-    @Column({ type: "int", nullable: true })
-    sub_service_id: number | null;
-
-    @Column({ type: "int", nullable: false })
-    user_id: number;
-
-    @Column({
-        type: "enum",
-        enum: SlaRequestStatus,
-        default: SlaRequestStatus.PENDING,
-        nullable: false
-    })
-    status: SlaRequestStatus;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    workflow_execution_id: string | null;
-
-    @Column({ type: "int", nullable: false })
-    request_id: number;
-
-    @Column({ type: "jsonb", nullable: false, default: () => "'{}'::jsonb" })
-    request_obj: Record<string, unknown>;
-
-    constructor() {
-        super();
-        this.request_id = 0;
-        this.request_obj = {};
-    }
-}
+import { Column, Entity, Index } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum SlaRequestStatus {
+    PENDING = "Pending",
+    IN_PROGRESS = "In Progress",
+    APPROVED = "Approved",
+    REJECTED = "Rejected",
+    ASSIGNED = "Assigned",
+    COMPLETED = "Completed"
+}
+
+@Entity({ name: "sla_requests" })
+// @Index("uq_sla_requests_request_id", ["request_id"])
+@Index("idx_sla_requests_user_id", ["user_id"])
+@Index("idx_sla_requests_service_subservice", ["service_id", "sub_service_id"])
+@Index("idx_sla_requests_workflow_execution_id", ["workflow_execution_id"])
+@Index("idx_sla_requests_status", ["status"])
+export class SlaRequest extends BaseModel {
+    @Column({ type: "int", nullable: true })
+    req_user_department_id: number | null;
+
+    @Column({ type: "int", nullable: true })
+    req_user_section_id: number | null;
+
+    @Column({ type: "int", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "int", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "int", nullable: false })
+    user_id: number;
+
+    @Column({
+        type: "varchar",
+        length: 64,
+        default: SlaRequestStatus.PENDING,
+        nullable: false
+    })
+    status: string;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    @Column({ type: "int", nullable: false })
+    request_id: number;
+
+    @Column({ type: "jsonb", nullable: false, default: () => "'{}'::jsonb" })
+    request_obj: Record<string, unknown>;
+
+    constructor() {
+        super();
+        this.request_id = 0;
+        this.request_obj = {};
+    }
+}

package/src/models/role.ts

@@ -18,13 +18,17 @@ export class Role extends BaseModel {
     @Column({ nullable: true })
     name: string;
 
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    arabic_name: string | null;
+
     @Column({ nullable: true })   
     is_deleted?: boolean;  
 
 
-    constructor(name: string, is_deleted:boolean) {
+    constructor(name: string, is_deleted: boolean, arabic_name: string | null = null) {
         super();
-        this.name = name
-        this.is_deleted = is_deleted
+        this.name = name;
+        this.is_deleted = is_deleted;
+        this.arabic_name = arabic_name;
     }
 }