@platform-modules/foreign-ministry 1.3.262 → 1.3.266

package/dist/data-source.js

@@ -65,6 +65,9 @@ const SalaryCertificateRequestsModel_1 = require("./models/SalaryCertificateRequ
 const AllowanceRequestsModel_1 = require("./models/AllowanceRequestsModel");
 const ReimbursementRequestsModel_1 = require("./models/ReimbursementRequestsModel");
 const BankAccountChangeRequestsModel_1 = require("./models/BankAccountChangeRequestsModel");
+const AnnualTravelTicketRequestModel_1 = require("./models/AnnualTravelTicketRequestModel");
+const AnnualTravelTicketPriceConfigurationModel_1 = require("./models/AnnualTravelTicketPriceConfigurationModel");
+const AnnualTravelTicketPriceConfigurationItemModel_1 = require("./models/AnnualTravelTicketPriceConfigurationItemModel");
 const FinancialChatsModel_1 = require("./models/FinancialChatsModel");
 const FinancialWorkFlowModel_1 = require("./models/FinancialWorkFlowModel");
 const FinancialAttachmentsModel_1 = require("./models/FinancialAttachmentsModel");
@@ -349,6 +352,9 @@ exports.AppDataSource = new typeorm_1.DataSource({
         AllowanceRequestsModel_1.AllowanceRequests,
         ReimbursementRequestsModel_1.ReimbursementRequests,
         BankAccountChangeRequestsModel_1.BankAccountChangeRequests,
+        AnnualTravelTicketRequestModel_1.AnnualTravelTicketRequests,
+        AnnualTravelTicketPriceConfigurationModel_1.AnnualTravelTicketPriceConfiguration,
+        AnnualTravelTicketPriceConfigurationItemModel_1.AnnualTravelTicketPriceConfigurationItem,
         FinancialChatsModel_1.FinancialChats,
         FinancialWorkFlowModel_1.FinancialWorkFlow,
         FinancialAttachmentsModel_1.FinancialAttachments,

package/dist/index.d.ts

@@ -81,6 +81,8 @@ export * from './models/MissionBankAccountAttachmentModel';
 export * from './models/MissionBankAccountChatModel';
 export * from './models/MissionBankAccountWorkflowModel';
 export * from './models/AnnualTravelTicketRequestModel';
+export * from './models/AnnualTravelTicketPriceConfigurationModel';
+export * from './models/AnnualTravelTicketPriceConfigurationItemModel';
 export * from './models/AmbassadorSpecialAccountAmountRequestModel';
 export * from './models/StayAfterHoursRequestModel';
 export * from './models/StayAfterHoursApprovalModel';

package/dist/index.js

@@ -98,6 +98,8 @@ __exportStar(require("./models/MissionBankAccountAttachmentModel"), exports);
 __exportStar(require("./models/MissionBankAccountChatModel"), exports);
 __exportStar(require("./models/MissionBankAccountWorkflowModel"), exports);
 __exportStar(require("./models/AnnualTravelTicketRequestModel"), exports);
+__exportStar(require("./models/AnnualTravelTicketPriceConfigurationModel"), exports);
+__exportStar(require("./models/AnnualTravelTicketPriceConfigurationItemModel"), exports);
 __exportStar(require("./models/AmbassadorSpecialAccountAmountRequestModel"), exports);
 __exportStar(require("./models/StayAfterHoursRequestModel"), exports);
 __exportStar(require("./models/StayAfterHoursApprovalModel"), exports);

package/dist/models/AnnualTravelTicketPriceConfigurationItemModel.d.ts

@@ -0,0 +1,16 @@
+import { BaseModel } from './BaseModel';
+import { AnnualTravelTicketPriceConfiguration } from './AnnualTravelTicketPriceConfigurationModel';
+/**
+ * Individual price slab within an annual travel ticket pricing configuration.
+ * age_from is inclusive and age_to is exclusive to allow adjacent ranges.
+ */
+export declare class AnnualTravelTicketPriceConfigurationItem extends BaseModel {
+    configuration_id: number;
+    configuration: AnnualTravelTicketPriceConfiguration;
+    ticket_class: string | null;
+    age_from: number;
+    age_to: number;
+    price: number | string;
+    currency_code: string | null;
+    notes: string | null;
+}

package/dist/models/AnnualTravelTicketPriceConfigurationItemModel.js

@@ -0,0 +1,59 @@
+"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.AnnualTravelTicketPriceConfigurationItem = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const AnnualTravelTicketPriceConfigurationModel_1 = require("./AnnualTravelTicketPriceConfigurationModel");
+/**
+ * Individual price slab within an annual travel ticket pricing configuration.
+ * age_from is inclusive and age_to is exclusive to allow adjacent ranges.
+ */
+let AnnualTravelTicketPriceConfigurationItem = class AnnualTravelTicketPriceConfigurationItem extends BaseModel_1.BaseModel {
+};
+exports.AnnualTravelTicketPriceConfigurationItem = AnnualTravelTicketPriceConfigurationItem;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTravelTicketPriceConfigurationItem.prototype, "configuration_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => AnnualTravelTicketPriceConfigurationModel_1.AnnualTravelTicketPriceConfiguration, (configuration) => configuration.price_slabs, { onDelete: 'CASCADE' }),
+    (0, typeorm_1.JoinColumn)({ name: 'configuration_id' }),
+    __metadata("design:type", AnnualTravelTicketPriceConfigurationModel_1.AnnualTravelTicketPriceConfiguration)
+], AnnualTravelTicketPriceConfigurationItem.prototype, "configuration", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTravelTicketPriceConfigurationItem.prototype, "ticket_class", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTravelTicketPriceConfigurationItem.prototype, "age_from", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTravelTicketPriceConfigurationItem.prototype, "age_to", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'decimal', precision: 12, scale: 2, nullable: false }),
+    __metadata("design:type", Object)
+], AnnualTravelTicketPriceConfigurationItem.prototype, "price", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 10, nullable: true, default: 'OMR' }),
+    __metadata("design:type", Object)
+], AnnualTravelTicketPriceConfigurationItem.prototype, "currency_code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTravelTicketPriceConfigurationItem.prototype, "notes", void 0);
+exports.AnnualTravelTicketPriceConfigurationItem = AnnualTravelTicketPriceConfigurationItem = __decorate([
+    (0, typeorm_1.Entity)({ name: 'annual_travel_ticket_price_configuration_items' }),
+    (0, typeorm_1.Unique)(['configuration_id', 'ticket_class', 'age_from', 'age_to'])
+], AnnualTravelTicketPriceConfigurationItem);

package/dist/models/AnnualTravelTicketPriceConfigurationModel.d.ts

@@ -0,0 +1,16 @@
+import { BaseModel } from './BaseModel';
+import { AnnualTravelTicketPriceConfigurationItem } from './AnnualTravelTicketPriceConfigurationItemModel';
+/**
+ * Admin configuration for annual travel ticket pricing.
+ * One record per year (and optional service/sub-service pair), with multiple age slabs.
+ */
+export declare class AnnualTravelTicketPriceConfiguration extends BaseModel {
+    service_id: number | null;
+    sub_service_id: number | null;
+    ticket_year: number;
+    configuration_name: string | null;
+    currency_code: string | null;
+    description: string | null;
+    is_active: boolean;
+    price_slabs?: AnnualTravelTicketPriceConfigurationItem[];
+}

package/dist/models/AnnualTravelTicketPriceConfigurationModel.js

@@ -0,0 +1,58 @@
+"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.AnnualTravelTicketPriceConfiguration = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const AnnualTravelTicketPriceConfigurationItemModel_1 = require("./AnnualTravelTicketPriceConfigurationItemModel");
+/**
+ * Admin configuration for annual travel ticket pricing.
+ * One record per year (and optional service/sub-service pair), with multiple age slabs.
+ */
+let AnnualTravelTicketPriceConfiguration = class AnnualTravelTicketPriceConfiguration extends BaseModel_1.BaseModel {
+};
+exports.AnnualTravelTicketPriceConfiguration = AnnualTravelTicketPriceConfiguration;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTravelTicketPriceConfiguration.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTravelTicketPriceConfiguration.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTravelTicketPriceConfiguration.prototype, "ticket_year", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTravelTicketPriceConfiguration.prototype, "configuration_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 10, nullable: true, default: 'OMR' }),
+    __metadata("design:type", Object)
+], AnnualTravelTicketPriceConfiguration.prototype, "currency_code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTravelTicketPriceConfiguration.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true, nullable: false }),
+    __metadata("design:type", Boolean)
+], AnnualTravelTicketPriceConfiguration.prototype, "is_active", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => AnnualTravelTicketPriceConfigurationItemModel_1.AnnualTravelTicketPriceConfigurationItem, (item) => item.configuration),
+    __metadata("design:type", Array)
+], AnnualTravelTicketPriceConfiguration.prototype, "price_slabs", void 0);
+exports.AnnualTravelTicketPriceConfiguration = AnnualTravelTicketPriceConfiguration = __decorate([
+    (0, typeorm_1.Entity)({ name: 'annual_travel_ticket_price_configurations' }),
+    (0, typeorm_1.Unique)(['service_id', 'sub_service_id', 'ticket_year'])
+], AnnualTravelTicketPriceConfiguration);

package/dist/models/AnnualTravelTicketRequestModel.d.ts

@@ -3,6 +3,13 @@ export declare enum AnnualTravelTicketPermanentResidence {
     SALALAH = "Salalah",
     MUSANDAM = "Musandam"
 }
+export interface AnnualTravelTicketFamilyDetail {
+    person_name: string;
+    relation: string;
+    age: number;
+    age_category: string;
+    price: number | string;
+}
 /** Aligns with mission bank account request lifecycle for shared workflow UI. */
 export declare enum AnnualTravelTicketRequestStatus {
     PENDING = "Pending",
@@ -21,20 +28,12 @@ export declare class AnnualTravelTicketRequests extends BaseModel {
     applicant_name: string;
     civil_id_or_passport_number: string;
     permanent_residence: AnnualTravelTicketPermanentResidence;
-    /** Free-text family context (dependents covered by the request). */
-    family_details: string | null;
-    children_ticket_price: string | number | null;
-    employee_spouse_ticket_price: string | number | null;
+    /** Traveler list with person name, relation, age, age category, and price. */
+    family_details: AnnualTravelTicketFamilyDetail[] | null;
     bank_account_number: string;
-    travel_details: string;
-    /** Calendar year this entitlement applies to (one ticket per person per year). */
-    ticket_entitlement_year: number;
-    /** Optional structured travelers (e.g. children) for age rules; JSON array. */
-    children_travelers_json: Record<string, unknown>[] | null;
-    /** Client confirms dependents match HR/profile before submit. */
-    profile_children_synced_with_profile: boolean;
-    /** Notes on unused ticket carry-forward (max 7 years; children until age 21). */
-    carry_forward_notes: string | null;
+    travel_from: string;
+    travel_to: string;
+    date_of_travel: string;
     status: AnnualTravelTicketRequestStatus;
     workflow_execution_id: string | null;
 }

package/dist/models/AnnualTravelTicketRequestModel.js

@@ -62,41 +62,25 @@ __decorate([
     __metadata("design:type", String)
 ], AnnualTravelTicketRequests.prototype, "permanent_residence", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    (0, typeorm_1.Column)({ type: 'jsonb', nullable: true }),
     __metadata("design:type", Object)
 ], AnnualTravelTicketRequests.prototype, "family_details", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'decimal', precision: 12, scale: 2, nullable: true }),
-    __metadata("design:type", Object)
-], AnnualTravelTicketRequests.prototype, "children_ticket_price", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'decimal', precision: 12, scale: 2, nullable: true }),
-    __metadata("design:type", Object)
-], AnnualTravelTicketRequests.prototype, "employee_spouse_ticket_price", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
     __metadata("design:type", String)
 ], AnnualTravelTicketRequests.prototype, "bank_account_number", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
     __metadata("design:type", String)
-], AnnualTravelTicketRequests.prototype, "travel_details", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], AnnualTravelTicketRequests.prototype, "ticket_entitlement_year", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'jsonb', nullable: true }),
-    __metadata("design:type", Object)
-], AnnualTravelTicketRequests.prototype, "children_travelers_json", void 0);
+], AnnualTravelTicketRequests.prototype, "travel_from", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false, nullable: false }),
-    __metadata("design:type", Boolean)
-], AnnualTravelTicketRequests.prototype, "profile_children_synced_with_profile", void 0);
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], AnnualTravelTicketRequests.prototype, "travel_to", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
-    __metadata("design:type", Object)
-], AnnualTravelTicketRequests.prototype, "carry_forward_notes", void 0);
+    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
+    __metadata("design:type", String)
+], AnnualTravelTicketRequests.prototype, "date_of_travel", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: 'enum',

package/package.json

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

package/src/data-source.ts

@@ -62,14 +62,17 @@ import { Notification } from './models/NotificationModel';
 import { FinancialRequests } from './models/FinancialRequestsModel';
 import { FinancialApprovals } from './models/FinancialApprovalsModel';
 import { FinancialSettings } from './models/FinancialSettingsModel';
-import { PayslipRequests } from './models/PayslipRequestsModel';
-import { SalaryCertificateRequests } from './models/SalaryCertificateRequestsModel';
-import { AllowanceRequests } from './models/AllowanceRequestsModel';
-import { ReimbursementRequests } from './models/ReimbursementRequestsModel';
-import { BankAccountChangeRequests } from './models/BankAccountChangeRequestsModel';
-import { FinancialChats } from './models/FinancialChatsModel';
-import { FinancialWorkFlow } from './models/FinancialWorkFlowModel';
-import { FinancialAttachments } from './models/FinancialAttachmentsModel';
+import { PayslipRequests } from './models/PayslipRequestsModel';
+import { SalaryCertificateRequests } from './models/SalaryCertificateRequestsModel';
+import { AllowanceRequests } from './models/AllowanceRequestsModel';
+import { ReimbursementRequests } from './models/ReimbursementRequestsModel';
+import { BankAccountChangeRequests } from './models/BankAccountChangeRequestsModel';
+import { AnnualTravelTicketRequests } from './models/AnnualTravelTicketRequestModel';
+import { AnnualTravelTicketPriceConfiguration } from './models/AnnualTravelTicketPriceConfigurationModel';
+import { AnnualTravelTicketPriceConfigurationItem } from './models/AnnualTravelTicketPriceConfigurationItemModel';
+import { FinancialChats } from './models/FinancialChatsModel';
+import { FinancialWorkFlow } from './models/FinancialWorkFlowModel';
+import { FinancialAttachments } from './models/FinancialAttachmentsModel';
 import { RequestTypeMaster } from './models/RequestTypeMasterModel';
 import { AllowanceTypes } from './models/AllowanceTypesModel';
 import { BankNames } from './models/BankNamesModel';
@@ -352,12 +355,15 @@ export const AppDataSource = new DataSource({
     FinancialApprovals,
     FinancialSettings,
     PayslipRequests,
-    SalaryCertificateRequests,
-    AllowanceRequests,
-    ReimbursementRequests,
-    BankAccountChangeRequests,
-    FinancialChats,
-    FinancialWorkFlow,
+    SalaryCertificateRequests,
+    AllowanceRequests,
+    ReimbursementRequests,
+    BankAccountChangeRequests,
+    AnnualTravelTicketRequests,
+    AnnualTravelTicketPriceConfiguration,
+    AnnualTravelTicketPriceConfigurationItem,
+    FinancialChats,
+    FinancialWorkFlow,
     FinancialAttachments,
     RequestTypeMaster,
     WorkflowTask,

package/src/index.ts

@@ -81,6 +81,8 @@ export * from './models/MissionBankAccountAttachmentModel';
 export * from './models/MissionBankAccountChatModel';
 export * from './models/MissionBankAccountWorkflowModel';
 export * from './models/AnnualTravelTicketRequestModel';
+export * from './models/AnnualTravelTicketPriceConfigurationModel';
+export * from './models/AnnualTravelTicketPriceConfigurationItemModel';
 export * from './models/AmbassadorSpecialAccountAmountRequestModel';
 export * from './models/StayAfterHoursRequestModel';
 export * from './models/StayAfterHoursApprovalModel';

package/src/models/AnnualTravelTicketPriceConfigurationItemModel.ts

@@ -0,0 +1,36 @@
+import { Column, Entity, JoinColumn, ManyToOne, Unique } from 'typeorm';
+import { BaseModel } from './BaseModel';
+import { AnnualTravelTicketPriceConfiguration } from './AnnualTravelTicketPriceConfigurationModel';
+
+/**
+ * Individual price slab within an annual travel ticket pricing configuration.
+ * age_from is inclusive and age_to is exclusive to allow adjacent ranges.
+ */
+@Entity({ name: 'annual_travel_ticket_price_configuration_items' })
+@Unique(['configuration_id', 'ticket_class', 'age_from', 'age_to'])
+export class AnnualTravelTicketPriceConfigurationItem extends BaseModel {
+  @Column({ type: 'int', nullable: false })
+  configuration_id: number;
+
+  @ManyToOne(() => AnnualTravelTicketPriceConfiguration, (configuration) => configuration.price_slabs, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'configuration_id' })
+  configuration: AnnualTravelTicketPriceConfiguration;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  ticket_class: string | null;
+
+  @Column({ type: 'int', nullable: false })
+  age_from: number;
+
+  @Column({ type: 'int', nullable: false })
+  age_to: number;
+
+  @Column({ type: 'decimal', precision: 12, scale: 2, nullable: false })
+  price: number | string;
+
+  @Column({ type: 'varchar', length: 10, nullable: true, default: 'OMR' })
+  currency_code: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  notes: string | null;
+}

package/src/models/AnnualTravelTicketPriceConfigurationModel.ts

@@ -0,0 +1,35 @@
+import { Column, Entity, OneToMany, Unique } from 'typeorm';
+import { BaseModel } from './BaseModel';
+import { AnnualTravelTicketPriceConfigurationItem } from './AnnualTravelTicketPriceConfigurationItemModel';
+
+/**
+ * Admin configuration for annual travel ticket pricing.
+ * One record per year (and optional service/sub-service pair), with multiple age slabs.
+ */
+@Entity({ name: 'annual_travel_ticket_price_configurations' })
+@Unique(['service_id', 'sub_service_id', 'ticket_year'])
+export class AnnualTravelTicketPriceConfiguration extends BaseModel {
+  @Column({ type: 'int', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: 'int', nullable: false })
+  ticket_year: number;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  configuration_name: string | null;
+
+  @Column({ type: 'varchar', length: 10, nullable: true, default: 'OMR' })
+  currency_code: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  description: string | null;
+
+  @Column({ type: 'boolean', default: true, nullable: false })
+  is_active: boolean;
+
+  @OneToMany(() => AnnualTravelTicketPriceConfigurationItem, (item) => item.configuration)
+  price_slabs?: AnnualTravelTicketPriceConfigurationItem[];
+}

package/src/models/AnnualTravelTicketRequestModel.ts

@@ -1,15 +1,23 @@
-import { Column, Entity } from 'typeorm';
-import { BaseModel } from './BaseModel';
-
-export enum AnnualTravelTicketPermanentResidence {
-  SALALAH = 'Salalah',
-  MUSANDAM = 'Musandam',
-}
-
-/** Aligns with mission bank account request lifecycle for shared workflow UI. */
-export enum AnnualTravelTicketRequestStatus {
-  PENDING = 'Pending',
-  ASSIGNED = 'Assigned',
+import { Column, Entity } from 'typeorm';
+import { BaseModel } from './BaseModel';
+
+export enum AnnualTravelTicketPermanentResidence {
+  SALALAH = 'Salalah',
+  MUSANDAM = 'Musandam',
+}
+
+export interface AnnualTravelTicketFamilyDetail {
+  person_name: string;
+  relation: string;
+  age: number;
+  age_category: string;
+  price: number | string;
+}
+
+/** Aligns with mission bank account request lifecycle for shared workflow UI. */
+export enum AnnualTravelTicketRequestStatus {
+  PENDING = 'Pending',
+  ASSIGNED = 'Assigned',
   IN_PROGRESS = 'In Progress',
   APPROVED = 'Approved',
   REJECTED = 'Rejected',
@@ -39,44 +47,28 @@ export class AnnualTravelTicketRequests extends BaseModel {
   @Column({ type: 'varchar', length: 120, nullable: false })
   civil_id_or_passport_number: string;
 
-  @Column({ type: 'enum', enum: AnnualTravelTicketPermanentResidence, nullable: false })
-  permanent_residence: AnnualTravelTicketPermanentResidence;
-
-  /** Free-text family context (dependents covered by the request). */
-  @Column({ type: 'text', nullable: true })
-  family_details: string | null;
-
-  @Column({ type: 'decimal', precision: 12, scale: 2, nullable: true })
-  children_ticket_price: string | number | null;
-
-  @Column({ type: 'decimal', precision: 12, scale: 2, nullable: true })
-  employee_spouse_ticket_price: string | number | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  bank_account_number: string;
-
-  @Column({ type: 'text', nullable: false })
-  travel_details: string;
-
-  /** Calendar year this entitlement applies to (one ticket per person per year). */
-  @Column({ type: 'int', nullable: false })
-  ticket_entitlement_year: number;
-
-  /** Optional structured travelers (e.g. children) for age rules; JSON array. */
-  @Column({ type: 'jsonb', nullable: true })
-  children_travelers_json: Record<string, unknown>[] | null;
-
-  /** Client confirms dependents match HR/profile before submit. */
-  @Column({ type: 'boolean', default: false, nullable: false })
-  profile_children_synced_with_profile: boolean;
-
-  /** Notes on unused ticket carry-forward (max 7 years; children until age 21). */
-  @Column({ type: 'text', nullable: true })
-  carry_forward_notes: string | null;
-
-  @Column({
-    type: 'enum',
-    enum: AnnualTravelTicketRequestStatus,
+  @Column({ type: 'enum', enum: AnnualTravelTicketPermanentResidence, nullable: false })
+  permanent_residence: AnnualTravelTicketPermanentResidence;
+
+  /** Traveler list with person name, relation, age, age category, and price. */
+  @Column({ type: 'jsonb', nullable: true })
+  family_details: AnnualTravelTicketFamilyDetail[] | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: false })
+  bank_account_number: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  travel_from: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  travel_to: string;
+
+  @Column({ type: 'date', nullable: false })
+  date_of_travel: string;
+
+  @Column({
+    type: 'enum',
+    enum: AnnualTravelTicketRequestStatus,
     default: AnnualTravelTicketRequestStatus.PENDING,
     nullable: false,
   })