@platform-modules/civil-aviation-authority 2.3.264 → 2.3.265

package/package.json

@@ -1,11 +1,12 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
- "version": "2.3.264",
+ "version": "2.3.265",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "scripts": {
   "build": "tsc",
-  "dev": "ts-node src/scripts.ts"
+  "dev": "ts-node src/scripts.ts",
+  "sync:sla-sql": "node scripts/sync-sla-reports-sql.js"
  },
  "publishConfig": {
   "access": "public"

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

@@ -0,0 +1,94 @@
+/**
+ * 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');
+
+  if (fs.existsSync(sharedEnv)) {
+    dotenv.config({ path: sharedEnv });
+  }
+  if (fs.existsSync(reportsEnv)) {
+    dotenv.config({ path: reportsEnv, 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/sql/README.md

@@ -0,0 +1,25 @@
+# SLA reports — database objects
+
+Applied in order by `npm run sync:sla-sql` (see `sla-reports-sync.manifest.json`).
+
+| File | Description |
+|------|-------------|
+| `vw_sla_my_requests.sql` | My-requests view |
+| `vw_sla_approvals.sql` | Approvals view |
+| `sla_reports_procedures.sql` | User SLA report functions + Excel helpers |
+| `sla_reports_approvals_workbook.sql` | Approvals Excel workbook (Requests + Approvals per sub-service) |
+| `sla_reports_admin_procedures.sql` | Admin SLA report functions (requires procedures file) |
+
+From **shared_models**:
+
+```bash
+npm run sync:sla-sql
+```
+
+From **Reports_Service** (uses `Reports_Service/.env`, then `shared_models/.env`):
+
+```bash
+npm run sync:sla-sql
+```
+
+`npm run dev` in Reports_Service runs sync automatically before nodemon.

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

@@ -0,0 +1,7 @@
+[
+  "vw_sla_my_requests.sql",
+  "vw_sla_approvals.sql",
+  "sla_reports_procedures.sql",
+  "sla_reports_approvals_workbook.sql",
+  "sla_reports_admin_procedures.sql"
+]

package/sql/sla_reports_admin_procedures.sql

@@ -0,0 +1,283 @@
+-- Admin SLA reports + approvals Excel export
+-- Prerequisites: sla_reports_procedures.sql, vw_sla_my_requests.sql, vw_sla_approvals.sql
+-- Applied via: npm run sync:sla-sql (after sla_reports_procedures.sql in manifest)
+
+CREATE OR REPLACE FUNCTION sla_filtered_request_fields(p_request_obj JSONB)
+RETURNS JSONB
+LANGUAGE sql
+IMMUTABLE
+AS $$
+  SELECT
+    COALESCE(p_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';
+$$;
+
+-- Admin list views: served by Reports_Service TypeORM (sla-my-requests-view.query.ts, sla-approvals-view.query.ts)
+
+-- ---------------------------------------------------------------------------
+-- ADMIN — my requests Excel (optional p_target_user_id)
+-- Per sub-service Requests + Approvals sheets (same as user my-requests download)
+-- ---------------------------------------------------------------------------
+CREATE OR REPLACE FUNCTION sp_sla_admin_my_requests_excel_export(
+  p_target_user_id    INT      DEFAULT NULL,
+  p_service_ids       INT[]    DEFAULT NULL,
+  p_sub_service_ids   INT[]    DEFAULT NULL,
+  p_statuses          TEXT[]   DEFAULT ARRAY['Pending','In Progress','Approved','Rejected'],
+  p_from_date         DATE     DEFAULT NULL,
+  p_to_date           DATE     DEFAULT NULL,
+  p_search_text       TEXT     DEFAULT NULL,
+  p_sort_by           TEXT     DEFAULT 'created_at',
+  p_sort_order        TEXT     DEFAULT 'DESC'
+)
+RETURNS TABLE (
+  sheet_order         INT,
+  sub_service_id      INT,
+  sub_service_name    TEXT,
+  sheet_name          TEXT,
+  headers             JSONB,
+  rows                JSONB
+)
+LANGUAGE plpgsql
+STABLE
+AS $$
+DECLARE
+  v_sort_col          TEXT;
+  v_sort_dir          TEXT;
+  v_sub               RECORD;
+  v_row               RECORD;
+  v_dyn_keys          TEXT[];
+  v_dyn_labels        TEXT[];
+  v_common_labels     TEXT[] := ARRAY[
+    'SLA Request ID', 'Request ID', 'User', 'Status', 'Created At',
+    'Created By', 'Department', 'Section'
+  ];
+  v_headers_labels    TEXT[];
+  v_headers_json      JSONB;
+  v_cells             TEXT[];
+  v_all_rows          JSONB;
+  v_k                 TEXT;
+  v_sheet_order       INT := 0;
+  v_user_filter       TEXT;
+BEGIN
+  v_user_filter := CASE WHEN p_target_user_id IS NULL THEN 'TRUE' ELSE format('v.user_id = %s', p_target_user_id) END;
+
+  v_sort_col := CASE lower(trim(p_sort_by))
+    WHEN 'updated_at'  THEN 'v.created_at'
+    WHEN 'id'          THEN 'v.sla_request_id'
+    WHEN 'status'       THEN 'v.status'
+    WHEN 'request_id'   THEN 'v.request_id'
+    ELSE 'v.created_at'
+  END;
+  v_sort_dir := CASE WHEN upper(trim(p_sort_order)) = 'ASC' THEN 'ASC' ELSE 'DESC' END;
+
+  FOR v_sub IN
+    EXECUTE format($q$
+      SELECT DISTINCT
+        COALESCE(sr.sub_service_id, 0) AS sub_service_id_num,
+        COALESCE(NULLIF(trim(subsvc.sub_service_name), ''), NULLIF(trim(v.sub_service_name), ''), 'Uncategorized') AS sub_service_name
+      FROM vw_sla_my_requests v
+      INNER JOIN sla_requests sr ON sr.id = v.sla_request_id AND COALESCE(sr.is_deleted, false) = false
+      LEFT JOIN caa_sub_services subsvc ON subsvc.id = sr.sub_service_id
+      WHERE %s
+        AND v.status = ANY($1)
+        AND ($2 IS NULL OR cardinality($2) = 0 OR sr.service_id = ANY($2))
+        AND ($3 IS NULL OR cardinality($3) = 0 OR sr.sub_service_id = ANY($3))
+        AND ($4 IS NULL OR v.created_at::date >= $4)
+        AND ($5 IS NULL OR v.created_at::date <= $5)
+        AND ($6 IS NULL OR trim($6) = '' OR CAST(v.request_id AS TEXT) ILIKE '%%' || trim($6) || '%%')
+      ORDER BY sub_service_name ASC
+    $q$, v_user_filter)
+    USING p_statuses, p_service_ids, p_sub_service_ids, p_from_date, p_to_date, p_search_text
+  LOOP
+    v_sheet_order := v_sheet_order + 1;
+
+    EXECUTE format($q$
+      SELECT COALESCE(array_agg(DISTINCT keys.k ORDER BY keys.k), ARRAY[]::TEXT[])
+      FROM vw_sla_my_requests v
+      INNER JOIN sla_requests sr ON sr.id = v.sla_request_id AND COALESCE(sr.is_deleted, false) = false
+      CROSS JOIN LATERAL jsonb_object_keys(COALESCE(v.request_fields, '{}'::jsonb)) AS keys(k)
+      WHERE %s
+        AND v.status = ANY($1)
+        AND ($2 IS NULL OR cardinality($2) = 0 OR sr.service_id = ANY($2))
+        AND ($3 IS NULL OR cardinality($3) = 0 OR sr.sub_service_id = ANY($3))
+        AND ($4 IS NULL OR v.created_at::date >= $4)
+        AND ($5 IS NULL OR v.created_at::date <= $5)
+        AND ($6 IS NULL OR trim($6) = '' OR CAST(v.request_id AS TEXT) ILIKE '%%' || trim($6) || '%%')
+        AND COALESCE(sr.sub_service_id, 0) = %s
+    $q$, v_user_filter, v_sub.sub_service_id_num)
+    INTO v_dyn_keys
+    USING p_statuses, p_service_ids, p_sub_service_ids, p_from_date, p_to_date, p_search_text;
+
+    v_dyn_labels := ARRAY[]::TEXT[];
+    IF v_dyn_keys IS NOT NULL THEN
+      FOREACH v_k IN ARRAY v_dyn_keys LOOP
+        v_dyn_labels := array_append(v_dyn_labels, sla_excel_header_label(v_k));
+      END LOOP;
+    END IF;
+
+    v_headers_labels := ARRAY(
+      SELECT sla_excel_header_label(lbl)
+      FROM unnest(v_common_labels || COALESCE(v_dyn_labels, ARRAY[]::TEXT[])) AS u(lbl)
+    );
+    v_headers_json := to_jsonb(v_headers_labels);
+    v_all_rows := '[]'::jsonb;
+
+    FOR v_row IN
+      EXECUTE format($q$
+        SELECT
+          v.sla_request_id, v.request_id, v.status, v.created_at, v.created_by,
+          v.req_user_department_id, v.req_user_section_id, v.request_fields,
+          TRIM(COALESCE(u.employee_name, '')) AS user_name
+        FROM vw_sla_my_requests v
+        INNER JOIN sla_requests sr ON sr.id = v.sla_request_id AND COALESCE(sr.is_deleted, false) = false
+        LEFT JOIN users u ON u.id = v.user_id AND COALESCE(u.is_deleted, false) = false
+        WHERE %s
+          AND v.status = ANY($1)
+          AND ($2 IS NULL OR cardinality($2) = 0 OR sr.service_id = ANY($2))
+          AND ($3 IS NULL OR cardinality($3) = 0 OR sr.sub_service_id = ANY($3))
+          AND ($4 IS NULL OR v.created_at::date >= $4)
+          AND ($5 IS NULL OR v.created_at::date <= $5)
+          AND ($6 IS NULL OR trim($6) = '' OR CAST(v.request_id AS TEXT) ILIKE '%%' || trim($6) || '%%')
+          AND COALESCE(sr.sub_service_id, 0) = %s
+        ORDER BY %s %s, v.sla_request_id ASC
+      $q$, v_user_filter, v_sub.sub_service_id_num, v_sort_col, v_sort_dir)
+      USING p_statuses, p_service_ids, p_sub_service_ids, p_from_date, p_to_date, p_search_text
+    LOOP
+      v_cells := ARRAY[
+        COALESCE(v_row.sla_request_id::TEXT, ''),
+        COALESCE(v_row.request_id::TEXT, ''),
+        COALESCE(v_row.user_name, ''),
+        COALESCE(v_row.status, ''),
+        COALESCE(to_char(v_row.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS'), ''),
+        COALESCE(v_row.created_by, ''),
+        COALESCE(v_row.req_user_department_id, ''),
+        COALESCE(v_row.req_user_section_id, '')
+      ];
+      IF v_dyn_keys IS NOT NULL THEN
+        FOREACH v_k IN ARRAY v_dyn_keys LOOP
+          v_cells := array_append(v_cells, COALESCE(sla_request_field_cell(v_row.request_fields, v_k), ''));
+        END LOOP;
+      END IF;
+      v_all_rows := v_all_rows || jsonb_build_array(to_jsonb(v_cells));
+    END LOOP;
+
+    sheet_order := v_sheet_order;
+    sub_service_id := NULLIF(v_sub.sub_service_id_num, 0);
+    sub_service_name := v_sub.sub_service_name;
+    sheet_name := sla_excel_sheet_name(v_sub.sub_service_name);
+    headers := v_headers_json;
+    rows := v_all_rows;
+    RETURN NEXT;
+  END LOOP;
+
+  RETURN QUERY
+  SELECT *
+  FROM sla_my_requests_approvals_excel_sheet(
+    v_user_filter,
+    p_statuses,
+    p_service_ids,
+    p_sub_service_ids,
+    p_from_date,
+    p_to_date,
+    p_search_text,
+    v_sheet_order + 1
+  );
+
+  RETURN;
+END;
+$$;
+
+-- ---------------------------------------------------------------------------
+-- APPROVALS — Excel export (approver-scoped; user download)
+-- Workbook: per sub-service Requests + Approvals (see sla_reports_approvals_workbook.sql)
+-- ---------------------------------------------------------------------------
+DROP FUNCTION IF EXISTS sp_sla_approvals_excel_export_internal(
+  TEXT, BOOLEAN, INT, INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT
+);
+
+CREATE OR REPLACE FUNCTION sp_sla_approvals_excel_export(
+  p_approver_user_id    INT,
+  p_service_ids         INT[]    DEFAULT NULL,
+  p_sub_service_ids     INT[]    DEFAULT NULL,
+  p_request_statuses    TEXT[]   DEFAULT ARRAY['Pending','In Progress','Approved','Rejected'],
+  p_approval_statuses   TEXT[]   DEFAULT ARRAY['In Progress','Approved','Rejected'],
+  p_from_date           DATE     DEFAULT NULL,
+  p_to_date             DATE     DEFAULT NULL,
+  p_search_text         TEXT     DEFAULT NULL,
+  p_sort_by             TEXT     DEFAULT 'created_at',
+  p_sort_order          TEXT     DEFAULT 'DESC'
+)
+RETURNS TABLE (
+  sheet_order INT, sub_service_id INT, sub_service_name TEXT, sheet_name TEXT, headers JSONB, rows JSONB
+)
+LANGUAGE plpgsql
+STABLE
+AS $$
+DECLARE
+  v_exists TEXT := sla_approval_queue_exists_sql(p_approver_user_id);
+  v_own    TEXT := format('sr.user_id != %s', p_approver_user_id);
+BEGIN
+  RETURN QUERY
+  SELECT * FROM sp_sla_approvals_workbook_excel_export(
+    v_exists,
+    v_own,
+    p_service_ids,
+    p_sub_service_ids,
+    p_request_statuses,
+    p_approval_statuses,
+    p_from_date,
+    p_to_date,
+    p_search_text,
+    p_sort_by,
+    p_sort_order
+  );
+END;
+$$;
+
+-- ---------------------------------------------------------------------------
+-- ADMIN — approvals Excel
+-- Per sub-service Requests + Approvals; optional approver_user_id (NULL = all queues)
+-- Does not exclude own requests (unlike user approvals download)
+-- ---------------------------------------------------------------------------
+CREATE OR REPLACE FUNCTION sp_sla_admin_approvals_excel_export(
+  p_target_approver_user_id INT      DEFAULT NULL,
+  p_service_ids             INT[]    DEFAULT NULL,
+  p_sub_service_ids         INT[]    DEFAULT NULL,
+  p_request_statuses        TEXT[]   DEFAULT ARRAY['Pending','In Progress','Approved','Rejected'],
+  p_approval_statuses       TEXT[]   DEFAULT ARRAY['In Progress','Approved','Rejected'],
+  p_from_date               DATE     DEFAULT NULL,
+  p_to_date                 DATE     DEFAULT NULL,
+  p_search_text             TEXT     DEFAULT NULL,
+  p_sort_by                 TEXT     DEFAULT 'created_at',
+  p_sort_order              TEXT     DEFAULT 'DESC'
+)
+RETURNS TABLE (
+  sheet_order INT, sub_service_id INT, sub_service_name TEXT, sheet_name TEXT, headers JSONB, rows JSONB
+)
+LANGUAGE plpgsql
+STABLE
+AS $$
+DECLARE
+  v_exists TEXT := sla_approval_queue_exists_sql_optional(p_target_approver_user_id);
+  v_own    TEXT := 'TRUE';
+BEGIN
+  RETURN QUERY
+  SELECT * FROM sp_sla_approvals_workbook_excel_export(
+    v_exists,
+    v_own,
+    p_service_ids,
+    p_sub_service_ids,
+    p_request_statuses,
+    p_approval_statuses,
+    p_from_date,
+    p_to_date,
+    p_search_text,
+    p_sort_by,
+    p_sort_order
+  );
+END;
+$$;