@platform-modules/foreign-ministry 1.3.351 → 1.3.358

package/dist/models/SlaMyRequestsViewModel.js

@@ -36,58 +36,63 @@ exports.SLA_MY_REQUESTS_REQUEST_OBJ_EXCLUDED_KEYS = [
     "sla_request",
     "sla_request_id",
 ];
-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
+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,
+    TRIM(COALESCE(dept.department_arabic_name, ''))::TEXT AS req_user_department_arabicname,
+    TRIM(COALESCE(sec.section_arabic_name, ''))::TEXT AS req_user_section_arabicname,
+    TRIM(COALESCE(req_user.employee_arabic_name, ''))::TEXT AS req_user_arabicname
+FROM sla_requests sr
+LEFT JOIN users req_user
+    ON req_user.id = sr.user_id AND COALESCE(req_user.is_deleted, false) = false
+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.
@@ -149,6 +154,18 @@ __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Object)
 ], SlaMyRequestsView.prototype, "request_fields", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], SlaMyRequestsView.prototype, "req_user_department_arabicname", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], SlaMyRequestsView.prototype, "req_user_section_arabicname", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], SlaMyRequestsView.prototype, "req_user_arabicname", void 0);
 exports.SlaMyRequestsView = SlaMyRequestsView = __decorate([
     (0, typeorm_1.ViewEntity)({
         name: "vw_sla_my_requests",
@@ -157,7 +174,7 @@ exports.SlaMyRequestsView = SlaMyRequestsView = __decorate([
 ], SlaMyRequestsView);
 /** Flatten view row: fixed columns plus each entry in `request_fields`. */
 function flattenSlaMyRequestsViewRow(row) {
-    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;
+    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, req_user_department_arabicname, req_user_section_arabicname, req_user_arabicname, } = row;
     return {
         sla_request_id,
         user_id,
@@ -171,6 +188,9 @@ function flattenSlaMyRequestsViewRow(row) {
         sub_service_name,
         status,
         request_id,
+        req_user_department_arabicname,
+        req_user_section_arabicname,
+        req_user_arabicname,
         ...(request_fields ?? {}),
     };
 }

package/dist/models/UuidAuditModel.d.ts

@@ -0,0 +1,9 @@
+/** UUID primary key + audit columns + soft delete via deleted_at. */
+export declare abstract class UuidAuditModel {
+    id: string;
+    created_by: string;
+    created_at: Date;
+    updated_by: string | null;
+    updated_at: Date;
+    deleted_at: Date | null;
+}

package/dist/models/UuidAuditModel.js

@@ -0,0 +1,41 @@
+"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.UuidAuditModel = void 0;
+const typeorm_1 = require("typeorm");
+/** UUID primary key + audit columns + soft delete via deleted_at. */
+class UuidAuditModel {
+}
+exports.UuidAuditModel = UuidAuditModel;
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
+    __metadata("design:type", String)
+], UuidAuditModel.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 128, nullable: false, default: '' }),
+    __metadata("design:type", String)
+], UuidAuditModel.prototype, "created_by", void 0);
+__decorate([
+    (0, typeorm_1.CreateDateColumn)({ type: 'timestamptz', default: () => 'CURRENT_TIMESTAMP' }),
+    __metadata("design:type", Date)
+], UuidAuditModel.prototype, "created_at", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 128, nullable: true }),
+    __metadata("design:type", Object)
+], UuidAuditModel.prototype, "updated_by", void 0);
+__decorate([
+    (0, typeorm_1.UpdateDateColumn)({ type: 'timestamptz', default: () => 'CURRENT_TIMESTAMP' }),
+    __metadata("design:type", Date)
+], UuidAuditModel.prototype, "updated_at", void 0);
+__decorate([
+    (0, typeorm_1.DeleteDateColumn)({ type: 'timestamptz', nullable: true }),
+    __metadata("design:type", Object)
+], UuidAuditModel.prototype, "deleted_at", void 0);

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/foreign-ministry",
- "version": "1.3.351",
+ "version": "1.3.358",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "exports": {
@@ -22,7 +22,7 @@
   "access": "public"
  },
  "dependencies": {
-  "@platform-modules/foreign-ministry": "^1.3.338",
+  "@platform-modules/foreign-ministry": "^1.3.355",
   "moment-timezone": "^0.6.0",
   "pg": "^8.16.0",
   "typeorm": "^0.3.17"

package/scripts/check-column-types.js

@@ -1,38 +1,38 @@
-const dotenv = require('dotenv');
-const { Client } = require('pg');
-
-dotenv.config({ path: '../Reports_Service/.env' });
-dotenv.config({ path: '.env', override: true });
-
-async function main() {
-  const client = new Client({
-    host: process.env.DB_HOST.trim(),
-    port: 5432,
-    user: process.env.DB_USER.trim(),
-    password: process.env.DB_PASS,
-    database: process.env.DB_NAME.trim(),
-  });
-  await client.connect();
-
-  const tables = ['sla_requests', 'users', 'departments', 'sections', 'fm_services', 'fm_sub_services'];
-  for (const table of tables) {
-    const { rows } = await client.query(
-      `SELECT column_name, data_type
-       FROM information_schema.columns
-       WHERE table_schema = 'public' AND table_name = $1
-       ORDER BY ordinal_position`,
-      [table]
-    );
-    console.log(`\n${table}:`);
-    for (const row of rows) {
-      console.log(`  ${row.column_name}: ${row.data_type}`);
-    }
-  }
-
-  await client.end();
-}
-
-main().catch((err) => {
-  console.error(err.message);
-  process.exit(1);
-});
+const dotenv = require('dotenv');
+const { Client } = require('pg');
+
+dotenv.config({ path: '../Reports_Service/.env' });
+dotenv.config({ path: '.env', override: true });
+
+async function main() {
+  const client = new Client({
+    host: process.env.DB_HOST.trim(),
+    port: 5432,
+    user: process.env.DB_USER.trim(),
+    password: process.env.DB_PASS,
+    database: process.env.DB_NAME.trim(),
+  });
+  await client.connect();
+
+  const tables = ['sla_requests', 'users', 'departments', 'sections', 'fm_services', 'fm_sub_services'];
+  for (const table of tables) {
+    const { rows } = await client.query(
+      `SELECT column_name, data_type
+       FROM information_schema.columns
+       WHERE table_schema = 'public' AND table_name = $1
+       ORDER BY ordinal_position`,
+      [table]
+    );
+    console.log(`\n${table}:`);
+    for (const row of rows) {
+      console.log(`  ${row.column_name}: ${row.data_type}`);
+    }
+  }
+
+  await client.end();
+}
+
+main().catch((err) => {
+  console.error(err.message);
+  process.exit(1);
+});

package/scripts/check-service-tables.js

@@ -1,42 +1,42 @@
-const dotenv = require('dotenv');
-const path = require('path');
-const { Client } = require('pg');
-
-async function listTables(label, config) {
-  const client = new Client(config);
-  await client.connect();
-  const { rows } = await client.query(`
-    SELECT table_name
-    FROM information_schema.tables
-    WHERE table_schema = 'public'
-      AND (table_name LIKE '%service%' OR table_name LIKE 'sla%')
-    ORDER BY table_name
-  `);
-  console.log(`${label} (${config.database}):`, rows.map((r) => r.table_name).join(', ') || '(none)');
-  await client.end();
-}
-
-async function main() {
-  dotenv.config({ path: path.join(__dirname, '..', '.env') });
-  await listTables('FM shared_models/.env', {
-    host: process.env.DB_HOST.trim(),
-    port: 5432,
-    user: process.env.DB_USER.trim(),
-    password: process.env.DB_PASS,
-    database: process.env.DB_NAME.trim(),
-  });
-
-  dotenv.config({ path: path.join(__dirname, '..', '..', 'Reports_Service', '.env') });
-  await listTables('Reports_Service/.env', {
-    host: (process.env.TYPEORM_HOST || '').trim(),
-    port: 5432,
-    user: (process.env.TYPEORM_USERNAME || '').trim(),
-    password: process.env.TYPEORM_PASSWORD,
-    database: (process.env.TYPEORM_DATABASE || '').trim(),
-  });
-}
-
-main().catch((err) => {
-  console.error(err.message);
-  process.exit(1);
-});
+const dotenv = require('dotenv');
+const path = require('path');
+const { Client } = require('pg');
+
+async function listTables(label, config) {
+  const client = new Client(config);
+  await client.connect();
+  const { rows } = await client.query(`
+    SELECT table_name
+    FROM information_schema.tables
+    WHERE table_schema = 'public'
+      AND (table_name LIKE '%service%' OR table_name LIKE 'sla%')
+    ORDER BY table_name
+  `);
+  console.log(`${label} (${config.database}):`, rows.map((r) => r.table_name).join(', ') || '(none)');
+  await client.end();
+}
+
+async function main() {
+  dotenv.config({ path: path.join(__dirname, '..', '.env') });
+  await listTables('FM shared_models/.env', {
+    host: process.env.DB_HOST.trim(),
+    port: 5432,
+    user: process.env.DB_USER.trim(),
+    password: process.env.DB_PASS,
+    database: process.env.DB_NAME.trim(),
+  });
+
+  dotenv.config({ path: path.join(__dirname, '..', '..', 'Reports_Service', '.env') });
+  await listTables('Reports_Service/.env', {
+    host: (process.env.TYPEORM_HOST || '').trim(),
+    port: 5432,
+    user: (process.env.TYPEORM_USERNAME || '').trim(),
+    password: process.env.TYPEORM_PASSWORD,
+    database: (process.env.TYPEORM_DATABASE || '').trim(),
+  });
+}
+
+main().catch((err) => {
+  console.error(err.message);
+  process.exit(1);
+});

package/scripts/sync-sla-reports-sql.js

@@ -1,92 +1,92 @@
-/**
- * Applies SLA report views + stored procedures to PostgreSQL (idempotent CREATE OR REPLACE).
- *
- * Env from shared_models/.env only:
- *   DB_HOST / TYPEORM_HOST
- *   DB_PORT / TYPEORM_PORT
- *   DB_USER / TYPEORM_USERNAME
- *   DB_PASS / TYPEORM_PASSWORD
- *   DB_NAME / TYPEORM_DATABASE
- *
- * Usage:
- *   node scripts/sync-sla-reports-sql.js
- *   npm run sync:sla-sql   (from shared_models)
- */
-
-const fs = require('fs');
-const path = require('path');
-const { Client } = require('pg');
-
-function loadEnvFiles() {
-  const dotenv = require('dotenv');
-  const packageRoot = path.resolve(__dirname, '..');
-  const packageEnv = path.join(packageRoot, '.env');
-
-  if (!fs.existsSync(packageEnv)) {
-    throw new Error(`Missing env file: ${packageEnv}`);
-  }
-
-  dotenv.config({ path: packageEnv, override: true });
-}
-
-function getDbConfig() {
-  const host = (process.env.DB_HOST || process.env.TYPEORM_HOST || '').trim();
-  const port = parseInt(process.env.DB_PORT || process.env.TYPEORM_PORT || '5432', 10);
-  const user = (process.env.DB_USER || process.env.TYPEORM_USERNAME || '').trim();
-  const password = process.env.DB_PASS || process.env.TYPEORM_PASSWORD || '';
-  const database = (process.env.DB_NAME || process.env.TYPEORM_DATABASE || '').trim();
-
-  if (!host || !user || !database) {
-    throw new Error(
-      'Missing DB config. Set DB_HOST, DB_USER, DB_NAME (and DB_PASS) in shared_models/.env'
-    );
-  }
-
-  return { host, port, user, password, database };
-}
-
-async function main() {
-  const skipSync = process.argv.includes('--skip');
-  if (skipSync || process.env.SKIP_SLA_SQL_SYNC === 'true') {
-    console.log('[sync-sla-reports-sql] skipped (SKIP_SLA_SQL_SYNC or --skip)');
-    return;
-  }
-
-  loadEnvFiles();
-  const config = getDbConfig();
-  const sqlDir = path.join(__dirname, '..', 'sql');
-  const manifestPath = path.join(sqlDir, 'sla-reports-sync.manifest.json');
-
-  if (!fs.existsSync(manifestPath)) {
-    throw new Error(`Manifest not found: ${manifestPath}`);
-  }
-
-  const files = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
-  if (!Array.isArray(files) || files.length === 0) {
-    throw new Error('sla-reports-sync.manifest.json must be a non-empty array');
-  }
-
-  const client = new Client(config);
-  await client.connect();
-  console.log(`[sync-sla-reports-sql] connected to ${config.host}/${config.database}`);
-
-  try {
-    for (const file of files) {
-      const filePath = path.join(sqlDir, file);
-      if (!fs.existsSync(filePath)) {
-        throw new Error(`SQL file missing: ${filePath}`);
-      }
-      const sql = fs.readFileSync(filePath, 'utf8');
-      await client.query(sql);
-      console.log(`[sync-sla-reports-sql] applied ${file}`);
-    }
-    console.log('[sync-sla-reports-sql] done');
-  } finally {
-    await client.end();
-  }
-}
-
-main().catch((err) => {
-  console.error('[sync-sla-reports-sql] failed:', err.message);
-  process.exit(1);
-});
+/**
+ * Applies SLA report views + stored procedures to PostgreSQL (idempotent CREATE OR REPLACE).
+ *
+ * Env from shared_models/.env only:
+ *   DB_HOST / TYPEORM_HOST
+ *   DB_PORT / TYPEORM_PORT
+ *   DB_USER / TYPEORM_USERNAME
+ *   DB_PASS / TYPEORM_PASSWORD
+ *   DB_NAME / TYPEORM_DATABASE
+ *
+ * Usage:
+ *   node scripts/sync-sla-reports-sql.js
+ *   npm run sync:sla-sql   (from shared_models)
+ */
+
+const fs = require('fs');
+const path = require('path');
+const { Client } = require('pg');
+
+function loadEnvFiles() {
+  const dotenv = require('dotenv');
+  const packageRoot = path.resolve(__dirname, '..');
+  const packageEnv = path.join(packageRoot, '.env');
+
+  if (!fs.existsSync(packageEnv)) {
+    throw new Error(`Missing env file: ${packageEnv}`);
+  }
+
+  dotenv.config({ path: packageEnv, override: true });
+}
+
+function getDbConfig() {
+  const host = (process.env.DB_HOST || process.env.TYPEORM_HOST || '').trim();
+  const port = parseInt(process.env.DB_PORT || process.env.TYPEORM_PORT || '5432', 10);
+  const user = (process.env.DB_USER || process.env.TYPEORM_USERNAME || '').trim();
+  const password = process.env.DB_PASS || process.env.TYPEORM_PASSWORD || '';
+  const database = (process.env.DB_NAME || process.env.TYPEORM_DATABASE || '').trim();
+
+  if (!host || !user || !database) {
+    throw new Error(
+      'Missing DB config. Set DB_HOST, DB_USER, DB_NAME (and DB_PASS) in shared_models/.env'
+    );
+  }
+
+  return { host, port, user, password, database };
+}
+
+async function main() {
+  const skipSync = process.argv.includes('--skip');
+  if (skipSync || process.env.SKIP_SLA_SQL_SYNC === 'true') {
+    console.log('[sync-sla-reports-sql] skipped (SKIP_SLA_SQL_SYNC or --skip)');
+    return;
+  }
+
+  loadEnvFiles();
+  const config = getDbConfig();
+  const sqlDir = path.join(__dirname, '..', 'sql');
+  const manifestPath = path.join(sqlDir, 'sla-reports-sync.manifest.json');
+
+  if (!fs.existsSync(manifestPath)) {
+    throw new Error(`Manifest not found: ${manifestPath}`);
+  }
+
+  const files = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
+  if (!Array.isArray(files) || files.length === 0) {
+    throw new Error('sla-reports-sync.manifest.json must be a non-empty array');
+  }
+
+  const client = new Client(config);
+  await client.connect();
+  console.log(`[sync-sla-reports-sql] connected to ${config.host}/${config.database}`);
+
+  try {
+    for (const file of files) {
+      const filePath = path.join(sqlDir, file);
+      if (!fs.existsSync(filePath)) {
+        throw new Error(`SQL file missing: ${filePath}`);
+      }
+      const sql = fs.readFileSync(filePath, 'utf8');
+      await client.query(sql);
+      console.log(`[sync-sla-reports-sql] applied ${file}`);
+    }
+    console.log('[sync-sla-reports-sql] done');
+  } finally {
+    await client.end();
+  }
+}
+
+main().catch((err) => {
+  console.error('[sync-sla-reports-sql] failed:', err.message);
+  process.exit(1);
+});

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

@@ -1,9 +1,9 @@
-[
-  "sla_requests_status_to_varchar.sql",
-  "sla_requests_status_data_fix.sql",
-  "vw_sla_my_requests.sql",
-  "vw_sla_approvals.sql",
-  "sla_reports_procedures.sql",
-  "sla_reports_approvals_workbook.sql",
-  "sla_reports_admin_procedures.sql"
-]
+[
+  "sla_requests_status_to_varchar.sql",
+  "sla_requests_status_data_fix.sql",
+  "vw_sla_my_requests.sql",
+  "vw_sla_approvals.sql",
+  "sla_reports_procedures.sql",
+  "sla_reports_approvals_workbook.sql",
+  "sla_reports_admin_procedures.sql"
+]