@platform-modules/foreign-ministry 1.3.336 → 1.3.338

package/src/models/SlaMyRequestsViewModel.ts

@@ -1,172 +1,172 @@
-import { ViewColumn, ViewEntity } from "typeorm";
-import { SlaRequestStatus } from "./SlaRequestModel";
-
-/** Top-level `request_obj` keys omitted from `request_fields` (see sql/vw_sla_my_requests.sql). */
-export const SLA_MY_REQUESTS_REQUEST_OBJ_EXCLUDED_KEYS = [
-    "id",
-    "status",
-    "role_id",
-    "user_id",
-    "createdBy",
-    "created_at",
-    "updated_by",
-    "updated_at",
-    "req_user_department_id",
-    "workflow_execution_id",
-    "department_id",
-    "req_user_section_id",
-    "service_type_id",
-    "service_type",
-    "created_by",
-    "service_id",
-    "sub_service_id",
-    "attachments",
-    "is_deleted",
-    "sla_request",
-    "sla_request_id",
-] as const;
-
-const VW_SLA_MY_REQUESTS_SQL = `
-SELECT
-    sr.id AS sla_request_id,
-    sr.user_id,
-    sr.service_id AS service_id,
-    sr.sub_service_id AS sub_service_id,
-    TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
-    sr.created_at,
-    TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
-    TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
-    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
-    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
-    sr.status::TEXT AS status,
-    sr.request_id,
-    (
-        COALESCE(sr.request_obj, '{}'::jsonb)
-        - 'id'
-        - 'status'
-        - 'role_id'
-        - 'user_id'
-        - 'createdBy'
-        - 'created_at'
-        - 'updated_by'
-        - 'updated_at'
-        - 'req_user_department_id'
-        - 'workflow_execution_id'
-        - 'department_id'
-        - 'req_user_section_id'
-        - 'service_type_id'
-        - 'service_type'
-        - 'created_by'
-        - 'service_id'
-        - 'sub_service_id'
-        - 'attachments'
-        - 'is_deleted'
-        - 'sla_request'
-        - 'sla_request_id'
-    ) AS request_fields
-FROM sla_requests sr
-LEFT JOIN users creator
-    ON sr.created_by ~ '^[0-9]+$'
-    AND creator.id = sr.created_by::integer
-    AND COALESCE(creator.is_deleted, false) = false
-LEFT JOIN departments dept
-    ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
-LEFT JOIN sections sec
-    ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
-LEFT JOIN fm_services svc
-    ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
-LEFT JOIN fm_sub_services subsvc
-    ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
-WHERE COALESCE(sr.is_deleted, false) = false
-`;
-
-/**
- * Read-only view for SLA "my requests" listings.
- * Display-name columns reuse sla_requests field names; values come from joined lookup tables.
- * Service-specific payload keys live in `request_fields` (filtered `request_obj`).
- */
-@ViewEntity({
-    name: "vw_sla_my_requests",
-    expression: VW_SLA_MY_REQUESTS_SQL,
-})
-export class SlaMyRequestsView {
-    @ViewColumn()
-    sla_request_id: number;
-
-    /** Request owner (`sla_requests.user_id`) — filter with WHERE user_id = :userId for "my requests". */
-    @ViewColumn()
-    user_id: number;
-
-    /** Numeric fm_services.id used for filtering. */
-    @ViewColumn()
-    service_id: number;
-
-    /** Numeric fm_sub_services.id used for filtering. */
-    @ViewColumn()
-    sub_service_id: number;
-
-    @ViewColumn()
-    created_by: string;
-
-    @ViewColumn()
-    created_at: Date;
-
-    @ViewColumn()
-    req_user_department_id: string;
-
-    @ViewColumn()
-    req_user_section_id: string;
-
-    @ViewColumn()
-    service_name: string;
-
-    @ViewColumn()
-    sub_service_name: string;
-
-    @ViewColumn()
-    status: SlaRequestStatus | string;
-
-    @ViewColumn()
-    request_id: number;
-
-    /** Remaining `request_obj` keys after excluding workflow/common duplicates. */
-    @ViewColumn()
-    request_fields: Record<string, unknown>;
-}
-
-/** Flatten view row: fixed columns plus each entry in `request_fields`. */
-export function flattenSlaMyRequestsViewRow(
-    row: SlaMyRequestsView
-): Record<string, unknown> {
-    const {
-        sla_request_id,
-        user_id,
-        service_id,
-        sub_service_id,
-        created_by,
-        created_at,
-        req_user_department_id,
-        req_user_section_id,
-        service_name,
-        sub_service_name,
-        status,
-        request_id,
-        request_fields,
-    } = row;
-
-    return {
-        sla_request_id,
-        user_id,
-        service_id,
-        sub_service_id,
-        created_by,
-        created_at,
-        req_user_department_id,
-        req_user_section_id,
-        service_name,
-        sub_service_name,
-        status,
-        request_id,
-        ...(request_fields ?? {}),
-    };
-}
+import { ViewColumn, ViewEntity } from "typeorm";
+import { SlaRequestStatus } from "./SlaRequestModel";
+
+/** Top-level `request_obj` keys omitted from `request_fields` (see sql/vw_sla_my_requests.sql). */
+export const SLA_MY_REQUESTS_REQUEST_OBJ_EXCLUDED_KEYS = [
+    "id",
+    "status",
+    "role_id",
+    "user_id",
+    "createdBy",
+    "created_at",
+    "updated_by",
+    "updated_at",
+    "req_user_department_id",
+    "workflow_execution_id",
+    "department_id",
+    "req_user_section_id",
+    "service_type_id",
+    "service_type",
+    "created_by",
+    "service_id",
+    "sub_service_id",
+    "attachments",
+    "is_deleted",
+    "sla_request",
+    "sla_request_id",
+] as const;
+
+const VW_SLA_MY_REQUESTS_SQL = `
+SELECT
+    sr.id AS sla_request_id,
+    sr.user_id,
+    sr.service_id AS service_id,
+    sr.sub_service_id AS sub_service_id,
+    TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
+    sr.created_at,
+    TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
+    TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
+    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
+    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
+    sr.status::TEXT AS status,
+    sr.request_id,
+    (
+        COALESCE(sr.request_obj, '{}'::jsonb)
+        - 'id'
+        - 'status'
+        - 'role_id'
+        - 'user_id'
+        - 'createdBy'
+        - 'created_at'
+        - 'updated_by'
+        - 'updated_at'
+        - 'req_user_department_id'
+        - 'workflow_execution_id'
+        - 'department_id'
+        - 'req_user_section_id'
+        - 'service_type_id'
+        - 'service_type'
+        - 'created_by'
+        - 'service_id'
+        - 'sub_service_id'
+        - 'attachments'
+        - 'is_deleted'
+        - 'sla_request'
+        - 'sla_request_id'
+    ) AS request_fields
+FROM sla_requests sr
+LEFT JOIN users creator
+    ON sr.created_by ~ '^[0-9]+$'
+    AND creator.id = sr.created_by::integer
+    AND COALESCE(creator.is_deleted, false) = false
+LEFT JOIN departments dept
+    ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
+LEFT JOIN sections sec
+    ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
+LEFT JOIN fm_services svc
+    ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
+LEFT JOIN fm_sub_services subsvc
+    ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
+WHERE COALESCE(sr.is_deleted, false) = false
+`;
+
+/**
+ * Read-only view for SLA "my requests" listings.
+ * Display-name columns reuse sla_requests field names; values come from joined lookup tables.
+ * Service-specific payload keys live in `request_fields` (filtered `request_obj`).
+ */
+@ViewEntity({
+    name: "vw_sla_my_requests",
+    expression: VW_SLA_MY_REQUESTS_SQL,
+})
+export class SlaMyRequestsView {
+    @ViewColumn()
+    sla_request_id: number;
+
+    /** Request owner (`sla_requests.user_id`) — filter with WHERE user_id = :userId for "my requests". */
+    @ViewColumn()
+    user_id: number;
+
+    /** Numeric fm_services.id used for filtering. */
+    @ViewColumn()
+    service_id: number;
+
+    /** Numeric fm_sub_services.id used for filtering. */
+    @ViewColumn()
+    sub_service_id: number;
+
+    @ViewColumn()
+    created_by: string;
+
+    @ViewColumn()
+    created_at: Date;
+
+    @ViewColumn()
+    req_user_department_id: string;
+
+    @ViewColumn()
+    req_user_section_id: string;
+
+    @ViewColumn()
+    service_name: string;
+
+    @ViewColumn()
+    sub_service_name: string;
+
+    @ViewColumn()
+    status: SlaRequestStatus | string;
+
+    @ViewColumn()
+    request_id: number;
+
+    /** Remaining `request_obj` keys after excluding workflow/common duplicates. */
+    @ViewColumn()
+    request_fields: Record<string, unknown>;
+}
+
+/** Flatten view row: fixed columns plus each entry in `request_fields`. */
+export function flattenSlaMyRequestsViewRow(
+    row: SlaMyRequestsView
+): Record<string, unknown> {
+    const {
+        sla_request_id,
+        user_id,
+        service_id,
+        sub_service_id,
+        created_by,
+        created_at,
+        req_user_department_id,
+        req_user_section_id,
+        service_name,
+        sub_service_name,
+        status,
+        request_id,
+        request_fields,
+    } = row;
+
+    return {
+        sla_request_id,
+        user_id,
+        service_id,
+        sub_service_id,
+        created_by,
+        created_at,
+        req_user_department_id,
+        req_user_section_id,
+        service_name,
+        sub_service_name,
+        status,
+        request_id,
+        ...(request_fields ?? {}),
+    };
+}

package/src/models/SlaRequestModel.ts

@@ -1,57 +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",
-    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 = {};
-    }
-}
+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/StayAfterHoursChatModel.ts

@@ -31,9 +31,6 @@ export class StayAfterHoursRequestChat extends BaseModel {
   @Column({ type: 'text', nullable: false })
   message: string;
 
-  @Column({ type: 'text', nullable: true })
-  message_ar: string | null;
-
   @Column({
     type: 'enum',
     enum: StayAfterHoursMessageType,
@@ -45,9 +42,6 @@ export class StayAfterHoursRequestChat extends BaseModel {
   @Column({ type: 'text', nullable: true })
   status: string;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  status_ar: string | null;
-
   constructor(
     request_id: number,
     user_id: number,

package/src/models/StayAfterHoursWorkflowModel.ts

@@ -21,15 +21,9 @@ export class StayAfterHoursWorkFlow extends BaseModel {
   @Column({ type: 'varchar', length: 500, nullable: false })
   content: string;
 
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  content_ar: string | null;
-
   @Column({ type: 'enum', enum: StayAfterHoursWorkFlowStatus, default: StayAfterHoursWorkFlowStatus.NOT_YET_STARTED, nullable: false })
   status: StayAfterHoursWorkFlowStatus;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  status_ar: string | null;
-
   @Column({ type: 'integer', nullable: true })
   user_id: number | null;
 

package/src/models/TransferAllowanceChatModel.ts

@@ -29,9 +29,6 @@ export class TransferAllowanceRequestChat extends BaseModel {
   @Column({ type: 'text', nullable: false })
   message: string;
 
-  @Column({ type: 'text', nullable: true })
-  message_ar: string | null;
-
   @Column({
     type: 'enum',
     enum: TransferAllowanceMessageType,
@@ -43,9 +40,6 @@ export class TransferAllowanceRequestChat extends BaseModel {
   @Column({ type: 'text', nullable: true })
   status: string;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  status_ar: string | null;
-
   constructor(
     request_id: number,
     user_id: number,

package/src/models/TransferAllowanceWorkflowModel.ts

@@ -21,9 +21,6 @@ export class TransferAllowanceWorkFlow extends BaseModel {
   @Column({ type: 'varchar', length: 500, nullable: false })
   content: string;
 
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  content_ar: string | null;
-
   @Column({
     type: 'enum',
     enum: TransferAllowanceWorkFlowStatus,

package/src/models/TransferMissionChatModel.ts

@@ -31,9 +31,6 @@ export class TransferMissionRequestChat extends BaseModel {
   @Column({ type: 'text', nullable: false })
   message: string;
 
-  @Column({ type: 'text', nullable: true })
-  message_ar: string | null;
-
   @Column({
     type: 'enum',
     enum: TransferMissionMessageType,
@@ -45,9 +42,6 @@ export class TransferMissionRequestChat extends BaseModel {
   @Column({ type: 'text', nullable: true })
   status: string;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  status_ar: string | null;
-
   constructor(
     request_id: number,
     user_id: number,

package/src/models/TransferMissionWorkflowModel.ts

@@ -21,15 +21,9 @@ export class TransferMissionWorkFlow extends BaseModel {
   @Column({ type: 'varchar', length: 500, nullable: false })
   content: string;
 
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  content_ar: string | null;
-
   @Column({ type: 'enum', enum: TransferMissionWorkFlowStatus, default: TransferMissionWorkFlowStatus.NOT_YET_STARTED, nullable: false })
   status: TransferMissionWorkFlowStatus;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  status_ar: string | null;
-
   @Column({ type: 'integer', nullable: true })
   user_id: number | null;
 

package/src/models/TransferSalaryBankAccountChatModel.ts

@@ -29,9 +29,6 @@ export class TransferSalaryBankAccountRequestChat extends BaseModel {
   @Column({ type: 'text', nullable: false })
   message: string;
 
-  @Column({ type: 'text', nullable: true })
-  message_ar: string | null;
-
   @Column({
     type: 'enum',
     enum: TransferSalaryBankAccountMessageType,
@@ -43,9 +40,6 @@ export class TransferSalaryBankAccountRequestChat extends BaseModel {
   @Column({ type: 'text', nullable: true })
   status: string;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  status_ar: string | null;
-
   constructor(
     request_id: number,
     user_id: number,

package/src/models/TransferSalaryBankAccountWorkflowModel.ts

@@ -21,9 +21,6 @@ export class TransferSalaryBankAccountWorkFlow extends BaseModel {
   @Column({ type: 'varchar', length: 500, nullable: false })
   content: string;
 
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  content_ar: string | null;
-
   @Column({
     type: 'enum',
     enum: TransferSalaryBankAccountWorkFlowStatus,

package/src/models/UpdateAttendanceChatModel.ts

@@ -31,9 +31,6 @@ export class UpdateAttendanceRequestChat extends BaseModel {
   @Column({ type: 'text', nullable: false })
   message: string;
 
-  @Column({ type: 'text', nullable: true })
-  message_ar: string | null;
-
   @Column({ type: 'enum', enum: UpdateAttendanceMessageType, default: UpdateAttendanceMessageType.TEXT, nullable: false })
   messageType: UpdateAttendanceMessageType;
 

package/src/models/UpdateAttendanceWorkflowModel.ts

@@ -21,15 +21,9 @@ export class UpdateAttendanceWorkFlow extends BaseModel {
   @Column({ type: 'varchar', length: 500, nullable: false })
   content: string;
 
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  content_ar: string | null;
-
   @Column({ type: 'enum', enum: UpdateAttendanceWorkFlowStatus, default: UpdateAttendanceWorkFlowStatus.NOT_YET_STARTED, nullable: false })
   status: UpdateAttendanceWorkFlowStatus;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  status_ar: string | null;
-
   @Column({ type: 'integer', nullable: true })
   user_id: number | null;
 

package/src/models/user.ts

@@ -142,6 +142,9 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     language_preferences?: string;
 
+    @Column({ type: "enum", enum: ["English", "Arabic"], nullable: false, default: "English" })
+    is_selected_lang: "English" | "Arabic";
+
     @Column({ type: "enum", enum: ["FM", "Embassy"], nullable: false, default: "FM" })
     category: "FM" | "Embassy"; // Mandatory
 

package/src/sla-report-views.ts

@@ -1,3 +1,3 @@
-/** SLA report views — import from `@platform-modules/foreign-ministry/sla-report-views` (Reports_Service only). Not in main index to avoid TypeORM synchronize conflicts. */
-export * from './models/SlaMyRequestsViewModel';
-export * from './models/SlaApprovalsViewModel';
+/** SLA report views — import from `@platform-modules/foreign-ministry/sla-report-views` (Reports_Service only). Not in main index to avoid TypeORM synchronize conflicts. */
+export * from './models/SlaMyRequestsViewModel';
+export * from './models/SlaApprovalsViewModel';

package/tsconfig.json

@@ -5,7 +5,6 @@
     "declaration": true,
     "outDir": "./dist",
     "strict": true,
-    "resolveJsonModule": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
     "strictPropertyInitialization": false,

package/dist/i18n/workflow-chat-i18n.d.ts

@@ -1,5 +0,0 @@
-/**
- * Re-exports the FM standard bilingual message builder.
- * Import from '@platform-modules/foreign-ministry' in all services.
- */
-export * from './workflow-chat-message.builder';