@platform-modules/civil-aviation-authority 2.3.299 → 2.3.301

package/.env

@@ -2,17 +2,11 @@ DB_HOST=164.52.222.169
 DB_PORT=5432 
 DB_USER=postgres_admin_user
 DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
-DB_NAME=CAA_DEV
+DB_NAME=CAA
 
 
 # DB_HOST=localhost
 # DB_PORT=5432 
 # DB_USER=postgres
 # DB_PASS=stevejobs
-# DB_NAME=CAA
-
-# DB_HOST=10.44.3.201
-# DB_PORT=5432 
-# DB_USER=appuser
-# DB_PASS=HamaCaa7489
-# DB_NAME=caa_prd_db
+# DB_NAME=CAA

package/dist/models/FollowUpReportRequestModel.js

@@ -80,7 +80,12 @@ __decorate([
     __metadata("design:type", String)
 ], FollowUpReportRequests.prototype, "subject", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    (0, typeorm_1.Column)({
+        type: 'varchar',
+        length: 100,
+        nullable: false,
+        default: FollowUpReportSubjectClassification.NORMAL,
+    }),
     __metadata("design:type", String)
 ], FollowUpReportRequests.prototype, "subject_classification", void 0);
 __decorate([

package/dist/models/StudyLeaveWorkflowModel.d.ts

@@ -15,7 +15,9 @@ export declare class StudyLeaveWorkFlow extends BaseModel {
     approver_role_id: number | null;
     approver_user_id: number | null;
     approved_by: number | null;
+    department_id: number | null;
+    section_id: number | null;
     status: StudyLeaveWorkFlowStatus;
     status_ar: string | null;
-    constructor(request_id: number, content: string, status: StudyLeaveWorkFlowStatus, service_id?: number | null, sub_service_id?: number | null, order?: number, approver_role_id?: number | null, approver_user_id?: number | null, approved_by?: number | null);
+    constructor(request_id: number, content: string, status: StudyLeaveWorkFlowStatus, service_id?: number | null, sub_service_id?: number | null, order?: number, approver_role_id?: number | null, approver_user_id?: number | null, approved_by?: number | null, department_id?: number | null, section_id?: number | null);
 }

package/dist/models/StudyLeaveWorkflowModel.js

@@ -20,7 +20,7 @@ var StudyLeaveWorkFlowStatus;
     StudyLeaveWorkFlowStatus["REJECTED"] = "Rejected";
 })(StudyLeaveWorkFlowStatus || (exports.StudyLeaveWorkFlowStatus = StudyLeaveWorkFlowStatus = {}));
 let StudyLeaveWorkFlow = class StudyLeaveWorkFlow extends BaseModel_1.BaseModel {
-    constructor(request_id, content, status, service_id, sub_service_id, order, approver_role_id, approver_user_id, approved_by) {
+    constructor(request_id, content, status, service_id, sub_service_id, order, approver_role_id, approver_user_id, approved_by, department_id, section_id) {
         super();
         this.request_id = request_id;
         this.service_id = service_id || null;
@@ -31,6 +31,8 @@ let StudyLeaveWorkFlow = class StudyLeaveWorkFlow extends BaseModel_1.BaseModel
         this.approver_role_id = approver_role_id || null;
         this.approver_user_id = approver_user_id || null;
         this.approved_by = approved_by || null;
+        this.department_id = department_id || null;
+        this.section_id = section_id || null;
     }
 };
 exports.StudyLeaveWorkFlow = StudyLeaveWorkFlow;
@@ -70,6 +72,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Object)
 ], StudyLeaveWorkFlow.prototype, "approved_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], StudyLeaveWorkFlow.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], StudyLeaveWorkFlow.prototype, "section_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
@@ -85,5 +95,5 @@ __decorate([
 ], StudyLeaveWorkFlow.prototype, "status_ar", void 0);
 exports.StudyLeaveWorkFlow = StudyLeaveWorkFlow = __decorate([
     (0, typeorm_1.Entity)({ name: "study_leave_workflows" }),
-    __metadata("design:paramtypes", [Number, String, String, Object, Object, Number, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, String, String, Object, Object, Number, Object, Object, Object, Object, Object])
 ], StudyLeaveWorkFlow);

package/dist/models/TrainingWorkflowModel.d.ts

@@ -15,7 +15,9 @@ export declare class TrainingWorkFlow extends BaseModel {
     approver_role_id: number | null;
     approver_user_id: number | null;
     approved_by: number | null;
+    department_id: number | null;
+    section_id: number | null;
     status: TrainingWorkFlowStatus;
     status_ar: string | null;
-    constructor(request_id: number, content: string, status: TrainingWorkFlowStatus, service_id?: number | null, sub_service_id?: number | null, order?: number, approver_role_id?: number | null, approver_user_id?: number | null, approved_by?: number | null);
+    constructor(request_id: number, content: string, status: TrainingWorkFlowStatus, service_id?: number | null, sub_service_id?: number | null, order?: number, approver_role_id?: number | null, approver_user_id?: number | null, approved_by?: number | null, department_id?: number | null, section_id?: number | null);
 }

package/dist/models/TrainingWorkflowModel.js

@@ -20,7 +20,7 @@ var TrainingWorkFlowStatus;
     TrainingWorkFlowStatus["REJECTED"] = "Rejected";
 })(TrainingWorkFlowStatus || (exports.TrainingWorkFlowStatus = TrainingWorkFlowStatus = {}));
 let TrainingWorkFlow = class TrainingWorkFlow extends BaseModel_1.BaseModel {
-    constructor(request_id, content, status, service_id, sub_service_id, order, approver_role_id, approver_user_id, approved_by) {
+    constructor(request_id, content, status, service_id, sub_service_id, order, approver_role_id, approver_user_id, approved_by, department_id, section_id) {
         super();
         this.request_id = request_id;
         this.service_id = service_id || null;
@@ -31,6 +31,8 @@ let TrainingWorkFlow = class TrainingWorkFlow extends BaseModel_1.BaseModel {
         this.approver_role_id = approver_role_id || null;
         this.approver_user_id = approver_user_id || null;
         this.approved_by = approved_by || null;
+        this.department_id = department_id || null;
+        this.section_id = section_id || null;
     }
 };
 exports.TrainingWorkFlow = TrainingWorkFlow;
@@ -70,6 +72,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Object)
 ], TrainingWorkFlow.prototype, "approved_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], TrainingWorkFlow.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], TrainingWorkFlow.prototype, "section_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
@@ -85,5 +95,5 @@ __decorate([
 ], TrainingWorkFlow.prototype, "status_ar", void 0);
 exports.TrainingWorkFlow = TrainingWorkFlow = __decorate([
     (0, typeorm_1.Entity)({ name: "training_workflows" }),
-    __metadata("design:paramtypes", [Number, String, String, Object, Object, Number, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, String, String, Object, Object, Number, Object, Object, Object, Object, Object])
 ], TrainingWorkFlow);

package/package.json

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

package/scripts/run-enum-fix.js

@@ -1,30 +1,51 @@
-require('dotenv').config();
 const fs = require('fs');
 const path = require('path');
 const { Client } = require('pg');
 
-async function main() {
-  const sqlPath = path.join(__dirname, '..', 'sql', 'fix_maintenance_subject_classification_enum_2026_07.sql');
-  const sql = fs.readFileSync(sqlPath, 'utf8');
+function loadEnv() {
+  try {
+    require('dotenv').config({ path: path.join(__dirname, '..', '.env') });
+  } catch {
+    // dotenv is optional at runtime if env vars are already set
+  }
+}
 
-  const client = new Client({
+function getDbConfig() {
+  const config = {
     host: process.env.DB_HOST,
     port: Number(process.env.DB_PORT || 5432),
     user: process.env.DB_USER,
     password: process.env.DB_PASS,
     database: process.env.DB_NAME,
-  });
+  };
+
+  const missing = ['DB_HOST', 'DB_USER', 'DB_PASS', 'DB_NAME'].filter((key) => !process.env[key]);
+  if (missing.length > 0) {
+    throw new Error(
+      `Missing database env vars in shared_models/.env: ${missing.join(', ')}`,
+    );
+  }
+
+  return config;
+}
+
+async function main() {
+  loadEnv();
+
+  const sqlPath = path.join(__dirname, '..', 'sql', 'fix_maintenance_subject_classification_enum_2026_07.sql');
+  const sql = fs.readFileSync(sqlPath, 'utf8');
+  const client = new Client(getDbConfig());
 
   await client.connect();
   try {
     await client.query(sql);
-    console.log('✅ Enum repair SQL applied successfully.');
+    console.log('Enum repair SQL applied successfully.');
   } finally {
     await client.end();
   }
 }
 
 main().catch((error) => {
-  console.error('❌ Enum repair failed:', error.message);
+  console.error('Enum repair failed:', error.message);
   process.exit(1);
 });

package/sql/caa_api_payload_changes_2026_07.sql

@@ -32,13 +32,62 @@ ALTER TABLE cyber_security_risk_management_risks
   ADD COLUMN IF NOT EXISTS action TEXT;
 
 -- 7. Follow-up report: subject_classification as varchar (avoids TypeORM PG enum sync failures)
-ALTER TABLE followup_report_items
-  ALTER COLUMN subject_classification TYPE VARCHAR(100)
-  USING subject_classification::text;
+DO $$
+BEGIN
+  IF EXISTS (
+    SELECT 1 FROM information_schema.tables
+    WHERE table_schema = 'public' AND table_name = 'followup_report_requests'
+  ) THEN
+    IF NOT EXISTS (
+      SELECT 1 FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_requests'
+        AND column_name = 'subject_classification'
+    ) THEN
+      ALTER TABLE followup_report_requests
+        ADD COLUMN subject_classification VARCHAR(100);
+    END IF;
+
+    BEGIN
+      ALTER TABLE followup_report_requests
+        ALTER COLUMN subject_classification TYPE VARCHAR(100)
+        USING COALESCE(subject_classification::text, 'Normal');
+    EXCEPTION WHEN OTHERS THEN NULL;
+    END;
+
+    UPDATE followup_report_requests
+    SET subject_classification = 'Normal'
+    WHERE subject_classification IS NULL OR TRIM(subject_classification) = '';
+
+    ALTER TABLE followup_report_requests
+      ALTER COLUMN subject_classification SET DEFAULT 'Normal';
 
-ALTER TABLE followup_report_requests
-  ALTER COLUMN subject_classification TYPE VARCHAR(100)
-  USING subject_classification::text;
+    ALTER TABLE followup_report_requests
+      ALTER COLUMN subject_classification SET NOT NULL;
+  END IF;
+
+  IF EXISTS (
+    SELECT 1 FROM information_schema.tables
+    WHERE table_schema = 'public' AND table_name = 'followup_report_items'
+  ) THEN
+    IF NOT EXISTS (
+      SELECT 1 FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_items'
+        AND column_name = 'subject_classification'
+    ) THEN
+      ALTER TABLE followup_report_items
+        ADD COLUMN subject_classification VARCHAR(100);
+    END IF;
+
+    BEGIN
+      ALTER TABLE followup_report_items
+        ALTER COLUMN subject_classification TYPE VARCHAR(100)
+        USING subject_classification::text;
+    EXCEPTION WHEN OTHERS THEN NULL;
+    END;
+  END IF;
+END $$;
 
 DROP TYPE IF EXISTS maintenance_subject_classification_en_old;
 

package/sql/fix_maintenance_subject_classification_enum_2026_07.sql

@@ -1,20 +1,76 @@
--- Repair stuck TypeORM enum swap for follow-up report subject_classification.
--- Safe to re-run.
+-- Repair follow-up report subject_classification for TypeORM schema sync.
+-- Safe to re-run. Skips tables/columns that do not exist yet.
 
--- 1) Move report items off PG enum (_old or live) -> varchar
-ALTER TABLE followup_report_items
-  ALTER COLUMN subject_classification TYPE VARCHAR(100)
-  USING subject_classification::text;
+DO $$
+BEGIN
+  IF EXISTS (
+    SELECT 1
+    FROM information_schema.tables
+    WHERE table_schema = 'public'
+      AND table_name = 'followup_report_requests'
+  ) THEN
+    IF NOT EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_requests'
+        AND column_name = 'subject_classification'
+    ) THEN
+      ALTER TABLE followup_report_requests
+        ADD COLUMN subject_classification VARCHAR(100);
+    END IF;
+
+    BEGIN
+      ALTER TABLE followup_report_requests
+        ALTER COLUMN subject_classification TYPE VARCHAR(100)
+        USING COALESCE(subject_classification::text, 'Normal');
+    EXCEPTION
+      WHEN OTHERS THEN
+        NULL;
+    END;
+
+    UPDATE followup_report_requests
+    SET subject_classification = 'Normal'
+    WHERE subject_classification IS NULL
+       OR TRIM(subject_classification) = '';
+
+    ALTER TABLE followup_report_requests
+      ALTER COLUMN subject_classification SET DEFAULT 'Normal';
 
--- 2) Move requests off PG enum (_old or live) -> varchar
-ALTER TABLE followup_report_requests
-  ALTER COLUMN subject_classification TYPE VARCHAR(100)
-  USING subject_classification::text;
+    ALTER TABLE followup_report_requests
+      ALTER COLUMN subject_classification SET NOT NULL;
+  END IF;
+
+  IF EXISTS (
+    SELECT 1
+    FROM information_schema.tables
+    WHERE table_schema = 'public'
+      AND table_name = 'followup_report_items'
+  ) THEN
+    IF NOT EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'followup_report_items'
+        AND column_name = 'subject_classification'
+    ) THEN
+      ALTER TABLE followup_report_items
+        ADD COLUMN subject_classification VARCHAR(100);
+    END IF;
+
+    BEGIN
+      ALTER TABLE followup_report_items
+        ALTER COLUMN subject_classification TYPE VARCHAR(100)
+        USING subject_classification::text;
+    EXCEPTION
+      WHEN OTHERS THEN
+        NULL;
+    END;
+  END IF;
+END $$;
 
--- 3) Drop leftover TypeORM enum type if nothing depends on it
 DROP TYPE IF EXISTS maintenance_subject_classification_en_old;
 
--- 4) Drop orphaned live enum only when no column uses it anymore
 DO $$
 BEGIN
   IF NOT EXISTS (

package/src/models/FollowUpReportRequestModel.ts

@@ -62,7 +62,12 @@ export class FollowUpReportRequests extends BaseModel {
   @Column({ type: 'varchar', length: 500, nullable: false })
   subject: string;
 
-  @Column({ type: 'varchar', length: 100, nullable: false })
+  @Column({
+    type: 'varchar',
+    length: 100,
+    nullable: false,
+    default: FollowUpReportSubjectClassification.NORMAL,
+  })
   subject_classification: FollowUpReportSubjectClassification;
 
   @Column({ type: 'text', nullable: false })

package/src/models/StudyLeaveWorkflowModel.ts

@@ -37,6 +37,12 @@ export class StudyLeaveWorkFlow extends BaseModel {
     @Column({ type: "integer", nullable: true })
     approved_by: number | null;
 
+    @Column({ type: "integer", nullable: true })
+    department_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    section_id: number | null;
+
     @Column({
         type: "enum",
         enum: StudyLeaveWorkFlowStatus,
@@ -57,7 +63,9 @@ export class StudyLeaveWorkFlow extends BaseModel {
         order?: number,
         approver_role_id?: number | null,
         approver_user_id?: number | null,
-        approved_by?: number | null
+        approved_by?: number | null,
+        department_id?: number | null,
+        section_id?: number | null
     ) {
         super();
         this.request_id = request_id;
@@ -69,6 +77,8 @@ export class StudyLeaveWorkFlow extends BaseModel {
         this.approver_role_id = approver_role_id || null;
         this.approver_user_id = approver_user_id || null;
         this.approved_by = approved_by || null;
+        this.department_id = department_id || null;
+        this.section_id = section_id || null;
     }
 }
 

package/src/models/TrainingWorkflowModel.ts

@@ -37,6 +37,12 @@ export class TrainingWorkFlow extends BaseModel {
     @Column({ type: "integer", nullable: true })
     approved_by: number | null;
 
+    @Column({ type: "integer", nullable: true })
+    department_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    section_id: number | null;
+
     @Column({
         type: "enum",
         enum: TrainingWorkFlowStatus,
@@ -57,7 +63,9 @@ export class TrainingWorkFlow extends BaseModel {
         order?: number,
         approver_role_id?: number | null,
         approver_user_id?: number | null,
-        approved_by?: number | null
+        approved_by?: number | null,
+        department_id?: number | null,
+        section_id?: number | null
     ) {
         super();
         this.request_id = request_id;
@@ -69,6 +77,8 @@ export class TrainingWorkFlow extends BaseModel {
         this.approver_role_id = approver_role_id || null;
         this.approver_user_id = approver_user_id || null;
         this.approved_by = approved_by || null;
+        this.department_id = department_id || null;
+        this.section_id = section_id || null;
     }
 }