@platform-modules/foreign-ministry 1.3.322 → 1.3.326

package/package.json

@@ -1,8 +1,18 @@
 {
  "name": "@platform-modules/foreign-ministry",
- "version": "1.3.322",
+ "version": "1.3.326",
  "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",

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,95 +1,95 @@
-/**
- * Applies SLA report views + stored procedures to PostgreSQL (idempotent CREATE OR REPLACE).
- *
- * Env (shared_models/.env or Reports_Service/.env):
- *   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 sharedRoot = path.resolve(__dirname, '..');
-  const reportsEnv = path.resolve(sharedRoot, '..', 'Reports_Service', '.env');
-  const sharedEnv = path.join(sharedRoot, '.env');
-
-  // Reports_Service defaults first; shared_models/.env wins (FM DB for sync:sla-sql).
-  if (fs.existsSync(reportsEnv)) {
-    dotenv.config({ path: reportsEnv });
-  }
-  if (fs.existsSync(sharedEnv)) {
-    dotenv.config({ path: sharedEnv, override: true });
-  }
-}
-
-function getDbConfig() {
-  const host = (process.env.TYPEORM_HOST || process.env.DB_HOST || '').trim();
-  const port = parseInt(process.env.TYPEORM_PORT || process.env.DB_PORT || '5432', 10);
-  const user = (process.env.TYPEORM_USERNAME || process.env.DB_USER || '').trim();
-  const password = process.env.TYPEORM_PASSWORD || process.env.DB_PASS || '';
-  const database = (process.env.TYPEORM_DATABASE || process.env.DB_NAME || '').trim();
-
-  if (!host || !user || !database) {
-    throw new Error(
-      'Missing DB config. Set TYPEORM_* in Reports_Service/.env or DB_* 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 (shared_models/.env or Reports_Service/.env):
+ *   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 sharedRoot = path.resolve(__dirname, '..');
+  const reportsEnv = path.resolve(sharedRoot, '..', 'Reports_Service', '.env');
+  const sharedEnv = path.join(sharedRoot, '.env');
+
+  // Reports_Service defaults first; shared_models/.env wins (FM DB for sync:sla-sql).
+  if (fs.existsSync(reportsEnv)) {
+    dotenv.config({ path: reportsEnv });
+  }
+  if (fs.existsSync(sharedEnv)) {
+    dotenv.config({ path: sharedEnv, override: true });
+  }
+}
+
+function getDbConfig() {
+  const host = (process.env.TYPEORM_HOST || process.env.DB_HOST || '').trim();
+  const port = parseInt(process.env.TYPEORM_PORT || process.env.DB_PORT || '5432', 10);
+  const user = (process.env.TYPEORM_USERNAME || process.env.DB_USER || '').trim();
+  const password = process.env.TYPEORM_PASSWORD || process.env.DB_PASS || '';
+  const database = (process.env.TYPEORM_DATABASE || process.env.DB_NAME || '').trim();
+
+  if (!host || !user || !database) {
+    throw new Error(
+      'Missing DB config. Set TYPEORM_* in Reports_Service/.env or DB_* 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/src/data-source.ts

@@ -343,8 +343,6 @@ import { EmbassyEvaluationRequestAttachment } from './models/EmbassyEvaluationAt
 import { SlaRequest } from './models/SlaRequestModel';
 import { ServiceSlaApproval } from './models/ServiceSlaApprovalModel';
 import { SlaConfig } from './models/SlaConfigModel';
-import { SlaMyRequestsView } from './models/SlaMyRequestsViewModel';
-import { SlaApprovalsView } from './models/SlaApprovalsViewModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -684,7 +682,5 @@ export const AppDataSource = new DataSource({
     SlaRequest,
     ServiceSlaApproval,
     SlaConfig,
-    SlaMyRequestsView,
-    SlaApprovalsView,
   ],
 });

package/src/helpers/admin-auth.helper.ts

@@ -0,0 +1,46 @@
+import type { DataSource } from 'typeorm';
+import { Role } from '../models/role';
+import { UserRole } from '../models/userRolesModel';
+
+/** Parse authenticated user id from Fastify `request.meta`. */
+export function parsePortalUserIdFromRequest(request: {
+  meta?: { userId?: string | number };
+}): number | null {
+  const raw = request.meta?.userId;
+  if (raw == null || raw === '') return null;
+  const n = Number(raw);
+  return Number.isFinite(n) && n > 0 ? n : null;
+}
+
+/**
+ * True when the user has an active Admin role in `user_role` (role.name = admin, case-insensitive).
+ * Same check as Reports_Service `isReportsAdmin`.
+ */
+export async function userHasPortalAdminRole(
+  dataSource: DataSource,
+  userId: number
+): Promise<boolean> {
+  if (!dataSource?.isInitialized || !Number.isFinite(userId) || userId <= 0) {
+    return false;
+  }
+
+  return dataSource
+    .getRepository(UserRole)
+    .createQueryBuilder('ur')
+    .innerJoin(Role, 'role', 'role.id = ur.role_id AND COALESCE(role.is_deleted, false) = false')
+    .where('ur.user_id = :userId', { userId })
+    .andWhere('ur.is_deleted = false')
+    .andWhere('ur.is_active = true')
+    .andWhere('LOWER(role.name) = :adminRole', { adminRole: 'admin' })
+    .getExists();
+}
+
+/** Convenience: resolve user id from request and check admin role. */
+export async function isPortalAdminFromRequest(
+  dataSource: DataSource,
+  request: { meta?: { userId?: string | number } }
+): Promise<boolean> {
+  const userId = parsePortalUserIdFromRequest(request);
+  if (!userId) return false;
+  return userHasPortalAdminRole(dataSource, userId);
+}