@platform-modules/civil-aviation-authority 2.3.172 → 2.3.174

package/src/models/RespondToEnquiriesAttachmentModel.ts

@@ -0,0 +1,55 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "respond_to_enquiries_request_attachments" })
+export class RespondToEnquiriesRequestAttachment extends BaseModel {
+    @Column({ type: "integer", nullable: false })
+    request_id: number;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "integer", nullable: false })
+    uploaded_by: number;
+
+    @Column({ type: "varchar", length: 500, nullable: false })
+    file_url: string;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    file_name: string;
+
+    @Column({ type: "varchar", length: 100, nullable: true })
+    file_type: string;
+
+    @Column({ type: "bigint", nullable: true })
+    file_size: number | null;
+
+    @Column({ type: "text", nullable: true })
+    description: string;
+
+    constructor(
+        request_id: number,
+        uploaded_by: number,
+        file_url: string,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        file_name?: string,
+        file_type?: string,
+        file_size?: number,
+        description?: string
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.uploaded_by = uploaded_by;
+        this.file_url = file_url;
+        this.file_name = file_name || "";
+        this.file_type = file_type || "";
+        this.file_size = file_size || null;
+        this.description = description || "";
+    }
+}

package/src/models/RespondToEnquiriesChatModel.ts

@@ -0,0 +1,85 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum RespondToEnquiriesMessageType {
+    TEXT = "text",
+    IMAGE = "image",
+    VIDEO = "video",
+    FILE = "file",
+    LINK = "link"
+}
+
+export enum RespondToEnquiriesChatStatus {
+    SUBMITTED = "Submitted",
+    COMPLETED = "Completed",
+    PENDING = "Pending",
+    REJECTED = "Rejected",
+    ASSIGNED = "Assigned",
+    APPROVED = "Approved",
+    RECEIVED = "Received"
+}
+
+@Entity({ name: "respond_to_enquiries_request_chat" })
+export class RespondToEnquiriesRequestChat extends BaseModel {
+    @Column({ type: "integer", nullable: false })
+    request_id: number;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "integer", nullable: false })
+    user_id: number;
+
+    @Column({ type: "text", nullable: false })
+    message: string;
+
+    @Column({ type: "integer", nullable: true })
+    approver_role_id: number | null;
+
+    @Column({
+        type: "enum",
+        enum: RespondToEnquiriesMessageType,
+        default: RespondToEnquiriesMessageType.TEXT,
+        nullable: false,
+        enumName: "respond_to_enquiries_message_type_en"
+    })
+    messageType: RespondToEnquiriesMessageType;
+
+    @Column({ type: "boolean", default: false })
+    is_internal: boolean;
+
+    @Column({
+        type: "enum",
+        enum: RespondToEnquiriesChatStatus,
+        default: RespondToEnquiriesChatStatus.PENDING,
+        nullable: false,
+        enumName: "respond_to_enquiries_chat_status_en"
+    })
+    status: RespondToEnquiriesChatStatus;
+
+    constructor(
+        request_id: number,
+        user_id: number,
+        message: string,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        messageType?: RespondToEnquiriesMessageType,
+        is_internal?: boolean,
+        status?: RespondToEnquiriesChatStatus,
+        approver_role_id?: number
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.user_id = user_id;
+        this.message = message;
+        this.messageType = messageType || RespondToEnquiriesMessageType.TEXT;
+        this.is_internal = is_internal || false;
+        this.status = status || RespondToEnquiriesChatStatus.PENDING;
+        this.approver_role_id = approver_role_id || null;
+    }
+}

package/src/models/RespondToEnquiriesRequestModel.ts

@@ -0,0 +1,160 @@
+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"
+}
+
+export enum RespondToEnquiriesEnquiryCategory {
+    GENERAL = "general",
+    CANCELLED_TENDER = "cancelled_tender",
+    REFLOATED_TENDER = "refloated_tender"
+}
+
+@Entity({ name: "respond_to_enquiries_requests" })
+export class RespondToEnquiriesRequest extends BaseModel {
+    @Column({ type: "integer", nullable: true })
+    req_user_department_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    req_user_section_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    req_user_position_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "integer", nullable: false })
+    user_id: number;
+
+    @Column({ type: "text", nullable: false })
+    description: string;
+
+    @Column({
+        type: "enum",
+        enum: RespondToEnquiriesRequestStatus,
+        default: RespondToEnquiriesRequestStatus.PENDING,
+        nullable: false
+    })
+    status: RespondToEnquiriesRequestStatus;
+
+    @Column({ type: "integer", nullable: true })
+    reviewer_user_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    assigned_to_user_id: number | null;
+
+    @Column({ type: "timestamp", nullable: true })
+    assigned_at: Date | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    reference_number: string | null;
+
+    @Column({ type: "varchar", length: 500, nullable: false })
+    title_of_enquiry: string;
+
+    @Column({ type: "varchar", length: 100, nullable: true })
+    request_id: string | null;
+
+    @Column({ type: "date", nullable: false })
+    date_of_submission: Date;
+
+    @Column({ type: "varchar", length: 30, nullable: false })
+    phone: string;
+
+    @Column({
+        type: "enum",
+        enum: RespondToEnquiriesEnquiryCategory,
+        default: RespondToEnquiriesEnquiryCategory.GENERAL,
+        nullable: false,
+        enumName: "respond_to_enquiries_category_en"
+    })
+    enquiry_category: RespondToEnquiriesEnquiryCategory;
+
+    @Column({ type: "date", nullable: true })
+    tender_date_of_submission: Date | null;
+
+    @Column({ type: "varchar", length: 30, nullable: true })
+    tender_phone: string | null;
+
+    @Column({ type: "varchar", length: 100, nullable: true })
+    budget_code: string | null;
+
+    @Column({ type: "decimal", precision: 18, scale: 2, nullable: true })
+    estimated_cost: string | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    implementation_period: string | null;
+
+    @Column({ type: "varchar", length: 500, nullable: true })
+    requesting_entity: string | null;
+
+    @Column({ type: "integer", nullable: true })
+    relevant_department_id: number | null;
+
+    constructor(
+        user_id: number,
+        title_of_enquiry: string,
+        description: string,
+        date_of_submission: Date,
+        phone: string,
+        status: RespondToEnquiriesRequestStatus = RespondToEnquiriesRequestStatus.PENDING,
+        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,
+        request_id?: string | null,
+        enquiry_category?: RespondToEnquiriesEnquiryCategory,
+        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,
+        relevant_department_id?: number | null
+    ) {
+        super();
+        this.user_id = user_id;
+        this.title_of_enquiry = title_of_enquiry;
+        this.description = description;
+        this.date_of_submission = date_of_submission;
+        this.phone = phone;
+        this.status = status;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.req_user_department_id = req_user_department_id || null;
+        this.req_user_section_id = req_user_section_id || null;
+        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.enquiry_category = enquiry_category ?? RespondToEnquiriesEnquiryCategory.GENERAL;
+        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;
+        this.relevant_department_id = relevant_department_id ?? null;
+    }
+}

package/src/models/RespondToEnquiriesWorkflowModel.ts

@@ -0,0 +1,68 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum RespondToEnquiriesWorkFlowStatus {
+    COMPLETED = "Completed",
+    NOT_YET_STARTED = "Not Yet Started",
+    PENDING = "Pending",
+    REJECTED = "Rejected"
+}
+
+@Entity({ name: "respond_to_enquiries_work_flows" })
+export class RespondToEnquiriesWorkFlow extends BaseModel {
+    @Column({ type: "int", nullable: false })
+    request_id: number;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "int", nullable: true })
+    order: number | null;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    content: string;
+
+    @Column({ type: "integer", nullable: true })
+    approver_role_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    approver_user_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    approved_by: number | null;
+
+    @Column({
+        type: "enum",
+        enum: RespondToEnquiriesWorkFlowStatus,
+        default: RespondToEnquiriesWorkFlowStatus.PENDING,
+        nullable: false,
+        enumName: "respond_to_enquiries_workflow_status_en"
+    })
+    status: RespondToEnquiriesWorkFlowStatus;
+
+    constructor(
+        request_id: number,
+        content: string,
+        status: RespondToEnquiriesWorkFlowStatus,
+        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
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.content = content;
+        this.status = status;
+        this.order = order || null;
+        this.approver_role_id = approver_role_id || null;
+        this.approver_user_id = approver_user_id || null;
+        this.approved_by = approved_by || null;
+    }
+}

package/src/models/ScholarshipAttendeeModel.ts

@@ -0,0 +1,14 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "scholarship_attendees" })
+export class ScholarshipAttendee extends BaseModel {
+  @Column({ type: "integer", nullable: false })
+  request_id: number;
+
+  @Column({ type: "integer", nullable: false })
+  attendee_id: number;
+
+  @Column({ type: "varchar", length: 320, nullable: false })
+  attendee_email: string;
+}

package/src/models/ScholarshipRequestModel.ts

@@ -44,6 +44,10 @@ export class ScholarshipRequests extends BaseModel {
   @Column({ type: "enum", enum: ScholarshipType, nullable: false })
   type: ScholarshipType;
 
+  /** Planned-flow only: whether amount exceeds threshold; Unplanned rows store null. */
+  @Column({ type: "varchar", length: 10, nullable: true })
+  is_amount_more_than_tenthousand: "Yes" | "No" | null;
+
   @Column({ type: "text", nullable: true })
   reason: string | null;
 
@@ -61,4 +65,28 @@ export class ScholarshipRequests extends BaseModel {
 
   @Column({ type: "varchar", length: 500, nullable: true })
   place: string | null;
+
+  @Column({ type: "boolean", default: false, nullable: false })
+  is_confirm: boolean;
+
+  @Column({ type: "varchar", length: 500, nullable: true })
+  training_entity: string | null;
+
+  @Column({ type: "varchar", length: 10, nullable: true })
+  media_coverage: "Yes" | "No" | null;
+
+  @Column({ type: "date", nullable: true })
+  training_start_date: string | null;
+
+  @Column({ type: "date", nullable: true })
+  training_end_date: string | null;
+
+  @Column({ type: "date", nullable: true })
+  travel_date: string | null;
+
+  @Column({ type: "date", nullable: true })
+  return_date: string | null;
+
+  @Column({ type: "text", nullable: true })
+  comment: string | null;
 }

package/src/models/user.ts

@@ -52,8 +52,8 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     blood_type?: string;
 
-    @Column({  nullable: true })
-    national_id?: string;
+    @Column({ type: 'bigint', nullable: true })
+    national_id?: number;
 
     @Column({ type: 'bigint', nullable: true })
     manpower_id?: number;
@@ -67,8 +67,8 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     department?: number;
 
-    @Column({ nullable: true })
-    category: string; // Mandatory
+    @Column({ type: "enum", enum: ["CAA", "Embassy"], nullable: false, default: "CAA" })
+    category: "CAA" | "Embassy"; // Mandatory
 
     @Column({ nullable: true })
     directorate?: string;
@@ -156,7 +156,7 @@ export class User extends BaseModel {
         nationality?: string,
         email?: string,
         blood_type?: string,
-        national_id?: string,
+        national_id?: number,
         manpower_id?: number,
         mobile?: string,
         office_number?: string,