@platform-modules/civil-aviation-authority 2.3.152 → 2.3.156

package/src/models/LegalComplaintRequestModel.ts

@@ -8,6 +8,260 @@ export enum LegalComplaintRequestStatus {
   RFC = 'RFC',
 }
 
+/** Step 2 — Complaint details (individuals, time, incident date, location, events, other details). */
+export interface LegalComplaintIncidentInput {
+  incident_time?: string | null;
+  /** Date of the incident (step 2); distinct from request `complaint_date` / `date` on the body. */
+  incident_date?: string | null;
+  incident_location?: string | null;
+  individuals_involved?: string | null;
+  /** Events / narrative (UI “Events”). */
+  incident_events?: string | null;
+  /** “Any other details related to complaint”. */
+  incident_other_details?: string | null;
+  /** Optional combined narrative; if omitted, parser may derive from events + other_details. */
+  incident_description?: string;
+}
+
+/** Step 3 — Complainant: Name / Position / Employee ID / Directorate / Department / Section. */
+export interface LegalComplaintComplainantInput {
+  name: string;
+  position?: string | null;
+  employee_id?: string | null;
+  directorate?: string | null;
+  department_id?: number | null;
+  section_id?: number | null;
+  /** When UI sends department as text instead of id. */
+  department_name?: string | null;
+  section_name?: string | null;
+}
+
+/** Step 4 — Subject of complaint: Name / Position / Salary grade / Directorate / Department / Section. */
+export interface LegalComplaintSubjectEmployeeInput {
+  name: string;
+  position?: string | null;
+  salary_grade?: string | null;
+  directorate?: string | null;
+  department_id?: number | null;
+  section_id?: number | null;
+  department_name?: string | null;
+  section_name?: string | null;
+}
+
+export interface LegalComplaintStructuredCreateFields {
+  incident_time: string | null;
+  incident_date: string | null;
+  incident_location: string | null;
+  individuals_involved: string | null;
+  incident_events: string | null;
+  incident_other_details: string | null;
+  incident_description: string;
+  complainant_name: string;
+  complainant_position: string | null;
+  complainant_employee_id: string | null;
+  complainant_directorate: string | null;
+  complainant_department_id: number | null;
+  complainant_department_name: string | null;
+  complainant_section_id: number | null;
+  complainant_section_name: string | null;
+  complained_employee_name: string;
+  complained_employee_position: string | null;
+  complained_employee_salary_grade: string | null;
+  complained_employee_directorate: string | null;
+  complained_employee_department_id: number | null;
+  complained_employee_department_name: string | null;
+  complained_employee_section_id: number | null;
+  complained_employee_section_name: string | null;
+}
+
+export type LegalComplaintCreateFieldParseResult =
+  | { ok: true; fields: LegalComplaintStructuredCreateFields }
+  | { ok: false; message: string };
+
+function pickStr(v: unknown): string | null {
+  if (v == null || v === '') return null;
+  const s = String(v).trim();
+  return s === '' ? null : s;
+}
+
+function pickNum(v: unknown): number | null {
+  if (v == null || v === '') return null;
+  const n = Number(v);
+  return Number.isFinite(n) && n > 0 ? Math.floor(n) : null;
+}
+
+/** YYYY-MM-DD or parseable date string; returns null if invalid. */
+function pickDateOnlyStr(v: unknown): string | null {
+  if (v == null || v === '') return null;
+  const s = String(v).trim();
+  const iso = s.match(/^(\d{4}-\d{2}-\d{2})/);
+  if (iso) return iso[1];
+  const d = new Date(s);
+  if (Number.isNaN(d.getTime())) return null;
+  return d.toISOString().slice(0, 10);
+}
+
+function pickDepartmentSectionNames(
+  obj: Record<string, any>,
+  idKey: string,
+  altIdKey: string,
+  nameKey: string,
+  plainKey: string,
+): { id: number | null; name: string | null } {
+  let id = pickNum(obj[idKey] ?? obj[altIdKey]);
+  let name = pickStr(obj[nameKey]);
+  const plain = obj[plainKey];
+  if (plain != null && plain !== '') {
+    if (typeof plain === 'number' || (typeof plain === 'string' && /^\d+$/.test(String(plain).trim()))) {
+      const n = pickNum(plain);
+      if (n != null && id == null) id = n;
+    } else {
+      const ps = pickStr(plain);
+      if (ps) name = name || ps;
+    }
+  }
+  return { id, name };
+}
+
+/**
+ * Maps API / Conductor `requestData` to DB columns.
+ * Preferred: `complaint_incident`, `complainant`, `complained_employee` objects.
+ * Legacy: `complaint_details`, `complainant_details`, `complained_employee_details` non-empty strings.
+ */
+export function parseLegalComplaintCreateFields(body: Record<string, any>): LegalComplaintCreateFieldParseResult {
+  const legacyComplaint = body.complaint_details;
+  const legacyComplainant = body.complainant_details;
+  const legacySubject = body.complained_employee_details;
+
+  const inc = body.complaint_incident ?? body.complaintIncident;
+  let incident_time: string | null = null;
+  let incident_date: string | null = null;
+  let incident_location: string | null = null;
+  let individuals_involved: string | null = null;
+  let incident_events: string | null = null;
+  let incident_other_details: string | null = null;
+  let incident_description = '';
+
+  if (typeof legacyComplaint === 'string' && legacyComplaint.trim() !== '' && (inc == null || typeof inc !== 'object')) {
+    incident_description = legacyComplaint.trim();
+  } else if (inc != null && typeof inc === 'object' && !Array.isArray(inc)) {
+    incident_time = pickStr(inc.incident_time ?? inc.time);
+    incident_date = pickDateOnlyStr(inc.incident_date ?? inc.date_of_incident);
+    incident_location = pickStr(inc.incident_location ?? inc.location);
+    individuals_involved = pickStr(inc.individuals_involved ?? inc.persons_involved);
+    incident_events = pickStr(inc.incident_events ?? inc.events);
+    incident_other_details = pickStr(
+      inc.incident_other_details ?? inc.other_details ?? inc.any_other_details_related_to_complaint,
+    );
+    incident_description = String(inc.incident_description ?? inc.description ?? '').trim();
+    if (!incident_description) {
+      const parts = [incident_events, incident_other_details].filter((x) => x && String(x).trim()) as string[];
+      incident_description = parts.join('\n\n').trim();
+    }
+  }
+
+  if (!incident_description) {
+    return {
+      ok: false,
+      message:
+        'complaint_incident must include incident_description, or incident_events / incident_other_details, or legacy complaint_details text',
+    };
+  }
+
+  const comp = body.complainant;
+  let complainant_name = '';
+  let complainant_position: string | null = null;
+  let complainant_employee_id: string | null = null;
+  let complainant_directorate: string | null = null;
+  let complainant_department_id: number | null = null;
+  let complainant_department_name: string | null = null;
+  let complainant_section_id: number | null = null;
+  let complainant_section_name: string | null = null;
+
+  if (typeof legacyComplainant === 'string' && legacyComplainant.trim() !== '' && (comp == null || typeof comp !== 'object')) {
+    complainant_name = legacyComplainant.trim();
+  } else if (comp != null && typeof comp === 'object' && !Array.isArray(comp)) {
+    complainant_name = String(comp.name ?? '').trim();
+    complainant_position = pickStr(comp.position);
+    complainant_employee_id = pickStr(comp.employee_id ?? comp.employeeId);
+    complainant_directorate = pickStr(comp.directorate);
+    const dep = pickDepartmentSectionNames(comp, 'department_id', 'departmentId', 'department_name', 'department');
+    const sec = pickDepartmentSectionNames(comp, 'section_id', 'sectionId', 'section_name', 'section');
+    complainant_department_id = dep.id;
+    complainant_department_name = dep.name;
+    complainant_section_id = sec.id;
+    complainant_section_name = sec.name;
+  }
+
+  if (!complainant_name) {
+    return {
+      ok: false,
+      message: 'complainant.name is required (or legacy complainant_details text)',
+    };
+  }
+
+  const sub = body.complained_employee ?? body.complainedEmployee;
+  let complained_employee_name = '';
+  let complained_employee_position: string | null = null;
+  let complained_employee_salary_grade: string | null = null;
+  let complained_employee_directorate: string | null = null;
+  let complained_employee_department_id: number | null = null;
+  let complained_employee_department_name: string | null = null;
+  let complained_employee_section_id: number | null = null;
+  let complained_employee_section_name: string | null = null;
+
+  if (typeof legacySubject === 'string' && legacySubject.trim() !== '' && (sub == null || typeof sub !== 'object')) {
+    complained_employee_name = legacySubject.trim();
+  } else if (sub != null && typeof sub === 'object' && !Array.isArray(sub)) {
+    complained_employee_name = String(sub.name ?? '').trim();
+    complained_employee_position = pickStr(sub.position);
+    complained_employee_salary_grade = pickStr(sub.salary_grade ?? sub.salaryGrade);
+    complained_employee_directorate = pickStr(sub.directorate);
+    const dep = pickDepartmentSectionNames(sub, 'department_id', 'departmentId', 'department_name', 'department');
+    const sec = pickDepartmentSectionNames(sub, 'section_id', 'sectionId', 'section_name', 'section');
+    complained_employee_department_id = dep.id;
+    complained_employee_department_name = dep.name;
+    complained_employee_section_id = sec.id;
+    complained_employee_section_name = sec.name;
+  }
+
+  if (!complained_employee_name) {
+    return {
+      ok: false,
+      message: 'complained_employee.name is required (or legacy complained_employee_details text)',
+    };
+  }
+
+  return {
+    ok: true,
+    fields: {
+      incident_time,
+      incident_date,
+      incident_location,
+      individuals_involved,
+      incident_events,
+      incident_other_details,
+      incident_description,
+      complainant_name,
+      complainant_position,
+      complainant_employee_id,
+      complainant_directorate,
+      complainant_department_id,
+      complainant_department_name,
+      complainant_section_id,
+      complainant_section_name,
+      complained_employee_name,
+      complained_employee_position,
+      complained_employee_salary_grade,
+      complained_employee_directorate,
+      complained_employee_department_id,
+      complained_employee_department_name,
+      complained_employee_section_id,
+      complained_employee_section_name,
+    },
+  };
+}
+
 @Entity({ name: 'legal_complaint_requests' })
 export class LegalComplaintRequest extends BaseModel {
   @Column({ type: 'date', nullable: false })
@@ -19,17 +273,77 @@ export class LegalComplaintRequest extends BaseModel {
   @Column({ type: 'text', nullable: false })
   description: string;
 
-  /** Times, dates, locations, individuals, events, etc. */
-  @Column({ type: 'text', nullable: false })
-  complaint_details: string;
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  incident_time: string | null;
 
-  /** Name / Position / Employee ID / Directorate / Department / Section (structured text or JSON) */
-  @Column({ type: 'text', nullable: false })
-  complainant_details: string;
+  @Column({ type: 'text', nullable: true })
+  incident_location: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  individuals_involved: string | null;
+
+  /** Date of the incident (wizard step 2); request submission date remains `complaint_date`. */
+  @Column({ type: 'date', nullable: true })
+  incident_date: Date | null;
+
+  /** UI “Events”. */
+  @Column({ type: 'text', nullable: true })
+  incident_events: string | null;
+
+  /** “Any other details related to complaint”. */
+  @Column({ type: 'text', nullable: true })
+  incident_other_details: string | null;
 
-  /** Subject of complaint: Name / Position / Salary Grade / Directorate / Department / Section */
   @Column({ type: 'text', nullable: false })
-  complained_employee_details: string;
+  incident_description: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  complainant_name: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  complainant_position: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  complainant_employee_id: string | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  complainant_directorate: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  complainant_department_id: number | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  complainant_department_name: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  complainant_section_id: number | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  complainant_section_name: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  complained_employee_name: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  complained_employee_position: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  complained_employee_salary_grade: string | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  complained_employee_directorate: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  complained_employee_department_id: number | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  complained_employee_department_name: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  complained_employee_section_id: number | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  complained_employee_section_name: string | null;
 
   @Column({ type: 'int', nullable: true })
   req_user_department_id: number | null;

package/src/models/PerformanceCyclePeriodModel.ts

@@ -1,26 +1,26 @@
-import { Column, Entity, Index } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-@Entity({ name: "performance_cycle_periods" })
-@Index("uq_performance_cycle_period", ["cycle_period", "cycle_year"], { unique: true })
-export class PerformanceCyclePeriod extends BaseModel {
-    @Column({ type: "varchar", length: 50, nullable: false })
-    cycle_period: string;
-
-    @Column({ type: "integer", nullable: false })
-    cycle_year: number;
-
-    @Column({ type: "varchar", length: 255, nullable: false, default: "" })
-    title: string;
-
-    @Column({ type: "boolean", default: false })
-    is_active: boolean;
-
-    constructor(cycle_period?: string, cycle_year?: number, title?: string) {
-        super();
-        this.cycle_period = cycle_period || "";
-        this.cycle_year = cycle_year || new Date().getFullYear();
-        this.title = title || "";
-        this.is_active = false;
-    }
-}
+import { Column, Entity, Index } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "performance_cycle_periods" })
+@Index("uq_performance_cycle_period", ["cycle_period", "cycle_year"], { unique: true })
+export class PerformanceCyclePeriod extends BaseModel {
+    @Column({ type: "varchar", length: 50, nullable: false })
+    cycle_period: string;
+
+    @Column({ type: "integer", nullable: false })
+    cycle_year: number;
+
+    @Column({ type: "varchar", length: 255, nullable: false, default: "" })
+    title: string;
+
+    @Column({ type: "boolean", default: false })
+    is_active: boolean;
+
+    constructor(cycle_period?: string, cycle_year?: number, title?: string) {
+        super();
+        this.cycle_period = cycle_period || "";
+        this.cycle_year = cycle_year || new Date().getFullYear();
+        this.title = title || "";
+        this.is_active = false;
+    }
+}

package/src/models/PerformanceGoalMasterModel.ts

@@ -1,27 +1,27 @@
-import { Column, Entity, Index } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-@Entity({ name: "performance_management_goals" })
-export class PerformanceGoalMaster extends BaseModel {
-    @Column({ type: "varchar", length: 255, nullable: false })
-    goal_title: string;
-
-    @Column({ type: "text", nullable: true })
-    goal_description: string | null;
-
-    @Column({ type: "integer", nullable: false })
-    @Index("idx_performance_goal_cycle_period_id")
-    cycle_period_id: number;
-
-    @Column({ type: "boolean", default: true })
-    is_active: boolean;
-
-    constructor(goal_title?: string, goal_description?: string | null, cycle_period_id?: number) {
-        super();
-        this.goal_title = goal_title || "";
-        this.goal_description = goal_description || null;
-        this.cycle_period_id = cycle_period_id || 0;
-        this.is_active = true;
-    }
-}
-
+import { Column, Entity, Index } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "performance_management_goals" })
+export class PerformanceGoalMaster extends BaseModel {
+    @Column({ type: "varchar", length: 255, nullable: false })
+    goal_title: string;
+
+    @Column({ type: "text", nullable: true })
+    goal_description: string | null;
+
+    @Column({ type: "integer", nullable: false })
+    @Index("idx_performance_goal_cycle_period_id")
+    cycle_period_id: number;
+
+    @Column({ type: "boolean", default: true })
+    is_active: boolean;
+
+    constructor(goal_title?: string, goal_description?: string | null, cycle_period_id?: number) {
+        super();
+        this.goal_title = goal_title || "";
+        this.goal_description = goal_description || null;
+        this.cycle_period_id = cycle_period_id || 0;
+        this.is_active = true;
+    }
+}
+

package/src/models/PerformanceManagementRequestGoalModel.ts

@@ -1,46 +1,46 @@
-import { Column, Entity, Index } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-@Entity({ name: "performance_management_request_goals" })
-export class PerformanceManagementRequestGoal extends BaseModel {
-    @Index("idx_pm_request_goals_request_id")
-    @Column({ type: "integer", nullable: false })
-    request_id: number;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    goal_title: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    goal_id: string;
-
-    @Column({ type: "text", nullable: false })
-    goal_description: string;
-
-    @Column({ type: "integer", nullable: false, default: 0 })
-    goal_weight: number;
-
-    @Column({ type: "integer", nullable: true, default: null })
-    rating: number | null;
-
-    @Column({ type: "text", nullable: true, default: null })
-    remark: string | null;
-
-    constructor(
-        request_id?: number,
-        goal_title?: string,
-        goal_id?: string,
-        goal_description?: string,
-        goal_weight?: number,
-        rating?: number | null,
-        remark?: string | null
-    ) {
-        super();
-        this.request_id = request_id || 0;
-        this.goal_title = goal_title || "";
-        this.goal_id = goal_id || "";
-        this.goal_description = goal_description || "";
-        this.goal_weight = goal_weight || 0;
-        this.rating = rating ?? null;
-        this.remark = remark ?? null;
-    }
-}
+import { Column, Entity, Index } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "performance_management_request_goals" })
+export class PerformanceManagementRequestGoal extends BaseModel {
+    @Index("idx_pm_request_goals_request_id")
+    @Column({ type: "integer", nullable: false })
+    request_id: number;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    goal_title: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    goal_id: string;
+
+    @Column({ type: "text", nullable: false })
+    goal_description: string;
+
+    @Column({ type: "integer", nullable: false, default: 0 })
+    goal_weight: number;
+
+    @Column({ type: "integer", nullable: true, default: null })
+    rating: number | null;
+
+    @Column({ type: "text", nullable: true, default: null })
+    remark: string | null;
+
+    constructor(
+        request_id?: number,
+        goal_title?: string,
+        goal_id?: string,
+        goal_description?: string,
+        goal_weight?: number,
+        rating?: number | null,
+        remark?: string | null
+    ) {
+        super();
+        this.request_id = request_id || 0;
+        this.goal_title = goal_title || "";
+        this.goal_id = goal_id || "";
+        this.goal_description = goal_description || "";
+        this.goal_weight = goal_weight || 0;
+        this.rating = rating ?? null;
+        this.remark = remark ?? null;
+    }
+}

package/src/models/PerformanceManagementRequestModel.ts

@@ -53,8 +53,8 @@ export class PerformanceManagementRequest extends BaseModel {
     @Column({ type: "text", nullable: true })
     description: string | null;
 
-    @Column({ type: "enum", enum: PerformanceManagementCyclePeriod, nullable: false })
-    cycle_period: PerformanceManagementCyclePeriod;
+    @Column({ type: "enum", enum: PerformanceManagementCyclePeriod, nullable: false })
+    cycle_period: PerformanceManagementCyclePeriod;
 
     @Column({ type: "integer", nullable: true })
     cycle_year: number | null;
@@ -70,11 +70,11 @@ export class PerformanceManagementRequest extends BaseModel {
         description?: string | null,
         reviewer_user_id?: number | null,
         assigned_to_user_id?: number | null,
-        assigned_at?: Date | null,
-        workflow_execution_id?: string | null,
-        cycle_period?: PerformanceManagementCyclePeriod,
-        cycle_year?: number | null
-    ) {
+        assigned_at?: Date | null,
+        workflow_execution_id?: string | null,
+        cycle_period?: PerformanceManagementCyclePeriod,
+        cycle_year?: number | null
+    ) {
         super();
         this.user_id = user_id;
         this.status = status;
@@ -85,10 +85,10 @@ export class PerformanceManagementRequest extends BaseModel {
         this.req_user_position_id = req_user_position_id || null;
         this.description = description || null;
         this.reviewer_user_id = reviewer_user_id || null;
-        this.assigned_to_user_id = assigned_to_user_id || null;
-        this.assigned_at = assigned_at || null;
-        this.workflow_execution_id = workflow_execution_id || null;
-        this.cycle_period = cycle_period || PerformanceManagementCyclePeriod.JAN_JUN;
-        this.cycle_year = cycle_year || null;
-    }
-}
+        this.assigned_to_user_id = assigned_to_user_id || null;
+        this.assigned_at = assigned_at || null;
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.cycle_period = cycle_period || PerformanceManagementCyclePeriod.JAN_JUN;
+        this.cycle_year = cycle_year || null;
+    }
+}

package/src/models/PromotionRequestModel.ts

@@ -45,12 +45,12 @@ export class PromotionRequest extends BaseModel {
     @Column({ type: "timestamp", nullable: true })
     assigned_at: Date | null;
 
-    @Column({ type: "varchar", length: 255, nullable: true })
-    workflow_execution_id: string | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    reference_number: string | null;
-
+    @Column({ type: "varchar", length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    reference_number: string | null;
+
     // Promotion Decision specific fields
     @Column({ type: "varchar", length: 255, nullable: false })
     employee_name: string;
@@ -108,11 +108,11 @@ export class PromotionRequest extends BaseModel {
         this.req_user_position_id = req_user_position_id || null;
         this.description = description || null;
         this.reviewer_user_id = reviewer_user_id || null;
-        this.assigned_to_user_id = assigned_to_user_id || null;
-        this.assigned_at = assigned_at || null;
-        this.workflow_execution_id = workflow_execution_id || null;
-        this.reference_number = null;
-        this.employee_name = employee_name || "";
+        this.assigned_to_user_id = assigned_to_user_id || null;
+        this.assigned_at = assigned_at || null;
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.reference_number = null;
+        this.employee_name = employee_name || "";
         this.employee_id = employee_id || "";
         this.current_job_title = current_job_title || "";
         this.proposed_job_title = proposed_job_title || "";