@platform-modules/foreign-ministry 1.3.341 → 1.3.350

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

@@ -85,6 +85,81 @@ export function normalizeEmployeeSubmissions(raw: unknown): {
   return { employees };
 }
 
+/** Relaxed validation for draft saves — employees/answers may be empty or partial. */
+export function normalizeEmployeeDraftSubmissions(raw: unknown): {
+  employees: NormalizedEmployeeSubmission[];
+  error?: string;
+} {
+  if (raw == null || raw === undefined) {
+    return { employees: [] };
+  }
+  if (!Array.isArray(raw)) {
+    return { employees: [], error: 'employees must be an array when provided' };
+  }
+  if (raw.length === 0) {
+    return { employees: [] };
+  }
+  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;
+    const answers: EmployeeEvaluationSubmitAnswer[] = [];
+    if (answersRaw != null) {
+      if (!Array.isArray(answersRaw)) {
+        return { employees: [], error: `Employee ${user_id} answers must be an array when provided` };
+      }
+      const qSeen = new Set<number>();
+      for (const a of answersRaw) {
+        if (a == null || typeof a !== 'object') continue;
+        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} when answer is provided`,
+          };
+        }
+        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,
@@ -113,9 +188,10 @@ export async function persistEmployeeEvaluationScores(
     formId: number;
     createdBy: string;
     employees: NormalizedEmployeeSubmission[];
+    isDraft?: boolean;
   }
 ): Promise<{ totalScore: number; averageScore: number; employeeCount: number }> {
-  const { requestId, formId, createdBy, employees } = opts;
+  const { requestId, formId, createdBy, employees, isDraft = false } = opts;
   let requestTotal = 0;
 
   for (const emp of employees) {
@@ -125,14 +201,18 @@ export async function persistEmployeeEvaluationScores(
         where: { id: ans.question_id, is_deleted: false },
       });
       const questionSectionId = qMeta?.form_section_id;
-      if (!qMeta || questionSectionId == null || questionSectionId !== ans.section_id) {
+      if (!isDraft) {
+        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}`
+          );
+        }
+      } else if (qMeta && qMeta.form_section_id != null && qMeta.form_section_id !== 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,

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/index.ts

@@ -459,6 +459,7 @@ export {
 export {
   DEFAULT_MAX_EMPLOYEES_PER_REQUEST,
   normalizeEmployeeSubmissions,
+  normalizeEmployeeDraftSubmissions,
   resolveMaxEmployeesPerRequest,
   persistEmployeeEvaluationScores,
 } from './helpers/employee-evaluation-request.utils';

package/src/models/DiplomaticAcademyRequestModel.ts

@@ -1,80 +1,80 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum DiplomaticAcademyStatus {
-  SUBMITTED = "Submitted",
-  PENDING = "Pending",
-  ASSIGNED = "Assigned",
-  IN_PROGRESS = "In Progress",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-@Entity({ name: 'diplomatic_academy_requests' })
-export class DiplomaticAcademyRequests extends BaseModel {
-
-  // Common columns
-  @Column({ type: 'int', nullable: true })
-  req_user_department_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  req_user_section_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: 'int', nullable: false })
-  user_id: number;
-
-  // Diplomatic Academy specific columns
-  @Column({ type: 'varchar', length: 500, nullable: false })
-  course_name: string;
-
-  @Column({ type: 'jsonb', nullable: true })
-  cost_details: {
-    material_price?: number;
-    transportation?: number;
-    accommodation?: number;
-    allowances?: number;
-    food?: number;
-    present?: number;
-  } | null;
-
-  @Column({ type: 'int', nullable: false })
-  estimated_participants: number;
-
-  @Column({ type: 'date', nullable: false })
-  timeline_date_from: Date;
-
-  @Column({ type: 'date', nullable: false })
-  timeline_date_to: Date;
-
-  @Column({ type: 'time', nullable: true })
-  timeline_time_from: string | null;
-
-  @Column({ type: 'time', nullable: true })
-  timeline_time_to: string | null;
-
-  @Column({ type: 'jsonb', nullable: false })
-  participants_details: Array<{
-    full_name: string;
-    passport: string;
-    age: number;
-    qualifications: string;
-    experience: string;
-    institution: string;
-  }>;
-
-  @Column({ type: 'enum', enum: DiplomaticAcademyStatus, default: DiplomaticAcademyStatus.PENDING, nullable: false })
-  status: DiplomaticAcademyStatus;
-
-  @Column({ type: 'int', nullable: true })
-  course_id: number | null;
-
-  @Column({ type: 'varchar', nullable: true })
-  workflow_execution_id: string | null;
-  
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum DiplomaticAcademyStatus {
+  SUBMITTED = "Submitted",
+  PENDING = "Pending",
+  ASSIGNED = "Assigned",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: 'diplomatic_academy_requests' })
+export class DiplomaticAcademyRequests extends BaseModel {
+
+  // Common columns
+  @Column({ type: 'int', nullable: true })
+  req_user_department_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  req_user_section_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: 'int', nullable: false })
+  user_id: number;
+
+  // Diplomatic Academy specific columns
+  @Column({ type: 'varchar', length: 500, nullable: false })
+  course_name: string;
+
+  @Column({ type: 'jsonb', nullable: true })
+  cost_details: {
+    material_price?: number;
+    transportation?: number;
+    accommodation?: number;
+    allowances?: number;
+    food?: number;
+    present?: number;
+  } | null;
+
+  @Column({ type: 'int', nullable: false })
+  estimated_participants: number;
+
+  @Column({ type: 'date', nullable: false })
+  timeline_date_from: Date;
+
+  @Column({ type: 'date', nullable: false })
+  timeline_date_to: Date;
+
+  @Column({ type: 'time', nullable: true })
+  timeline_time_from: string | null;
+
+  @Column({ type: 'time', nullable: true })
+  timeline_time_to: string | null;
+
+  @Column({ type: 'jsonb', nullable: false })
+  participants_details: Array<{
+    full_name: string;
+    passport: string;
+    age: number;
+    qualifications: string;
+    experience: string;
+    institution: string;
+  }>;
+
+  @Column({ type: 'enum', enum: DiplomaticAcademyStatus, default: DiplomaticAcademyStatus.PENDING, nullable: false })
+  status: DiplomaticAcademyStatus;
+
+  @Column({ type: 'int', nullable: true })
+  course_id: number | null;
+
+  @Column({ type: 'varchar', nullable: true })
+  workflow_execution_id: string | null;
+  
+}

package/src/models/DocumentationFileModel.ts

@@ -1,40 +1,40 @@
-import { Column, Entity } from 'typeorm';
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'documentation_files' })
-export class DocumentationFile extends BaseModel {
-  @Column({ type: 'int', nullable: true })
-  project_id: number | null;
-
-  @Column({ type: 'int' })
-  folder_id: number;
-
-  @Column({ type: 'text', nullable: true })
-  file_path: string;
-
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  filename: string;
-
-  @Column({ type: 'bigint', nullable: true })
-  filesize: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  filetype: string;
-
-  constructor(
-    project_id?: number | null,
-    folder_id?: number,
-    file_path?: string,
-    filename?: string,
-    filesize?: number,
-    filetype?: string
-  ) {
-    super();
-    this.project_id = project_id ?? null;
-    this.folder_id = folder_id ?? 0;
-    this.file_path = file_path ?? '';
-    this.filename = filename ?? '';
-    this.filesize = filesize ?? 0;
-    this.filetype = filetype ?? '';
-  }
-}
+import { Column, Entity } from 'typeorm';
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'documentation_files' })
+export class DocumentationFile extends BaseModel {
+  @Column({ type: 'int', nullable: true })
+  project_id: number | null;
+
+  @Column({ type: 'int' })
+  folder_id: number;
+
+  @Column({ type: 'text', nullable: true })
+  file_path: string;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  filename: string;
+
+  @Column({ type: 'bigint', nullable: true })
+  filesize: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  filetype: string;
+
+  constructor(
+    project_id?: number | null,
+    folder_id?: number,
+    file_path?: string,
+    filename?: string,
+    filesize?: number,
+    filetype?: string
+  ) {
+    super();
+    this.project_id = project_id ?? null;
+    this.folder_id = folder_id ?? 0;
+    this.file_path = file_path ?? '';
+    this.filename = filename ?? '';
+    this.filesize = filesize ?? 0;
+    this.filetype = filetype ?? '';
+  }
+}