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

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

@@ -1,36 +1,36 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-
-@Entity({ name: "mission_travel_passport_expiry_notification_configs" })
-export class MissionTravelPassportExpiryNotificationConfig extends BaseModel {
-  @Column({ type: "integer", nullable: false })
-  department_id: number;
-
-  @Column({ type: "integer", nullable: true })
-  section_id: number | null;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  frequency: string | null;
-
-  @Column({ type: "integer", nullable: true })
-  repeat_interval_days: number | null; // Repeating after every N days (default 10)
-
-  @Column({ type: "boolean", nullable: false, default: true })
-  is_active: boolean;
-
-  constructor(
-    department_id: number,
-    section_id: number | null = null,
-    frequency: string | null = null,
-    repeat_interval_days: number = 10,
-    is_active: boolean = true
-  ) {
-    super();
-    this.department_id = department_id;
-    this.section_id = section_id;
-    this.frequency = frequency;
-    this.repeat_interval_days = repeat_interval_days;
-    this.is_active = is_active;
-  }
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+
+@Entity({ name: "mission_travel_passport_expiry_notification_configs" })
+export class MissionTravelPassportExpiryNotificationConfig extends BaseModel {
+  @Column({ type: "integer", nullable: false })
+  department_id: number;
+
+  @Column({ type: "integer", nullable: true })
+  section_id: number | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  frequency: string | null;
+
+  @Column({ type: "integer", nullable: true })
+  repeat_interval_days: number | null; // Repeating after every N days (default 10)
+
+  @Column({ type: "boolean", nullable: false, default: true })
+  is_active: boolean;
+
+  constructor(
+    department_id: number,
+    section_id: number | null = null,
+    frequency: string | null = null,
+    repeat_interval_days: number = 10,
+    is_active: boolean = true
+  ) {
+    super();
+    this.department_id = department_id;
+    this.section_id = section_id;
+    this.frequency = frequency;
+    this.repeat_interval_days = repeat_interval_days;
+    this.is_active = is_active;
+  }
+}

package/src/models/ResidentialUnitRentalChatModel.ts

@@ -1,56 +1,56 @@
-import { Column, Entity } from "typeorm";
-
-import { BaseModel } from "./BaseModel";
-
-export enum ResidentialUnitRentalMessageType {
-  text = "text",
-  image = "image",
-  video = "video",
-  file = "file",
-  link = "link",
-}
-
-export enum ResidentialUnitRentalChatStatus {
-  Pending = "Pending",
-  Received = "Received",
-  Approved = "Approved",
-  Rejected = "Rejected",
-  InProgress = "In Progress",
-}
-
-@Entity({ name: "residential_unit_rental_chat" })
-export class ResidentialUnitRentalChat extends BaseModel {
-  @Column({ type: "int", nullable: false })
-  request_id: number;
-
-  @Column({ type: "int", nullable: false })
-  service_id: number;
-
-  @Column({ type: "int", nullable: false })
-  sub_service_id: number;
-
-  @Column({ type: "int", nullable: false })
-  user_id: number;
-
-  @Column({ type: "text", nullable: false })
-  message: string;
-
-  @Column({ type: "int", nullable: true })
-  approver_role_id: number | null;
-
-  @Column({ type: "varchar", length: 255, nullable: false, default: "Pending" })
-  status: string;
-
-  @Column({ type: "varchar", length: 20, nullable: false })
-  message_type: string;
-
-  @Column({ type: "boolean", nullable: false, default: false })
-  is_internal: boolean;
-
-  @Column({ type: "int", nullable: false })
-  created_by: number;
-
-  constructor() {
-    super();
-  }
-}
+import { Column, Entity } from "typeorm";
+
+import { BaseModel } from "./BaseModel";
+
+export enum ResidentialUnitRentalMessageType {
+  text = "text",
+  image = "image",
+  video = "video",
+  file = "file",
+  link = "link",
+}
+
+export enum ResidentialUnitRentalChatStatus {
+  Pending = "Pending",
+  Received = "Received",
+  Approved = "Approved",
+  Rejected = "Rejected",
+  InProgress = "In Progress",
+}
+
+@Entity({ name: "residential_unit_rental_chat" })
+export class ResidentialUnitRentalChat extends BaseModel {
+  @Column({ type: "int", nullable: false })
+  request_id: number;
+
+  @Column({ type: "int", nullable: false })
+  service_id: number;
+
+  @Column({ type: "int", nullable: false })
+  sub_service_id: number;
+
+  @Column({ type: "int", nullable: false })
+  user_id: number;
+
+  @Column({ type: "text", nullable: false })
+  message: string;
+
+  @Column({ type: "int", nullable: true })
+  approver_role_id: number | null;
+
+  @Column({ type: "varchar", length: 255, nullable: false, default: "Pending" })
+  status: string;
+
+  @Column({ type: "varchar", length: 20, nullable: false })
+  message_type: string;
+
+  @Column({ type: "boolean", nullable: false, default: false })
+  is_internal: boolean;
+
+  @Column({ type: "int", nullable: false })
+  created_by: number;
+
+  constructor() {
+    super();
+  }
+}