@platform-modules/foreign-ministry 1.3.333 → 1.3.334

package/src/helpers/employee-evaluation-request.utils.ts

@@ -1,178 +1,178 @@
-import type { EntityManager } from 'typeorm';
-import { EmployeeEvaluationAnswers } from '../models/EmployeeEvaluationAnswerModel';
-import { EmployeeEvaluationPersonScore } from '../models/EmployeeEvaluationPersonScoreModel';
-import { EmployeeEvaluationRequests } from '../models/EmployeeEvaluationRequestModel';
-import { EvaluationEligibilitySetting } from '../models/EvaluationEligibilitySettingModel';
-import { EvaluationFormQuestion } from '../models/EvaluationFormQuestionModel';
-import { isCalendarMonthInEligibilityRange } from './evaluation-eligibility.utils';
-
-export const DEFAULT_MAX_EMPLOYEES_PER_REQUEST = 50;
-
-export type EmployeeEvaluationSubmitAnswer = {
-  section_id: number;
-  question_id: number;
-  score: number;
-  remarks?: string | null;
-};
-
-export type EmployeeEvaluationSubmitEmployee = {
-  user_id: number;
-  is_rca?: boolean;
-  answers: EmployeeEvaluationSubmitAnswer[];
-};
-
-export type NormalizedEmployeeSubmission = EmployeeEvaluationSubmitEmployee;
-
-export function normalizeEmployeeSubmissions(raw: unknown): {
-  employees: NormalizedEmployeeSubmission[];
-  error?: string;
-} {
-  if (!Array.isArray(raw) || raw.length === 0) {
-    return { employees: [], error: 'employees must be a non-empty array' };
-  }
-  const seen = new Set<number>();
-  const employees: NormalizedEmployeeSubmission[] = [];
-  for (const item of raw) {
-    if (item == null || typeof item !== 'object') {
-      return { employees: [], error: 'Each employee entry must be an object' };
-    }
-    const o = item as Record<string, unknown>;
-    const user_id = Number(o.user_id ?? o.employee_id);
-    if (!Number.isFinite(user_id) || user_id <= 0) {
-      return { employees: [], error: 'Each employee must have a valid user_id' };
-    }
-    if (seen.has(user_id)) {
-      return { employees: [], error: `Duplicate user_id ${user_id} in employees list` };
-    }
-    seen.add(user_id);
-    const answersRaw = o.answers;
-    if (!Array.isArray(answersRaw) || answersRaw.length === 0) {
-      return { employees: [], error: `Employee ${user_id} must include a non-empty answers array` };
-    }
-    const answers: EmployeeEvaluationSubmitAnswer[] = [];
-    const qSeen = new Set<number>();
-    for (const a of answersRaw) {
-      if (a == null || typeof a !== 'object') {
-        return { employees: [], error: `Invalid answer for employee ${user_id}` };
-      }
-      const ar = a as Record<string, unknown>;
-      const section_id = Number(ar.section_id);
-      const question_id = Number(ar.question_id);
-      const score = Number(ar.score);
-      if (!Number.isFinite(section_id) || !Number.isFinite(question_id)) {
-        return { employees: [], error: `section_id and question_id required for employee ${user_id}` };
-      }
-      if (!Number.isFinite(score) || score < 0) {
-        return { employees: [], error: `score must be a non-negative number for employee ${user_id}, question ${question_id}` };
-      }
-      if (qSeen.has(question_id)) {
-        return { employees: [], error: `Duplicate question_id ${question_id} for employee ${user_id}` };
-      }
-      qSeen.add(question_id);
-      answers.push({
-        section_id,
-        question_id,
-        score,
-        remarks: ar.remarks != null ? String(ar.remarks) : null,
-      });
-    }
-    employees.push({
-      user_id,
-      is_rca: o.is_rca !== undefined ? Boolean(o.is_rca) : false,
-      answers,
-    });
-  }
-  return { employees };
-}
-
-/** Resolve max employees from active exception cycle for the evaluation month. */
-export async function resolveMaxEmployeesPerRequest(
-  manager: EntityManager,
-  month: number
-): Promise<number> {
-  const rows = await manager
-    .getRepository(EvaluationEligibilitySetting)
-    .createQueryBuilder('s')
-    .where('s.is_deleted = false')
-    .andWhere('s.is_active = true')
-    .orderBy('s.id', 'DESC')
-    .getMany();
-  const setting =
-    rows.find((s) => isCalendarMonthInEligibilityRange(s.from_month, s.to_month, month)) ?? null;
-  const max = setting?.max_employees_per_request;
-  if (max != null && Number.isFinite(Number(max)) && Number(max) > 0) {
-    return Math.floor(Number(max));
-  }
-  return DEFAULT_MAX_EMPLOYEES_PER_REQUEST;
-}
-
-export async function persistEmployeeEvaluationScores(
-  manager: EntityManager,
-  opts: {
-    requestId: number;
-    formId: number;
-    createdBy: string;
-    employees: NormalizedEmployeeSubmission[];
-  }
-): Promise<{ totalScore: number; averageScore: number; employeeCount: number }> {
-  const { requestId, formId, createdBy, employees } = opts;
-  let requestTotal = 0;
-
-  for (const emp of employees) {
-    let personTotal = 0;
-    for (const ans of emp.answers) {
-      const qMeta = await manager.findOne(EvaluationFormQuestion, {
-        where: { id: ans.question_id, is_deleted: false },
-      });
-      const questionSectionId = qMeta?.form_section_id;
-      if (!qMeta || questionSectionId == null || questionSectionId !== ans.section_id) {
-        throw new Error(`Invalid question ${ans.question_id} for section ${ans.section_id}`);
-      }
-      if (qMeta.max_score != null && ans.score > qMeta.max_score) {
-        throw new Error(
-          `score ${ans.score} exceeds max_score ${qMeta.max_score} for question ${ans.question_id}`
-        );
-      }
-      personTotal += ans.score;
-      await manager.save(
-        EmployeeEvaluationAnswers,
-        manager.create(EmployeeEvaluationAnswers, {
-          request_id: requestId,
-          user_id: emp.user_id,
-          form_id: formId,
-          section_id: ans.section_id,
-          question_id: ans.question_id,
-          score: ans.score,
-          remarks: ans.remarks ?? null,
-          created_by: createdBy,
-          is_deleted: false,
-        })
-      );
-    }
-
-    await manager.save(
-      EmployeeEvaluationPersonScore,
-      manager.create(EmployeeEvaluationPersonScore, {
-        request_id: requestId,
-        user_id: emp.user_id,
-        is_rca: Boolean(emp.is_rca),
-        us_feedback: null,
-        total_score: personTotal,
-        created_by: createdBy,
-        is_deleted: false,
-      })
-    );
-    requestTotal += personTotal;
-  }
-
-  const employeeCount = employees.length;
-  const averageScore = employeeCount ? requestTotal / employeeCount : 0;
-  await manager.update(EmployeeEvaluationRequests, { id: requestId }, {
-    total_score: requestTotal,
-    average_score: averageScore,
-    employee_count: employeeCount,
-    updated_by: createdBy,
-  });
-
-  return { totalScore: requestTotal, averageScore, employeeCount };
-}
+import type { EntityManager } from 'typeorm';
+import { EmployeeEvaluationAnswers } from '../models/EmployeeEvaluationAnswerModel';
+import { EmployeeEvaluationPersonScore } from '../models/EmployeeEvaluationPersonScoreModel';
+import { EmployeeEvaluationRequests } from '../models/EmployeeEvaluationRequestModel';
+import { EvaluationEligibilitySetting } from '../models/EvaluationEligibilitySettingModel';
+import { EvaluationFormQuestion } from '../models/EvaluationFormQuestionModel';
+import { isCalendarMonthInEligibilityRange } from './evaluation-eligibility.utils';
+
+export const DEFAULT_MAX_EMPLOYEES_PER_REQUEST = 50;
+
+export type EmployeeEvaluationSubmitAnswer = {
+  section_id: number;
+  question_id: number;
+  score: number;
+  remarks?: string | null;
+};
+
+export type EmployeeEvaluationSubmitEmployee = {
+  user_id: number;
+  is_rca?: boolean;
+  answers: EmployeeEvaluationSubmitAnswer[];
+};
+
+export type NormalizedEmployeeSubmission = EmployeeEvaluationSubmitEmployee;
+
+export function normalizeEmployeeSubmissions(raw: unknown): {
+  employees: NormalizedEmployeeSubmission[];
+  error?: string;
+} {
+  if (!Array.isArray(raw) || raw.length === 0) {
+    return { employees: [], error: 'employees must be a non-empty array' };
+  }
+  const seen = new Set<number>();
+  const employees: NormalizedEmployeeSubmission[] = [];
+  for (const item of raw) {
+    if (item == null || typeof item !== 'object') {
+      return { employees: [], error: 'Each employee entry must be an object' };
+    }
+    const o = item as Record<string, unknown>;
+    const user_id = Number(o.user_id ?? o.employee_id);
+    if (!Number.isFinite(user_id) || user_id <= 0) {
+      return { employees: [], error: 'Each employee must have a valid user_id' };
+    }
+    if (seen.has(user_id)) {
+      return { employees: [], error: `Duplicate user_id ${user_id} in employees list` };
+    }
+    seen.add(user_id);
+    const answersRaw = o.answers;
+    if (!Array.isArray(answersRaw) || answersRaw.length === 0) {
+      return { employees: [], error: `Employee ${user_id} must include a non-empty answers array` };
+    }
+    const answers: EmployeeEvaluationSubmitAnswer[] = [];
+    const qSeen = new Set<number>();
+    for (const a of answersRaw) {
+      if (a == null || typeof a !== 'object') {
+        return { employees: [], error: `Invalid answer for employee ${user_id}` };
+      }
+      const ar = a as Record<string, unknown>;
+      const section_id = Number(ar.section_id);
+      const question_id = Number(ar.question_id);
+      const score = Number(ar.score);
+      if (!Number.isFinite(section_id) || !Number.isFinite(question_id)) {
+        return { employees: [], error: `section_id and question_id required for employee ${user_id}` };
+      }
+      if (!Number.isFinite(score) || score < 0) {
+        return { employees: [], error: `score must be a non-negative number for employee ${user_id}, question ${question_id}` };
+      }
+      if (qSeen.has(question_id)) {
+        return { employees: [], error: `Duplicate question_id ${question_id} for employee ${user_id}` };
+      }
+      qSeen.add(question_id);
+      answers.push({
+        section_id,
+        question_id,
+        score,
+        remarks: ar.remarks != null ? String(ar.remarks) : null,
+      });
+    }
+    employees.push({
+      user_id,
+      is_rca: o.is_rca !== undefined ? Boolean(o.is_rca) : false,
+      answers,
+    });
+  }
+  return { employees };
+}
+
+/** Resolve max employees from active exception cycle for the evaluation month. */
+export async function resolveMaxEmployeesPerRequest(
+  manager: EntityManager,
+  month: number
+): Promise<number> {
+  const rows = await manager
+    .getRepository(EvaluationEligibilitySetting)
+    .createQueryBuilder('s')
+    .where('s.is_deleted = false')
+    .andWhere('s.is_active = true')
+    .orderBy('s.id', 'DESC')
+    .getMany();
+  const setting =
+    rows.find((s) => isCalendarMonthInEligibilityRange(s.from_month, s.to_month, month)) ?? null;
+  const max = setting?.max_employees_per_request;
+  if (max != null && Number.isFinite(Number(max)) && Number(max) > 0) {
+    return Math.floor(Number(max));
+  }
+  return DEFAULT_MAX_EMPLOYEES_PER_REQUEST;
+}
+
+export async function persistEmployeeEvaluationScores(
+  manager: EntityManager,
+  opts: {
+    requestId: number;
+    formId: number;
+    createdBy: string;
+    employees: NormalizedEmployeeSubmission[];
+  }
+): Promise<{ totalScore: number; averageScore: number; employeeCount: number }> {
+  const { requestId, formId, createdBy, employees } = opts;
+  let requestTotal = 0;
+
+  for (const emp of employees) {
+    let personTotal = 0;
+    for (const ans of emp.answers) {
+      const qMeta = await manager.findOne(EvaluationFormQuestion, {
+        where: { id: ans.question_id, is_deleted: false },
+      });
+      const questionSectionId = qMeta?.form_section_id;
+      if (!qMeta || questionSectionId == null || questionSectionId !== ans.section_id) {
+        throw new Error(`Invalid question ${ans.question_id} for section ${ans.section_id}`);
+      }
+      if (qMeta.max_score != null && ans.score > qMeta.max_score) {
+        throw new Error(
+          `score ${ans.score} exceeds max_score ${qMeta.max_score} for question ${ans.question_id}`
+        );
+      }
+      personTotal += ans.score;
+      await manager.save(
+        EmployeeEvaluationAnswers,
+        manager.create(EmployeeEvaluationAnswers, {
+          request_id: requestId,
+          user_id: emp.user_id,
+          form_id: formId,
+          section_id: ans.section_id,
+          question_id: ans.question_id,
+          score: ans.score,
+          remarks: ans.remarks ?? null,
+          created_by: createdBy,
+          is_deleted: false,
+        })
+      );
+    }
+
+    await manager.save(
+      EmployeeEvaluationPersonScore,
+      manager.create(EmployeeEvaluationPersonScore, {
+        request_id: requestId,
+        user_id: emp.user_id,
+        is_rca: Boolean(emp.is_rca),
+        us_feedback: null,
+        total_score: personTotal,
+        created_by: createdBy,
+        is_deleted: false,
+      })
+    );
+    requestTotal += personTotal;
+  }
+
+  const employeeCount = employees.length;
+  const averageScore = employeeCount ? requestTotal / employeeCount : 0;
+  await manager.update(EmployeeEvaluationRequests, { id: requestId }, {
+    total_score: requestTotal,
+    average_score: averageScore,
+    employee_count: employeeCount,
+    updated_by: createdBy,
+  });
+
+  return { totalScore: requestTotal, averageScore, employeeCount };
+}

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 };
+}

package/src/helpers/services-notification-config.helper.ts

@@ -133,7 +133,6 @@ export async function sendFmServicesNotificationConfigNotifications(
     pendingCount,
     requestId,
     status,
-    approvalLevel,
     shortProductName,
     requestTypeKey,
     routePath,
@@ -194,10 +193,7 @@ export async function sendFmServicesNotificationConfigNotifications(
       continue;
     }
 
-    const isEveryApproval = notificationConfig.trigger === ServicesNotificationTriggerType.EVERY_APPROVAL;
-    const notificationTitle = isEveryApproval
-      ? `${shortProductName} Request ${status} at Level ${approvalLevel}`
-      : `${shortProductName} Request ${status}`;
+    const notificationTitle = `${shortProductName} Request ${status}`;
     const notificationData = `${shortProductName} request #${requestId} has been ${status}.`;
 
     for (const ur of userRoles) {
@@ -230,7 +226,6 @@ export async function sendFmServicesNotificationConfigNotifications(
               requestId,
               requestType: requestTypeKey,
               status,
-              level: approvalLevel,
               timestamp: new Date().toISOString(),
             },
             is_read: false,