@platform-modules/foreign-ministry 1.3.351 → 1.3.355

package/sql/sla_requests_status_to_varchar.sql

@@ -1,28 +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 $$;
-
-
+-- 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/sql/vw_sla_approvals.sql

@@ -1,115 +1,115 @@
--- SLA approvals read model: joined display names for approval routing.
-
--- Approver-scope filtering is applied in Reports_Service (TypeORM), not in this view.
-
--- Run once against the EmpPortal PostgreSQL database:
-
---   psql -U <user> -d <database> -f sql/vw_sla_approvals.sql
-
-
-
-DROP VIEW IF EXISTS vw_sla_approvals CASCADE;
-
-
-
-CREATE VIEW vw_sla_approvals AS
-
-SELECT
-
-    sa.id AS sla_approval_id,
-
-    sa.source_approval_id,
-
-    sa.request_id,
-
-    sa.service_id AS service_id,
-
-    sa.sub_service_id AS sub_service_id,
-
-    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
-
-    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
-
-    sa.approver_role_id AS approval_role_id,
-
-    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
-
-    sa.department_id AS approval_department_id,
-
-    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
-
-    sa.section_id AS approval_section_id,
-
-    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
-
-    sa.approval_status::TEXT AS approval_status,
-
-    sr.status::TEXT AS request_status,
-
-    sa.level AS level,
-
-    sa.approver_user_id AS approver_user_id,
-
-    TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
-
-    sa.delegate_user_id AS delegate_user_id,
-
-    TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
-
-    sa.approved_by AS approved_by,
-
-    TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
-
-    sa.comment::TEXT AS comment,
-
-    sa.created_at AS created_at,
-
-    sa.updated_at AS updated_at
-
-FROM sla_approval sa
-
-INNER JOIN sla_requests sr
-
-    ON sr.id = (
-        SELECT MIN(sr2.id)
-        FROM sla_requests sr2
-        WHERE sr2.request_id = sa.request_id
-          AND COALESCE(sr2.is_deleted, false) = false
-          AND (sa.service_id IS NULL OR sr2.service_id = sa.service_id)
-          AND (sa.sub_service_id IS NULL OR sr2.sub_service_id = sa.sub_service_id)
-    )
-
-LEFT JOIN fm_services svc
-
-    ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
-
-LEFT JOIN fm_sub_services subsvc
-
-    ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
-
-LEFT JOIN departments adpt
-
-    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
-
-LEFT JOIN sections asec
-
-    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
-
-LEFT JOIN role ar
-
-    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
-
-LEFT JOIN users au
-
-    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
-
-LEFT JOIN users du
-
-    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
-
-LEFT JOIN users ab
-
-    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
-
-WHERE COALESCE(sa.is_deleted, false) = false;
-
+-- SLA approvals read model: joined display names for approval routing.
+
+-- Approver-scope filtering is applied in Reports_Service (TypeORM), not in this view.
+
+-- Run once against the EmpPortal PostgreSQL database:
+
+--   psql -U <user> -d <database> -f sql/vw_sla_approvals.sql
+
+
+
+DROP VIEW IF EXISTS vw_sla_approvals CASCADE;
+
+
+
+CREATE VIEW vw_sla_approvals AS
+
+SELECT
+
+    sa.id AS sla_approval_id,
+
+    sa.source_approval_id,
+
+    sa.request_id,
+
+    sa.service_id AS service_id,
+
+    sa.sub_service_id AS sub_service_id,
+
+    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
+
+    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
+
+    sa.approver_role_id AS approval_role_id,
+
+    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
+
+    sa.department_id AS approval_department_id,
+
+    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
+
+    sa.section_id AS approval_section_id,
+
+    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
+
+    sa.approval_status::TEXT AS approval_status,
+
+    sr.status::TEXT AS request_status,
+
+    sa.level AS level,
+
+    sa.approver_user_id AS approver_user_id,
+
+    TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
+
+    sa.delegate_user_id AS delegate_user_id,
+
+    TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
+
+    sa.approved_by AS approved_by,
+
+    TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
+
+    sa.comment::TEXT AS comment,
+
+    sa.created_at AS created_at,
+
+    sa.updated_at AS updated_at
+
+FROM sla_approval sa
+
+INNER JOIN sla_requests sr
+
+    ON sr.id = (
+        SELECT MIN(sr2.id)
+        FROM sla_requests sr2
+        WHERE sr2.request_id = sa.request_id
+          AND COALESCE(sr2.is_deleted, false) = false
+          AND (sa.service_id IS NULL OR sr2.service_id = sa.service_id)
+          AND (sa.sub_service_id IS NULL OR sr2.sub_service_id = sa.sub_service_id)
+    )
+
+LEFT JOIN fm_services svc
+
+    ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
+
+LEFT JOIN fm_sub_services subsvc
+
+    ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
+
+LEFT JOIN departments adpt
+
+    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
+
+LEFT JOIN sections asec
+
+    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
+
+LEFT JOIN role ar
+
+    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
+
+LEFT JOIN users au
+
+    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
+
+LEFT JOIN users du
+
+    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
+
+LEFT JOIN users ab
+
+    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
+
+WHERE COALESCE(sa.is_deleted, false) = false;
+

package/sql/vw_sla_my_requests.sql

@@ -1,55 +1,60 @@
--- SLA "my requests" read model: joined display names + filtered request_obj payload.
--- Applied via: npm run sync:sla-sql (shared_models)
-
-CREATE OR REPLACE VIEW vw_sla_my_requests AS
-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;
+-- SLA "my requests" read model: joined display names + filtered request_obj payload.
+-- Applied via: npm run sync:sla-sql (shared_models)
+
+CREATE OR REPLACE VIEW vw_sla_my_requests AS
+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;

package/src/helpers/evaluation-eligibility.utils.ts

@@ -1,126 +1,126 @@
-/**
- * Evaluation exception cycle dates are stored as MM-DD strings (e.g. 01-01, 05-31, 04-12).
- */
-
-export type MmDdInterval = { start: number; end: number };
-
-/** Validate and normalize MM-DD (e.g. 1-1 → 01-01). */
-export function parseMonthDay(value: unknown): string | null {
-  if (value == null || value === '') return null;
-  const s = String(value).trim();
-  const m = /^(\d{1,2})-(\d{1,2})$/.exec(s);
-  if (!m) return null;
-  const month = parseInt(m[1], 10);
-  const day = parseInt(m[2], 10);
-  if (month < 1 || month > 12 || day < 1 || day > 31) return null;
-  return `${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
-}
-
-function parseMmDdParts(mmDd: string): { month: number; day: number } | null {
-  const normalized = parseMonthDay(mmDd);
-  if (!normalized) return null;
-  const [month, day] = normalized.split('-').map(Number);
-  return { month, day };
-}
-
-/** Sortable key for MM-DD overlap checks (month * 100 + day). */
-export function mmDdSortKey(mmDd: string): number {
-  const parts = parseMmDdParts(mmDd);
-  if (!parts) return 0;
-  return parts.month * 100 + parts.day;
-}
-
-function expandMmDdWindow(startMmDd: string, endMmDd: string): MmDdInterval[] {
-  const start = mmDdSortKey(startMmDd);
-  const end = mmDdSortKey(endMmDd);
-  if (start <= end) return [{ start, end }];
-  return [
-    { start, end: 1231 },
-    { start: 101, end },
-  ];
-}
-
-function linearIntervalsOverlap(a: MmDdInterval, b: MmDdInterval): boolean {
-  return a.start <= b.end && b.start <= a.end;
-}
-
-/** True when two MM-DD windows share any calendar period. */
-export function mmDdWindowsOverlap(
-  startA: string,
-  endA: string,
-  startB: string,
-  endB: string
-): boolean {
-  const intervalsA = expandMmDdWindow(startA, endA);
-  const intervalsB = expandMmDdWindow(startB, endB);
-  for (const ia of intervalsA) {
-    for (const ib of intervalsB) {
-      if (linearIntervalsOverlap(ia, ib)) return true;
-    }
-  }
-  return false;
-}
-
-/** Whether calendar month (1–12) falls within the inclusive MM-DD window. */
-export function isCalendarMonthInEligibilityRange(
-  fromMmDd: string,
-  toMmDd: string,
-  calendarMonth: number
-): boolean {
-  const from = parseMmDdParts(fromMmDd);
-  const to = parseMmDdParts(toMmDd);
-  if (!from || !to || calendarMonth < 1 || calendarMonth > 12) return false;
-  const fm = from.month;
-  const tm = to.month;
-  if (fm <= tm) return calendarMonth >= fm && calendarMonth <= tm;
-  return calendarMonth >= fm || calendarMonth <= tm;
-}
-
-/**
- * Whether HOD submissions are still open for the active cycle on the reference date.
- * Uses the day component of `evaluationEndMmDd` as the last submission day of each month in range.
- */
-export function isEvaluationEligibilityWindowOpen(
-  fromMmDd: string,
-  toMmDd: string,
-  evaluationEndMmDd: string,
-  referenceDate: Date = new Date()
-): boolean {
-  const month = referenceDate.getMonth() + 1;
-  const day = referenceDate.getDate();
-  if (!isCalendarMonthInEligibilityRange(fromMmDd, toMmDd, month)) return false;
-  const endParts = parseMmDdParts(evaluationEndMmDd);
-  if (!endParts) return false;
-  return day <= endParts.day;
-}
-
-export function parseEligibilityDateRange(
-  fromInput: unknown,
-  toInput: unknown
-): { from_month: string; to_month: string } | null {
-  const from_month = parseMonthDay(fromInput);
-  const to_month = parseMonthDay(toInput);
-  if (!from_month || !to_month) return null;
-  return { from_month, to_month };
-}
-
-/** @deprecated Use parseMonthDay for MM-DD strings. */
-export function parseEvaluationEndDay(input: unknown): number | null {
-  const mmDd = parseMonthDay(input);
-  if (!mmDd) return null;
-  const parts = parseMmDdParts(mmDd);
-  return parts?.day ?? null;
-}
-
-/** @deprecated Use parseEligibilityDateRange for MM-DD strings. */
-export function parseMonthRange(
-  fromInput: unknown,
-  toInput: unknown
-): { from_month: number; to_month: number } | null {
-  const range = parseEligibilityDateRange(fromInput, toInput);
-  if (!range) return null;
-  const from = parseMmDdParts(range.from_month);
-  const to = parseMmDdParts(range.to_month);
-  if (!from || !to) return null;
-  return { from_month: from.month, to_month: to.month };
-}
+/**
+ * Evaluation exception cycle dates are stored as MM-DD strings (e.g. 01-01, 05-31, 04-12).
+ */
+
+export type MmDdInterval = { start: number; end: number };
+
+/** Validate and normalize MM-DD (e.g. 1-1 → 01-01). */
+export function parseMonthDay(value: unknown): string | null {
+  if (value == null || value === '') return null;
+  const s = String(value).trim();
+  const m = /^(\d{1,2})-(\d{1,2})$/.exec(s);
+  if (!m) return null;
+  const month = parseInt(m[1], 10);
+  const day = parseInt(m[2], 10);
+  if (month < 1 || month > 12 || day < 1 || day > 31) return null;
+  return `${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
+}
+
+function parseMmDdParts(mmDd: string): { month: number; day: number } | null {
+  const normalized = parseMonthDay(mmDd);
+  if (!normalized) return null;
+  const [month, day] = normalized.split('-').map(Number);
+  return { month, day };
+}
+
+/** Sortable key for MM-DD overlap checks (month * 100 + day). */
+export function mmDdSortKey(mmDd: string): number {
+  const parts = parseMmDdParts(mmDd);
+  if (!parts) return 0;
+  return parts.month * 100 + parts.day;
+}
+
+function expandMmDdWindow(startMmDd: string, endMmDd: string): MmDdInterval[] {
+  const start = mmDdSortKey(startMmDd);
+  const end = mmDdSortKey(endMmDd);
+  if (start <= end) return [{ start, end }];
+  return [
+    { start, end: 1231 },
+    { start: 101, end },
+  ];
+}
+
+function linearIntervalsOverlap(a: MmDdInterval, b: MmDdInterval): boolean {
+  return a.start <= b.end && b.start <= a.end;
+}
+
+/** True when two MM-DD windows share any calendar period. */
+export function mmDdWindowsOverlap(
+  startA: string,
+  endA: string,
+  startB: string,
+  endB: string
+): boolean {
+  const intervalsA = expandMmDdWindow(startA, endA);
+  const intervalsB = expandMmDdWindow(startB, endB);
+  for (const ia of intervalsA) {
+    for (const ib of intervalsB) {
+      if (linearIntervalsOverlap(ia, ib)) return true;
+    }
+  }
+  return false;
+}
+
+/** Whether calendar month (1–12) falls within the inclusive MM-DD window. */
+export function isCalendarMonthInEligibilityRange(
+  fromMmDd: string,
+  toMmDd: string,
+  calendarMonth: number
+): boolean {
+  const from = parseMmDdParts(fromMmDd);
+  const to = parseMmDdParts(toMmDd);
+  if (!from || !to || calendarMonth < 1 || calendarMonth > 12) return false;
+  const fm = from.month;
+  const tm = to.month;
+  if (fm <= tm) return calendarMonth >= fm && calendarMonth <= tm;
+  return calendarMonth >= fm || calendarMonth <= tm;
+}
+
+/**
+ * Whether HOD submissions are still open for the active cycle on the reference date.
+ * Uses the day component of `evaluationEndMmDd` as the last submission day of each month in range.
+ */
+export function isEvaluationEligibilityWindowOpen(
+  fromMmDd: string,
+  toMmDd: string,
+  evaluationEndMmDd: string,
+  referenceDate: Date = new Date()
+): boolean {
+  const month = referenceDate.getMonth() + 1;
+  const day = referenceDate.getDate();
+  if (!isCalendarMonthInEligibilityRange(fromMmDd, toMmDd, month)) return false;
+  const endParts = parseMmDdParts(evaluationEndMmDd);
+  if (!endParts) return false;
+  return day <= endParts.day;
+}
+
+export function parseEligibilityDateRange(
+  fromInput: unknown,
+  toInput: unknown
+): { from_month: string; to_month: string } | null {
+  const from_month = parseMonthDay(fromInput);
+  const to_month = parseMonthDay(toInput);
+  if (!from_month || !to_month) return null;
+  return { from_month, to_month };
+}
+
+/** @deprecated Use parseMonthDay for MM-DD strings. */
+export function parseEvaluationEndDay(input: unknown): number | null {
+  const mmDd = parseMonthDay(input);
+  if (!mmDd) return null;
+  const parts = parseMmDdParts(mmDd);
+  return parts?.day ?? null;
+}
+
+/** @deprecated Use parseEligibilityDateRange for MM-DD strings. */
+export function parseMonthRange(
+  fromInput: unknown,
+  toInput: unknown
+): { from_month: number; to_month: number } | null {
+  const range = parseEligibilityDateRange(fromInput, toInput);
+  if (!range) return null;
+  const from = parseMmDdParts(range.from_month);
+  const to = parseMmDdParts(range.to_month);
+  if (!from || !to) return null;
+  return { from_month: from.month, to_month: to.month };
+}