@platform-modules/civil-aviation-authority 2.3.331 → 2.3.333

package/dist/models/AnnualTrainingPlanRequestModel.d.ts

@@ -43,5 +43,6 @@ export declare class AnnualTrainingPlanRequest extends BaseModel {
     total_participants: number;
     import_status: AnnualTrainingPlanImportStatus | null;
     submission_source: AnnualTrainingPlanSubmissionSource | null;
+    reference_number: string | null;
     constructor(user_id: number, status?: AnnualTrainingPlanRequestStatus, service_id?: number | null, sub_service_id?: number | null, 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, directarate?: string | null);
 }

package/dist/models/AnnualTrainingPlanRequestModel.js

@@ -62,6 +62,7 @@ let AnnualTrainingPlanRequest = class AnnualTrainingPlanRequest extends BaseMode
         this.total_participants = 0;
         this.import_status = null;
         this.submission_source = null;
+        this.reference_number = null;
     }
 };
 exports.AnnualTrainingPlanRequest = AnnualTrainingPlanRequest;
@@ -170,6 +171,10 @@ __decorate([
     }),
     __metadata("design:type", Object)
 ], AnnualTrainingPlanRequest.prototype, "submission_source", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 20, nullable: true, unique: true }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanRequest.prototype, "reference_number", void 0);
 exports.AnnualTrainingPlanRequest = AnnualTrainingPlanRequest = __decorate([
     (0, typeorm_1.Entity)({ name: "annual_training_plan_requests" }),
     __metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.3.331",
+  "version": "2.3.333",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
   "scripts": {

package/sql/add_annual_training_plan_reference_number.sql

@@ -0,0 +1,6 @@
+ALTER TABLE annual_training_plan_requests
+  ADD COLUMN IF NOT EXISTS reference_number VARCHAR(20);
+
+CREATE UNIQUE INDEX IF NOT EXISTS uq_annual_training_plan_requests_reference_number
+  ON annual_training_plan_requests(reference_number)
+  WHERE reference_number IS NOT NULL;

package/sql/annual_training_plan_department_plans.sql

@@ -1,80 +1,80 @@
--- One plan per course inside an annual training plan request.
--- Run once per environment before using per-plan approval.
-
-DO $$ BEGIN
-  CREATE TYPE annual_training_plan_department_plans_status_enum
-    AS ENUM ('Pending', 'Approved', 'Rejected');
-EXCEPTION
-  WHEN duplicate_object THEN NULL;
-END $$;
-
-DO $$ BEGIN
-  CREATE TYPE annual_training_plan_requests_submission_source_enum
-    AS ENUM ('Excel', 'Direct');
-EXCEPTION
-  WHEN duplicate_object THEN NULL;
-END $$;
-
-CREATE TABLE IF NOT EXISTS annual_training_plan_department_plans (
-  id SERIAL PRIMARY KEY,
-  request_id INTEGER NOT NULL REFERENCES annual_training_plan_requests(id) ON DELETE CASCADE,
-  department_id INTEGER NOT NULL,
-  status annual_training_plan_department_plans_status_enum NOT NULL DEFAULT 'Pending',
-  created_by INTEGER,
-  updated_by INTEGER,
-  created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  is_deleted BOOLEAN DEFAULT FALSE
-);
-
-CREATE INDEX IF NOT EXISTS ix_annual_training_plan_department_plans_request
-  ON annual_training_plan_department_plans(request_id);
-
-CREATE TABLE IF NOT EXISTS annual_training_plan_department_plan_decisions (
-  id SERIAL PRIMARY KEY,
-  department_plan_id INTEGER NOT NULL REFERENCES annual_training_plan_department_plans(id) ON DELETE CASCADE,
-  approval_level INTEGER NOT NULL,
-  status annual_training_plan_department_plans_status_enum NOT NULL,
-  comment TEXT,
-  decided_by INTEGER,
-  created_by INTEGER,
-  updated_by INTEGER,
-  created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  is_deleted BOOLEAN DEFAULT FALSE
-);
-
-CREATE INDEX IF NOT EXISTS ix_atp_department_plan_decisions_plan_level
-  ON annual_training_plan_department_plan_decisions(department_plan_id, approval_level);
-
-ALTER TABLE annual_training_plan_items
-  ADD COLUMN IF NOT EXISTS department_plan_id INTEGER
-    REFERENCES annual_training_plan_department_plans(id) ON DELETE SET NULL;
-
-ALTER TABLE annual_training_plan_requests
-  ADD COLUMN IF NOT EXISTS submission_source annual_training_plan_requests_submission_source_enum;
-
-DO $$
-DECLARE
-  rec RECORD;
-  new_id INTEGER;
-BEGIN
-  FOR rec IN
-    SELECT id, request_id, department_id, created_by, updated_by, created_at, updated_at
-    FROM annual_training_plan_items
-    WHERE is_deleted = false
-      AND department_plan_id IS NULL
-  LOOP
-    INSERT INTO annual_training_plan_department_plans (
-      request_id, department_id, status, created_by, updated_by, created_at, updated_at, is_deleted
-    ) VALUES (
-      rec.request_id, rec.department_id, 'Pending', rec.created_by, rec.updated_by,
-      rec.created_at, rec.updated_at, false
-    )
-    RETURNING id INTO new_id;
-
-    UPDATE annual_training_plan_items
-    SET department_plan_id = new_id
-    WHERE id = rec.id;
-  END LOOP;
-END $$;
+-- One plan per course inside an annual training plan request.
+-- Run once per environment before using per-plan approval.
+
+DO $$ BEGIN
+  CREATE TYPE annual_training_plan_department_plans_status_enum
+    AS ENUM ('Pending', 'Approved', 'Rejected');
+EXCEPTION
+  WHEN duplicate_object THEN NULL;
+END $$;
+
+DO $$ BEGIN
+  CREATE TYPE annual_training_plan_requests_submission_source_enum
+    AS ENUM ('Excel', 'Direct');
+EXCEPTION
+  WHEN duplicate_object THEN NULL;
+END $$;
+
+CREATE TABLE IF NOT EXISTS annual_training_plan_department_plans (
+  id SERIAL PRIMARY KEY,
+  request_id INTEGER NOT NULL REFERENCES annual_training_plan_requests(id) ON DELETE CASCADE,
+  department_id INTEGER NOT NULL,
+  status annual_training_plan_department_plans_status_enum NOT NULL DEFAULT 'Pending',
+  created_by INTEGER,
+  updated_by INTEGER,
+  created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  is_deleted BOOLEAN DEFAULT FALSE
+);
+
+CREATE INDEX IF NOT EXISTS ix_annual_training_plan_department_plans_request
+  ON annual_training_plan_department_plans(request_id);
+
+CREATE TABLE IF NOT EXISTS annual_training_plan_department_plan_decisions (
+  id SERIAL PRIMARY KEY,
+  department_plan_id INTEGER NOT NULL REFERENCES annual_training_plan_department_plans(id) ON DELETE CASCADE,
+  approval_level INTEGER NOT NULL,
+  status annual_training_plan_department_plans_status_enum NOT NULL,
+  comment TEXT,
+  decided_by INTEGER,
+  created_by INTEGER,
+  updated_by INTEGER,
+  created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  is_deleted BOOLEAN DEFAULT FALSE
+);
+
+CREATE INDEX IF NOT EXISTS ix_atp_department_plan_decisions_plan_level
+  ON annual_training_plan_department_plan_decisions(department_plan_id, approval_level);
+
+ALTER TABLE annual_training_plan_items
+  ADD COLUMN IF NOT EXISTS department_plan_id INTEGER
+    REFERENCES annual_training_plan_department_plans(id) ON DELETE SET NULL;
+
+ALTER TABLE annual_training_plan_requests
+  ADD COLUMN IF NOT EXISTS submission_source annual_training_plan_requests_submission_source_enum;
+
+DO $$
+DECLARE
+  rec RECORD;
+  new_id INTEGER;
+BEGIN
+  FOR rec IN
+    SELECT id, request_id, department_id, created_by, updated_by, created_at, updated_at
+    FROM annual_training_plan_items
+    WHERE is_deleted = false
+      AND department_plan_id IS NULL
+  LOOP
+    INSERT INTO annual_training_plan_department_plans (
+      request_id, department_id, status, created_by, updated_by, created_at, updated_at, is_deleted
+    ) VALUES (
+      rec.request_id, rec.department_id, 'Pending', rec.created_by, rec.updated_by,
+      rec.created_at, rec.updated_at, false
+    )
+    RETURNING id INTO new_id;
+
+    UPDATE annual_training_plan_items
+    SET department_plan_id = new_id
+    WHERE id = rec.id;
+  END LOOP;
+END $$;

package/src/models/AnnualTrainingPlanDepartmentPlanDecisionModel.ts

@@ -1,33 +1,33 @@
-import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
-import { BaseModel } from "./BaseModel";
-import {
-  AnnualTrainingPlanDepartmentPlan,
-  AnnualTrainingPlanDepartmentPlanStatus
-} from "./AnnualTrainingPlanDepartmentPlanModel";
-
-@Entity({ name: "annual_training_plan_department_plan_decisions" })
-@Index(["department_plan_id", "approval_level"])
-export class AnnualTrainingPlanDepartmentPlanDecision extends BaseModel {
-  @Column({ type: "integer", nullable: false })
-  department_plan_id: number;
-
-  @Column({ type: "integer", nullable: false })
-  approval_level: number;
-
-  @Column({
-    type: "enum",
-    enum: AnnualTrainingPlanDepartmentPlanStatus,
-    nullable: false
-  })
-  status: AnnualTrainingPlanDepartmentPlanStatus;
-
-  @Column({ type: "text", nullable: true })
-  comment: string | null;
-
-  @Column({ type: "integer", nullable: true })
-  decided_by: number | null;
-
-  @ManyToOne(() => AnnualTrainingPlanDepartmentPlan, { onDelete: "CASCADE" })
-  @JoinColumn({ name: "department_plan_id" })
-  department_plan: AnnualTrainingPlanDepartmentPlan;
-}
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import {
+  AnnualTrainingPlanDepartmentPlan,
+  AnnualTrainingPlanDepartmentPlanStatus
+} from "./AnnualTrainingPlanDepartmentPlanModel";
+
+@Entity({ name: "annual_training_plan_department_plan_decisions" })
+@Index(["department_plan_id", "approval_level"])
+export class AnnualTrainingPlanDepartmentPlanDecision extends BaseModel {
+  @Column({ type: "integer", nullable: false })
+  department_plan_id: number;
+
+  @Column({ type: "integer", nullable: false })
+  approval_level: number;
+
+  @Column({
+    type: "enum",
+    enum: AnnualTrainingPlanDepartmentPlanStatus,
+    nullable: false
+  })
+  status: AnnualTrainingPlanDepartmentPlanStatus;
+
+  @Column({ type: "text", nullable: true })
+  comment: string | null;
+
+  @Column({ type: "integer", nullable: true })
+  decided_by: number | null;
+
+  @ManyToOne(() => AnnualTrainingPlanDepartmentPlan, { onDelete: "CASCADE" })
+  @JoinColumn({ name: "department_plan_id" })
+  department_plan: AnnualTrainingPlanDepartmentPlan;
+}

package/src/models/AnnualTrainingPlanDepartmentPlanModel.ts

@@ -1,31 +1,31 @@
-import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
-import { BaseModel } from "./BaseModel";
-import { AnnualTrainingPlanRequest } from "./AnnualTrainingPlanRequestModel";
-
-export enum AnnualTrainingPlanDepartmentPlanStatus {
-  PENDING = "Pending",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-@Entity({ name: "annual_training_plan_department_plans" })
-@Index(["request_id"])
-export class AnnualTrainingPlanDepartmentPlan extends BaseModel {
-  @Column({ type: "integer", nullable: false })
-  request_id: number;
-
-  @Column({ type: "integer", nullable: false })
-  department_id: number;
-
-  @Column({
-    type: "enum",
-    enum: AnnualTrainingPlanDepartmentPlanStatus,
-    default: AnnualTrainingPlanDepartmentPlanStatus.PENDING,
-    nullable: false
-  })
-  status: AnnualTrainingPlanDepartmentPlanStatus;
-
-  @ManyToOne(() => AnnualTrainingPlanRequest, { onDelete: "CASCADE" })
-  @JoinColumn({ name: "request_id" })
-  request: AnnualTrainingPlanRequest;
-}
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import { AnnualTrainingPlanRequest } from "./AnnualTrainingPlanRequestModel";
+
+export enum AnnualTrainingPlanDepartmentPlanStatus {
+  PENDING = "Pending",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: "annual_training_plan_department_plans" })
+@Index(["request_id"])
+export class AnnualTrainingPlanDepartmentPlan extends BaseModel {
+  @Column({ type: "integer", nullable: false })
+  request_id: number;
+
+  @Column({ type: "integer", nullable: false })
+  department_id: number;
+
+  @Column({
+    type: "enum",
+    enum: AnnualTrainingPlanDepartmentPlanStatus,
+    default: AnnualTrainingPlanDepartmentPlanStatus.PENDING,
+    nullable: false
+  })
+  status: AnnualTrainingPlanDepartmentPlanStatus;
+
+  @ManyToOne(() => AnnualTrainingPlanRequest, { onDelete: "CASCADE" })
+  @JoinColumn({ name: "request_id" })
+  request: AnnualTrainingPlanRequest;
+}

package/src/models/AnnualTrainingPlanRequestModel.ts

@@ -109,6 +109,9 @@ export class AnnualTrainingPlanRequest extends BaseModel {
   })
   submission_source: AnnualTrainingPlanSubmissionSource | null;
 
+  @Column({ type: "varchar", length: 20, nullable: true, unique: true })
+  reference_number: string | null;
+
   constructor(
     user_id: number,
     status: AnnualTrainingPlanRequestStatus = AnnualTrainingPlanRequestStatus.PENDING,
@@ -147,6 +150,7 @@ export class AnnualTrainingPlanRequest extends BaseModel {
     this.total_participants = 0;
     this.import_status = null;
     this.submission_source = null;
+    this.reference_number = null;
   }
 }