@platform-modules/civil-aviation-authority 2.3.248 → 2.3.250

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 || "";

package/src/models/RespondToEnquiriesRequestModel.ts

@@ -1,17 +1,17 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from "./BaseModel";
 
-export enum RespondToEnquiriesRequestStatus {
-    PENDING = "Pending",
-    ASSIGNED = "Assigned",
-    IN_PROGRESS = "In Progress",
-    COMPLETED = "Completed",
-    APPROVED = "Approved",
-    REJECTED = "Rejected"
-}
-
-@Entity({ name: "respond_to_enquiries_requests" })
-export class RespondToEnquiriesRequest extends BaseModel {
+export enum RespondToEnquiriesRequestStatus {
+    PENDING = "Pending",
+    ASSIGNED = "Assigned",
+    IN_PROGRESS = "In Progress",
+    COMPLETED = "Completed",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+
+@Entity({ name: "respond_to_enquiries_requests" })
+export class RespondToEnquiriesRequest extends BaseModel {
     @Column({ type: "integer", nullable: true })
     req_user_department_id: number | null;
 
@@ -65,11 +65,11 @@ export class RespondToEnquiriesRequest extends BaseModel {
     @Column({ type: "date", nullable: false })
     date_of_submission: Date;
 
-    @Column({ type: "varchar", length: 30, nullable: false })
-    phone: string;
-
-    @Column({ type: "date", nullable: true })
-    tender_date_of_submission: Date | null;
+    @Column({ type: "varchar", length: 30, nullable: false })
+    phone: string;
+
+    @Column({ type: "date", nullable: true })
+    tender_date_of_submission: Date | null;
 
     @Column({ type: "varchar", length: 30, nullable: true })
     tender_phone: string | null;
@@ -101,14 +101,14 @@ export class RespondToEnquiriesRequest extends BaseModel {
         req_user_department_id?: number | null,
         req_user_section_id?: number | null,
         req_user_position_id?: number | null,
-        reviewer_user_id?: number | null,
-        assigned_to_user_id?: number | null,
-        assigned_at?: Date | null,
-        workflow_execution_id?: string | null,
-        request_id?: string | null,
-        tender_date_of_submission?: Date | null,
-        tender_phone?: string | null,
-        budget_code?: string | null,
+        reviewer_user_id?: number | null,
+        assigned_to_user_id?: number | null,
+        assigned_at?: Date | null,
+        workflow_execution_id?: string | null,
+        request_id?: string | null,
+        tender_date_of_submission?: Date | null,
+        tender_phone?: string | null,
+        budget_code?: string | null,
         estimated_cost?: string | null,
         implementation_period?: string | null,
         requesting_entity?: string | null,
@@ -128,13 +128,13 @@ export class RespondToEnquiriesRequest extends BaseModel {
         this.req_user_position_id = req_user_position_id || 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.request_id = request_id || null;
-        this.tender_date_of_submission = tender_date_of_submission ?? null;
-        this.tender_phone = tender_phone ?? null;
-        this.budget_code = budget_code ?? null;
+        this.assigned_at = assigned_at || null;
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.reference_number = null;
+        this.request_id = request_id || null;
+        this.tender_date_of_submission = tender_date_of_submission ?? null;
+        this.tender_phone = tender_phone ?? null;
+        this.budget_code = budget_code ?? null;
         this.estimated_cost = estimated_cost ?? null;
         this.implementation_period = implementation_period ?? null;
         this.requesting_entity = requesting_entity ?? null;

package/src/models/ServiceSlaApprovalModel.ts

@@ -46,6 +46,18 @@ export class ServiceSlaApproval extends BaseModel {
     @Column({ type: "int", nullable: true })
     section_id: number | null;
 
+    /** Mirrors native approval `delegate_user_id` (IT master tables may use `delegation_user_id`). */
+    @Column({ type: "int", nullable: true })
+    delegate_user_id: number | null;
+
+    /** Mirrors native approval `approved_by` (acting user when status was last resolved). */
+    @Column({ type: "int", nullable: true })
+    approved_by: number | null;
+
+    /** Mirrors native approval comment / rejection reason. */
+    @Column({ type: "varchar", length: 255, nullable: true })
+    comment: string | null;
+
     constructor() {
         super();
     }

package/src/models/SkillsEnhancementRequestModel.ts

@@ -68,8 +68,8 @@ export class SkillsEnhancementRequest extends BaseModel {
     @Column({ type: "varchar", length: 255, nullable: false })
     issuing_authority: string;
 
-    @Column({ type: "text", nullable: true })
-    skill_summary: string | null;
+    @Column({ type: "text", nullable: true })
+    skill_summary: string | null;
 
     @Column({ type: "text", nullable: true })
     additional_info_requested: string | null;
@@ -86,13 +86,13 @@ export class SkillsEnhancementRequest extends BaseModel {
         reviewer_user_id?: number | null,
         assigned_to_user_id?: number | null,
         assigned_at?: Date | null,
-        workflow_execution_id?: string | null,
-        certification_title?: string,
-        skill_category?: SkillCategory,
-        issuing_authority?: string,
-        skill_summary?: string | null,
-        additional_info_requested?: string | null
-    ) {
+        workflow_execution_id?: string | null,
+        certification_title?: string,
+        skill_category?: SkillCategory,
+        issuing_authority?: string,
+        skill_summary?: string | null,
+        additional_info_requested?: string | null
+    ) {
         super();
         this.user_id = user_id;
         this.status = status;
@@ -105,11 +105,11 @@ export class SkillsEnhancementRequest extends BaseModel {
         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.certification_title = certification_title || "";
-        this.skill_category = skill_category || SkillCategory.TECHNICAL;
-        this.issuing_authority = issuing_authority || "";
-        this.skill_summary = skill_summary || null;
-        this.additional_info_requested = additional_info_requested || null;
-    }
-}
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.certification_title = certification_title || "";
+        this.skill_category = skill_category || SkillCategory.TECHNICAL;
+        this.issuing_authority = issuing_authority || "";
+        this.skill_summary = skill_summary || null;
+        this.additional_info_requested = additional_info_requested || null;
+    }
+}

package/src/models/UserSkillModel.ts

@@ -1,56 +1,56 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-import { SkillCategory } from "./SkillsEnhancementRequestModel";
-
-@Entity({ name: "user_skills" })
-export class UserSkill extends BaseModel {
-    @Column({ type: "integer", nullable: false })
-    user_id: number;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    skill_name: string;
-
-    @Column({ type: "enum", enum: SkillCategory, nullable: true })
-    skill_category: SkillCategory | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    issuing_authority: string | null;
-
-    @Column({ type: "date", nullable: true })
-    completion_date: Date | null;
-
-    @Column({ type: "text", nullable: true })
-    skill_summary: string | null;
-
-    @Column({ type: "integer", nullable: true })
-    source_request_id: number | null;
-
-    @Column({ type: "varchar", length: 50, nullable: true })
-    source_request_type: string | null;
-
-    @Column({ type: "boolean", nullable: false, default: true })
-    is_active: boolean;
-
-    constructor(
-        user_id: number,
-        skill_name: string,
-        skill_category?: SkillCategory | null,
-        issuing_authority?: string | null,
-        completion_date?: Date | null,
-        skill_summary?: string | null,
-        source_request_id?: number | null,
-        source_request_type?: string | null,
-        is_active?: boolean
-    ) {
-        super();
-        this.user_id = user_id;
-        this.skill_name = skill_name;
-        this.skill_category = skill_category || null;
-        this.issuing_authority = issuing_authority || null;
-        this.completion_date = completion_date || null;
-        this.skill_summary = skill_summary || null;
-        this.source_request_id = source_request_id || null;
-        this.source_request_type = source_request_type || null;
-        this.is_active = is_active !== undefined ? is_active : true;
-    }
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import { SkillCategory } from "./SkillsEnhancementRequestModel";
+
+@Entity({ name: "user_skills" })
+export class UserSkill extends BaseModel {
+    @Column({ type: "integer", nullable: false })
+    user_id: number;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    skill_name: string;
+
+    @Column({ type: "enum", enum: SkillCategory, nullable: true })
+    skill_category: SkillCategory | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    issuing_authority: string | null;
+
+    @Column({ type: "date", nullable: true })
+    completion_date: Date | null;
+
+    @Column({ type: "text", nullable: true })
+    skill_summary: string | null;
+
+    @Column({ type: "integer", nullable: true })
+    source_request_id: number | null;
+
+    @Column({ type: "varchar", length: 50, nullable: true })
+    source_request_type: string | null;
+
+    @Column({ type: "boolean", nullable: false, default: true })
+    is_active: boolean;
+
+    constructor(
+        user_id: number,
+        skill_name: string,
+        skill_category?: SkillCategory | null,
+        issuing_authority?: string | null,
+        completion_date?: Date | null,
+        skill_summary?: string | null,
+        source_request_id?: number | null,
+        source_request_type?: string | null,
+        is_active?: boolean
+    ) {
+        super();
+        this.user_id = user_id;
+        this.skill_name = skill_name;
+        this.skill_category = skill_category || null;
+        this.issuing_authority = issuing_authority || null;
+        this.completion_date = completion_date || null;
+        this.skill_summary = skill_summary || null;
+        this.source_request_id = source_request_id || null;
+        this.source_request_type = source_request_type || null;
+        this.is_active = is_active !== undefined ? is_active : true;
+    }
+}

package/src/sla/sla-approval-mirror.ts

@@ -0,0 +1,56 @@
+/** Fields on `sla_approval` mirrored from native service approval tables. */
+export type SlaApprovalMirrorPatch = Partial<{
+    delegate_user_id: number | null;
+    approved_by: number | null;
+    comment: string | null;
+}>;
+
+function toIntOrNull(v: unknown): number | null {
+    if (v === undefined || v === null || v === "") {
+        return null;
+    }
+    const n = Number(v);
+    return Number.isFinite(n) ? n : null;
+}
+
+/**
+ * Builds mirror patch for `sla_approval` from a native approval row
+ * (`delegate_user_id` or IT `delegation_user_id`, `approved_by`, `comment`).
+ */
+export function buildSlaApprovalMirror(
+    fromNativeRow?: Record<string, unknown> | null,
+    overrides?: SlaApprovalMirrorPatch
+): SlaApprovalMirrorPatch {
+    const row = fromNativeRow ?? {};
+    const delegate =
+        row.delegate_user_id !== undefined
+            ? toIntOrNull(row.delegate_user_id)
+            : toIntOrNull(row.delegation_user_id);
+
+    const approvedBy = toIntOrNull(row.approved_by);
+    const comment =
+        row.comment !== undefined && row.comment !== null
+            ? String(row.comment).slice(0, 255)
+            : null;
+
+    const out: SlaApprovalMirrorPatch = {
+        delegate_user_id: delegate,
+        approved_by: approvedBy,
+        comment
+    };
+
+    if (overrides) {
+        if (overrides.delegate_user_id !== undefined) {
+            out.delegate_user_id = overrides.delegate_user_id;
+        }
+        if (overrides.approved_by !== undefined) {
+            out.approved_by = overrides.approved_by;
+        }
+        if (overrides.comment !== undefined) {
+            out.comment =
+                overrides.comment != null ? String(overrides.comment).slice(0, 255) : null;
+        }
+    }
+
+    return out;
+}

package/src/sla/sla-table-sync.service.ts

@@ -9,6 +9,9 @@ export type PatchSlaApprovalTableInput = Partial<{
     department_id: number | null;
     section_id: number | null;
     level: number;
+    delegate_user_id: number | null;
+    approved_by: number | null;
+    comment: string | null;
 }>;
 
 export type PatchSlaRequestTableInput = Partial<{