@platform-modules/foreign-ministry 1.3.351 → 1.3.355

package/dist/models/MissionTravelClassConfigModel.js

@@ -0,0 +1,50 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MissionTravelClassConfig = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const MissionTravelPersonModel_1 = require("./MissionTravelPersonModel");
+let MissionTravelClassConfig = class MissionTravelClassConfig extends BaseModel_1.BaseModel {
+    constructor(grade, position, travel_class, description) {
+        super();
+        this.grade = grade;
+        this.position = position;
+        this.travel_class = travel_class;
+        this.description = description;
+        this.is_active = true;
+    }
+};
+exports.MissionTravelClassConfig = MissionTravelClassConfig;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], MissionTravelClassConfig.prototype, "grade", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], MissionTravelClassConfig.prototype, "position", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'enum', enum: MissionTravelPersonModel_1.TravelClass, nullable: false }),
+    __metadata("design:type", String)
+], MissionTravelClassConfig.prototype, "travel_class", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
+    __metadata("design:type", Boolean)
+], MissionTravelClassConfig.prototype, "is_active", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], MissionTravelClassConfig.prototype, "description", void 0);
+exports.MissionTravelClassConfig = MissionTravelClassConfig = __decorate([
+    (0, typeorm_1.Entity)({ name: 'mission_travel_class_config' }),
+    __metadata("design:paramtypes", [Object, Object, String, Object])
+], MissionTravelClassConfig);

package/dist/models/MissionTravelPerdiemModel.d.ts

@@ -0,0 +1,10 @@
+import { BaseModel } from './BaseModel';
+export declare class MissionTravelPerdiem extends BaseModel {
+    grade: number;
+    perdiem_amount: number;
+    currency: string | null;
+    effective_from: Date | null;
+    effective_to: Date | null;
+    is_active: boolean;
+    constructor(grade: number, perdiem_amount: number, currency: string | null, effective_from: Date | null, effective_to: Date | null);
+}

package/dist/models/MissionTravelPerdiemModel.js

@@ -0,0 +1,54 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MissionTravelPerdiem = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let MissionTravelPerdiem = class MissionTravelPerdiem extends BaseModel_1.BaseModel {
+    constructor(grade, perdiem_amount, currency, effective_from, effective_to) {
+        super();
+        this.grade = grade;
+        this.perdiem_amount = perdiem_amount;
+        this.currency = currency;
+        this.effective_from = effective_from;
+        this.effective_to = effective_to;
+        this.is_active = true;
+    }
+};
+exports.MissionTravelPerdiem = MissionTravelPerdiem;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], MissionTravelPerdiem.prototype, "grade", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: false }),
+    __metadata("design:type", Number)
+], MissionTravelPerdiem.prototype, "perdiem_amount", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], MissionTravelPerdiem.prototype, "currency", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], MissionTravelPerdiem.prototype, "effective_from", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], MissionTravelPerdiem.prototype, "effective_to", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
+    __metadata("design:type", Boolean)
+], MissionTravelPerdiem.prototype, "is_active", void 0);
+exports.MissionTravelPerdiem = MissionTravelPerdiem = __decorate([
+    (0, typeorm_1.Entity)({ name: 'mission_travel_perdiem' }),
+    __metadata("design:paramtypes", [Number, Number, Object, Object, Object])
+], MissionTravelPerdiem);

package/dist/models/SlaApprovalsViewModel.js

@@ -11,60 +11,60 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SlaApprovalsView = void 0;
 const typeorm_1 = require("typeorm");
-const VW_SLA_APPROVALS_SQL = `
-SELECT
-    sa.id AS sla_approval_id,
-    sa.source_approval_id,
-    sa.request_id,
-    sa.service_id AS service_id,
-    sa.sub_service_id AS sub_service_id,
-    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
-    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
-    sa.approver_role_id AS approval_role_id,
-    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
-    sa.department_id AS approval_department_id,
-    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
-    sa.section_id AS approval_section_id,
-    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
-    sa.approval_status::TEXT AS approval_status,
-    sr.status::TEXT AS request_status,
-    sa.level AS level,
-    sa.approver_user_id AS approver_user_id,
-    TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
-    sa.delegate_user_id AS delegate_user_id,
-    TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
-    sa.approved_by AS approved_by,
-    TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
-    sa.comment::TEXT AS comment,
-    sa.created_at AS created_at,
-    sa.updated_at AS updated_at
-FROM sla_approval sa
-INNER JOIN sla_requests sr
-    ON sr.id = (
-        SELECT MIN(sr2.id)
-        FROM sla_requests sr2
-        WHERE sr2.request_id = sa.request_id
-          AND COALESCE(sr2.is_deleted, false) = false
-          AND (sa.service_id IS NULL OR sr2.service_id = sa.service_id)
-          AND (sa.sub_service_id IS NULL OR sr2.sub_service_id = sa.sub_service_id)
-    )
-LEFT JOIN fm_services svc
-    ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
-LEFT JOIN fm_sub_services subsvc
-    ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
-LEFT JOIN departments adpt
-    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
-LEFT JOIN sections asec
-    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
-LEFT JOIN role ar
-    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
-LEFT JOIN users au
-    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
-LEFT JOIN users du
-    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
-LEFT JOIN users ab
-    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
-WHERE COALESCE(sa.is_deleted, false) = false
+const VW_SLA_APPROVALS_SQL = `
+SELECT
+    sa.id AS sla_approval_id,
+    sa.source_approval_id,
+    sa.request_id,
+    sa.service_id AS service_id,
+    sa.sub_service_id AS sub_service_id,
+    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
+    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
+    sa.approver_role_id AS approval_role_id,
+    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
+    sa.department_id AS approval_department_id,
+    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
+    sa.section_id AS approval_section_id,
+    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
+    sa.approval_status::TEXT AS approval_status,
+    sr.status::TEXT AS request_status,
+    sa.level AS level,
+    sa.approver_user_id AS approver_user_id,
+    TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
+    sa.delegate_user_id AS delegate_user_id,
+    TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
+    sa.approved_by AS approved_by,
+    TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
+    sa.comment::TEXT AS comment,
+    sa.created_at AS created_at,
+    sa.updated_at AS updated_at
+FROM sla_approval sa
+INNER JOIN sla_requests sr
+    ON sr.id = (
+        SELECT MIN(sr2.id)
+        FROM sla_requests sr2
+        WHERE sr2.request_id = sa.request_id
+          AND COALESCE(sr2.is_deleted, false) = false
+          AND (sa.service_id IS NULL OR sr2.service_id = sa.service_id)
+          AND (sa.sub_service_id IS NULL OR sr2.sub_service_id = sa.sub_service_id)
+    )
+LEFT JOIN fm_services svc
+    ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
+LEFT JOIN fm_sub_services subsvc
+    ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
+LEFT JOIN departments adpt
+    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
+LEFT JOIN sections asec
+    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
+LEFT JOIN role ar
+    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
+LEFT JOIN users au
+    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
+LEFT JOIN users du
+    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
+LEFT JOIN users ab
+    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
+WHERE COALESCE(sa.is_deleted, false) = false
 `;
 /**
  * Read-only view for SLA approvals listings (TypeORM).

package/dist/models/SlaMyRequestsViewModel.d.ts

@@ -24,6 +24,9 @@ export declare class SlaMyRequestsView {
     request_id: number;
     /** Remaining `request_obj` keys after excluding workflow/common duplicates. */
     request_fields: Record<string, unknown>;
+    req_user_department_arabicname: string;
+    req_user_section_arabicname: string;
+    req_user_arabicname: string;
 }
 /** Flatten view row: fixed columns plus each entry in `request_fields`. */
 export declare function flattenSlaMyRequestsViewRow(row: SlaMyRequestsView): Record<string, unknown>;

package/dist/models/SlaMyRequestsViewModel.js

@@ -36,58 +36,63 @@ exports.SLA_MY_REQUESTS_REQUEST_OBJ_EXCLUDED_KEYS = [
     "sla_request",
     "sla_request_id",
 ];
-const VW_SLA_MY_REQUESTS_SQL = `
-SELECT
-    sr.id AS sla_request_id,
-    sr.user_id,
-    sr.service_id AS service_id,
-    sr.sub_service_id AS sub_service_id,
-    TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
-    sr.created_at,
-    TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
-    TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
-    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
-    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
-    sr.status::TEXT AS status,
-    sr.request_id,
-    (
-        COALESCE(sr.request_obj, '{}'::jsonb)
-        - 'id'
-        - 'status'
-        - 'role_id'
-        - 'user_id'
-        - 'createdBy'
-        - 'created_at'
-        - 'updated_by'
-        - 'updated_at'
-        - 'req_user_department_id'
-        - 'workflow_execution_id'
-        - 'department_id'
-        - 'req_user_section_id'
-        - 'service_type_id'
-        - 'service_type'
-        - 'created_by'
-        - 'service_id'
-        - 'sub_service_id'
-        - 'attachments'
-        - 'is_deleted'
-        - 'sla_request'
-        - 'sla_request_id'
-    ) AS request_fields
-FROM sla_requests sr
-LEFT JOIN users creator
-    ON sr.created_by ~ '^[0-9]+$'
-    AND creator.id = sr.created_by::integer
-    AND COALESCE(creator.is_deleted, false) = false
-LEFT JOIN departments dept
-    ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
-LEFT JOIN sections sec
-    ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
-LEFT JOIN fm_services svc
-    ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
-LEFT JOIN fm_sub_services subsvc
-    ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
-WHERE COALESCE(sr.is_deleted, false) = false
+const VW_SLA_MY_REQUESTS_SQL = `
+SELECT
+    sr.id AS sla_request_id,
+    sr.user_id,
+    sr.service_id AS service_id,
+    sr.sub_service_id AS sub_service_id,
+    TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
+    sr.created_at,
+    TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
+    TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
+    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
+    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
+    sr.status::TEXT AS status,
+    sr.request_id,
+    (
+        COALESCE(sr.request_obj, '{}'::jsonb)
+        - 'id'
+        - 'status'
+        - 'role_id'
+        - 'user_id'
+        - 'createdBy'
+        - 'created_at'
+        - 'updated_by'
+        - 'updated_at'
+        - 'req_user_department_id'
+        - 'workflow_execution_id'
+        - 'department_id'
+        - 'req_user_section_id'
+        - 'service_type_id'
+        - 'service_type'
+        - 'created_by'
+        - 'service_id'
+        - 'sub_service_id'
+        - 'attachments'
+        - 'is_deleted'
+        - 'sla_request'
+        - 'sla_request_id'
+    ) AS request_fields,
+    TRIM(COALESCE(dept.department_arabic_name, ''))::TEXT AS req_user_department_arabicname,
+    TRIM(COALESCE(sec.section_arabic_name, ''))::TEXT AS req_user_section_arabicname,
+    TRIM(COALESCE(req_user.employee_arabic_name, ''))::TEXT AS req_user_arabicname
+FROM sla_requests sr
+LEFT JOIN users req_user
+    ON req_user.id = sr.user_id AND COALESCE(req_user.is_deleted, false) = false
+LEFT JOIN users creator
+    ON sr.created_by ~ '^[0-9]+$'
+    AND creator.id = sr.created_by::integer
+    AND COALESCE(creator.is_deleted, false) = false
+LEFT JOIN departments dept
+    ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
+LEFT JOIN sections sec
+    ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
+LEFT JOIN fm_services svc
+    ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
+LEFT JOIN fm_sub_services subsvc
+    ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
+WHERE COALESCE(sr.is_deleted, false) = false
 `;
 /**
  * Read-only view for SLA "my requests" listings.
@@ -149,6 +154,18 @@ __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Object)
 ], SlaMyRequestsView.prototype, "request_fields", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], SlaMyRequestsView.prototype, "req_user_department_arabicname", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], SlaMyRequestsView.prototype, "req_user_section_arabicname", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], SlaMyRequestsView.prototype, "req_user_arabicname", void 0);
 exports.SlaMyRequestsView = SlaMyRequestsView = __decorate([
     (0, typeorm_1.ViewEntity)({
         name: "vw_sla_my_requests",
@@ -157,7 +174,7 @@ exports.SlaMyRequestsView = SlaMyRequestsView = __decorate([
 ], SlaMyRequestsView);
 /** Flatten view row: fixed columns plus each entry in `request_fields`. */
 function flattenSlaMyRequestsViewRow(row) {
-    const { sla_request_id, user_id, service_id, sub_service_id, created_by, created_at, req_user_department_id, req_user_section_id, service_name, sub_service_name, status, request_id, request_fields, } = row;
+    const { sla_request_id, user_id, service_id, sub_service_id, created_by, created_at, req_user_department_id, req_user_section_id, service_name, sub_service_name, status, request_id, request_fields, req_user_department_arabicname, req_user_section_arabicname, req_user_arabicname, } = row;
     return {
         sla_request_id,
         user_id,
@@ -171,6 +188,9 @@ function flattenSlaMyRequestsViewRow(row) {
         sub_service_name,
         status,
         request_id,
+        req_user_department_arabicname,
+        req_user_section_arabicname,
+        req_user_arabicname,
         ...(request_fields ?? {}),
     };
 }

package/dist/models/UuidAuditModel.d.ts

@@ -0,0 +1,9 @@
+/** UUID primary key + audit columns + soft delete via deleted_at. */
+export declare abstract class UuidAuditModel {
+    id: string;
+    created_by: string;
+    created_at: Date;
+    updated_by: string | null;
+    updated_at: Date;
+    deleted_at: Date | null;
+}

package/dist/models/UuidAuditModel.js

@@ -0,0 +1,41 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UuidAuditModel = void 0;
+const typeorm_1 = require("typeorm");
+/** UUID primary key + audit columns + soft delete via deleted_at. */
+class UuidAuditModel {
+}
+exports.UuidAuditModel = UuidAuditModel;
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
+    __metadata("design:type", String)
+], UuidAuditModel.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 128, nullable: false, default: '' }),
+    __metadata("design:type", String)
+], UuidAuditModel.prototype, "created_by", void 0);
+__decorate([
+    (0, typeorm_1.CreateDateColumn)({ type: 'timestamptz', default: () => 'CURRENT_TIMESTAMP' }),
+    __metadata("design:type", Date)
+], UuidAuditModel.prototype, "created_at", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 128, nullable: true }),
+    __metadata("design:type", Object)
+], UuidAuditModel.prototype, "updated_by", void 0);
+__decorate([
+    (0, typeorm_1.UpdateDateColumn)({ type: 'timestamptz', default: () => 'CURRENT_TIMESTAMP' }),
+    __metadata("design:type", Date)
+], UuidAuditModel.prototype, "updated_at", void 0);
+__decorate([
+    (0, typeorm_1.DeleteDateColumn)({ type: 'timestamptz', nullable: true }),
+    __metadata("design:type", Object)
+], UuidAuditModel.prototype, "deleted_at", void 0);

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/foreign-ministry",
- "version": "1.3.351",
+ "version": "1.3.355",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "exports": {

package/scripts/check-column-types.js

@@ -1,38 +1,38 @@
-const dotenv = require('dotenv');
-const { Client } = require('pg');
-
-dotenv.config({ path: '../Reports_Service/.env' });
-dotenv.config({ path: '.env', override: true });
-
-async function main() {
-  const client = new Client({
-    host: process.env.DB_HOST.trim(),
-    port: 5432,
-    user: process.env.DB_USER.trim(),
-    password: process.env.DB_PASS,
-    database: process.env.DB_NAME.trim(),
-  });
-  await client.connect();
-
-  const tables = ['sla_requests', 'users', 'departments', 'sections', 'fm_services', 'fm_sub_services'];
-  for (const table of tables) {
-    const { rows } = await client.query(
-      `SELECT column_name, data_type
-       FROM information_schema.columns
-       WHERE table_schema = 'public' AND table_name = $1
-       ORDER BY ordinal_position`,
-      [table]
-    );
-    console.log(`\n${table}:`);
-    for (const row of rows) {
-      console.log(`  ${row.column_name}: ${row.data_type}`);
-    }
-  }
-
-  await client.end();
-}
-
-main().catch((err) => {
-  console.error(err.message);
-  process.exit(1);
-});
+const dotenv = require('dotenv');
+const { Client } = require('pg');
+
+dotenv.config({ path: '../Reports_Service/.env' });
+dotenv.config({ path: '.env', override: true });
+
+async function main() {
+  const client = new Client({
+    host: process.env.DB_HOST.trim(),
+    port: 5432,
+    user: process.env.DB_USER.trim(),
+    password: process.env.DB_PASS,
+    database: process.env.DB_NAME.trim(),
+  });
+  await client.connect();
+
+  const tables = ['sla_requests', 'users', 'departments', 'sections', 'fm_services', 'fm_sub_services'];
+  for (const table of tables) {
+    const { rows } = await client.query(
+      `SELECT column_name, data_type
+       FROM information_schema.columns
+       WHERE table_schema = 'public' AND table_name = $1
+       ORDER BY ordinal_position`,
+      [table]
+    );
+    console.log(`\n${table}:`);
+    for (const row of rows) {
+      console.log(`  ${row.column_name}: ${row.data_type}`);
+    }
+  }
+
+  await client.end();
+}
+
+main().catch((err) => {
+  console.error(err.message);
+  process.exit(1);
+});

package/scripts/check-service-tables.js

@@ -1,42 +1,42 @@
-const dotenv = require('dotenv');
-const path = require('path');
-const { Client } = require('pg');
-
-async function listTables(label, config) {
-  const client = new Client(config);
-  await client.connect();
-  const { rows } = await client.query(`
-    SELECT table_name
-    FROM information_schema.tables
-    WHERE table_schema = 'public'
-      AND (table_name LIKE '%service%' OR table_name LIKE 'sla%')
-    ORDER BY table_name
-  `);
-  console.log(`${label} (${config.database}):`, rows.map((r) => r.table_name).join(', ') || '(none)');
-  await client.end();
-}
-
-async function main() {
-  dotenv.config({ path: path.join(__dirname, '..', '.env') });
-  await listTables('FM shared_models/.env', {
-    host: process.env.DB_HOST.trim(),
-    port: 5432,
-    user: process.env.DB_USER.trim(),
-    password: process.env.DB_PASS,
-    database: process.env.DB_NAME.trim(),
-  });
-
-  dotenv.config({ path: path.join(__dirname, '..', '..', 'Reports_Service', '.env') });
-  await listTables('Reports_Service/.env', {
-    host: (process.env.TYPEORM_HOST || '').trim(),
-    port: 5432,
-    user: (process.env.TYPEORM_USERNAME || '').trim(),
-    password: process.env.TYPEORM_PASSWORD,
-    database: (process.env.TYPEORM_DATABASE || '').trim(),
-  });
-}
-
-main().catch((err) => {
-  console.error(err.message);
-  process.exit(1);
-});
+const dotenv = require('dotenv');
+const path = require('path');
+const { Client } = require('pg');
+
+async function listTables(label, config) {
+  const client = new Client(config);
+  await client.connect();
+  const { rows } = await client.query(`
+    SELECT table_name
+    FROM information_schema.tables
+    WHERE table_schema = 'public'
+      AND (table_name LIKE '%service%' OR table_name LIKE 'sla%')
+    ORDER BY table_name
+  `);
+  console.log(`${label} (${config.database}):`, rows.map((r) => r.table_name).join(', ') || '(none)');
+  await client.end();
+}
+
+async function main() {
+  dotenv.config({ path: path.join(__dirname, '..', '.env') });
+  await listTables('FM shared_models/.env', {
+    host: process.env.DB_HOST.trim(),
+    port: 5432,
+    user: process.env.DB_USER.trim(),
+    password: process.env.DB_PASS,
+    database: process.env.DB_NAME.trim(),
+  });
+
+  dotenv.config({ path: path.join(__dirname, '..', '..', 'Reports_Service', '.env') });
+  await listTables('Reports_Service/.env', {
+    host: (process.env.TYPEORM_HOST || '').trim(),
+    port: 5432,
+    user: (process.env.TYPEORM_USERNAME || '').trim(),
+    password: process.env.TYPEORM_PASSWORD,
+    database: (process.env.TYPEORM_DATABASE || '').trim(),
+  });
+}
+
+main().catch((err) => {
+  console.error(err.message);
+  process.exit(1);
+});