@platform-modules/civil-aviation-authority 2.3.200 → 2.3.201

package/src/models/ResidentialUnitRentalRequestModel.ts

@@ -1,219 +1,219 @@
-import { Column, Entity } from "typeorm"; 
-
-import { BaseModel } from "./BaseModel"; 
-
- 
- 
-
-export enum ResidentialUnitRentalRequestStatus { 
-
-    Pending = 'Pending', 
-
-    Approved = 'Approved', 
-
-    Rejected = 'Rejected', 
-
-    RFC = 'RFC' 
-
-} 
-
- 
- 
-
-@Entity({ name: 'residential_unit_rental_requests' }) 
-
-export class ResidentialUnitRentalRequest extends BaseModel { 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 20, nullable: false }) 
-
-    request_id: string; 
-
- 
- 
-
-    @Column({ type: 'int', nullable: false }) 
-
-    service_id: number; 
-
- 
- 
-
-    @Column({ type: 'int', nullable: false }) 
-
-    sub_service_id: number; 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 50, nullable: false }) 
-
-    requested_unit_type: string; // Apartment, Villa 
-
- 
- 
-
-    /** UI sends apartment type as a plain string value */ 
- 
-    @Column({ type: 'json', nullable: true }) 
- 
-    apartment_type: string | null; 
-
- 
- 
-
-    /** BRD: Villa options with OMR rates - 1 ROOM 201, 2 ROOM 350, 3 ROOM 400 */ 
-
-    @Column({ type: 'json', nullable: true }) 
-
-    villa_type: { 
-
-        one_room?: boolean; 
-
-        two_room?: boolean; 
-
-        three_room?: boolean; 
-
-    }; 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 20, nullable: true }) 
-
-    extension_number: string; 
-
- 
- 
-
-    @Column({ type: 'date', nullable: false }) 
-
-    preferred_start_date: Date; 
-
- 
- 
-
-    @Column({ type: 'int', nullable: false }) 
-
-    family_size: number; 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 50, nullable: false }) 
-
-    phone_number: string;
-
- 
- 
-
-    @Column({ type: 'varchar', length: 255, nullable: true }) 
-
-    location_of_unit: string; 
-
- 
- 
-
-    @Column({ type: 'text', nullable: true }) 
-
-    comment: string; 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 20, nullable: false, default: 'Pending' }) 
-
-    status: string; 
-
- 
- 
-
-    @Column({ type: 'int', nullable: true }) 
-
-    user_id: number; 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 255, nullable: true }) 
-
-    workflow_execution_id: string; 
-
- 
- 
-
-    @Column({ type: 'int', nullable: false }) 
-
-    created_by: number; 
-
- 
- 
-
-    @Column({ type: 'int', nullable: true }) 
-
-    approved_by: number; 
-
- 
- 
-
-    @Column({ type: 'date', nullable: true }) 
-
-    approved_at: Date; 
-
- 
- 
-
-    @Column({ type: 'text', nullable: true }) 
-
-    approver_comment: string; 
-
- 
- 
-
-    @Column({ type: 'json', nullable: true }) 
-
-    unit_details: { 
-
-        type: string; 
-
-        specifications: any; 
-
-        rate: number; 
-
-    }; 
-
- 
- 
-
-    @Column({ type: 'date', nullable: true }) 
-
-    rental_start_date: Date; 
-
- 
- 
-
-    @Column({ type: 'date', nullable: true }) 
-
-    rental_end_date: Date; 
-
- 
- 
-
-    @Column({ type: 'text', nullable: true }) 
-
-    rental_agreement_url: string; 
-
- 
- 
-
-    constructor() { 
-
-        super(); 
-
-    } 
-
-} 
-
+import { Column, Entity } from "typeorm"; 
+
+import { BaseModel } from "./BaseModel"; 
+
+ 
+ 
+
+export enum ResidentialUnitRentalRequestStatus { 
+
+    Pending = 'Pending', 
+
+    Approved = 'Approved', 
+
+    Rejected = 'Rejected', 
+
+    RFC = 'RFC' 
+
+} 
+
+ 
+ 
+
+@Entity({ name: 'residential_unit_rental_requests' }) 
+
+export class ResidentialUnitRentalRequest extends BaseModel { 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 20, nullable: false }) 
+
+    request_id: string; 
+
+ 
+ 
+
+    @Column({ type: 'int', nullable: false }) 
+
+    service_id: number; 
+
+ 
+ 
+
+    @Column({ type: 'int', nullable: false }) 
+
+    sub_service_id: number; 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 50, nullable: false }) 
+
+    requested_unit_type: string; // Apartment, Villa 
+
+ 
+ 
+
+    /** UI sends apartment type as a plain string value */ 
+ 
+    @Column({ type: 'json', nullable: true }) 
+ 
+    apartment_type: string | null; 
+
+ 
+ 
+
+    /** BRD: Villa options with OMR rates - 1 ROOM 201, 2 ROOM 350, 3 ROOM 400 */ 
+
+    @Column({ type: 'json', nullable: true }) 
+
+    villa_type: { 
+
+        one_room?: boolean; 
+
+        two_room?: boolean; 
+
+        three_room?: boolean; 
+
+    }; 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 20, nullable: true }) 
+
+    extension_number: string; 
+
+ 
+ 
+
+    @Column({ type: 'date', nullable: false }) 
+
+    preferred_start_date: Date; 
+
+ 
+ 
+
+    @Column({ type: 'int', nullable: false }) 
+
+    family_size: number; 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 50, nullable: false }) 
+
+    phone_number: string;
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 255, nullable: true }) 
+
+    location_of_unit: string; 
+
+ 
+ 
+
+    @Column({ type: 'text', nullable: true }) 
+
+    comment: string; 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 20, nullable: false, default: 'Pending' }) 
+
+    status: string; 
+
+ 
+ 
+
+    @Column({ type: 'int', nullable: true }) 
+
+    user_id: number; 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 255, nullable: true }) 
+
+    workflow_execution_id: string; 
+
+ 
+ 
+
+    @Column({ type: 'int', nullable: false }) 
+
+    created_by: number; 
+
+ 
+ 
+
+    @Column({ type: 'int', nullable: true }) 
+
+    approved_by: number; 
+
+ 
+ 
+
+    @Column({ type: 'date', nullable: true }) 
+
+    approved_at: Date; 
+
+ 
+ 
+
+    @Column({ type: 'text', nullable: true }) 
+
+    approver_comment: string; 
+
+ 
+ 
+
+    @Column({ type: 'json', nullable: true }) 
+
+    unit_details: { 
+
+        type: string; 
+
+        specifications: any; 
+
+        rate: number; 
+
+    }; 
+
+ 
+ 
+
+    @Column({ type: 'date', nullable: true }) 
+
+    rental_start_date: Date; 
+
+ 
+ 
+
+    @Column({ type: 'date', nullable: true }) 
+
+    rental_end_date: Date; 
+
+ 
+ 
+
+    @Column({ type: 'text', nullable: true }) 
+
+    rental_agreement_url: string; 
+
+ 
+ 
+
+    constructor() { 
+
+        super(); 
+
+    } 
+
+} 
+
  

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;