@platform-modules/civil-aviation-authority 2.3.41 → 2.3.43

package/src/models/RequestForCoverageRequestModel.ts

@@ -1,174 +1,174 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum RequestForCoverageRequestStatus {
-  PENDING = "Pending",
-  IN_PROGRESS = "In Progress",
-  COMPLETED = "Completed",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-export enum RequestForCoverageNewsSize {
-  SMALL = "Small",
-  MEDIUM = "Medium",
-  LARGE = "Large"
-}
-
-@Entity({ name: "request_for_coverage_requests" })
-export class RequestForCoverageRequest 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: "boolean", default: false, nullable: false })
-  required_for_president: boolean;
-
-  @Column({ type: "varchar", length: 255, nullable: false })
-  directorate_name: string;
-
-  @Column({ type: "integer", nullable: true })
-  department_id: number | null;
-
-  @Column({ type: "varchar", length: 50, nullable: true })
-  extension_number: string | null;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  suggested_photography: string | null;
-
-  @Column({ type: "date", nullable: false })
-  event_date: Date;
-
-  @Column({ type: "time", nullable: false })
-  event_time: string;
-
-  @Column({ type: "varchar", length: 255, nullable: false })
-  event_location: string;
-
-  @Column({
-    type: "enum",
-    enum: RequestForCoverageNewsSize,
-    nullable: true
-  })
-  news_size: RequestForCoverageNewsSize | null;
-
-  @Column({ type: "text", nullable: true })
-  event_objective: string | null;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  organizing_entity: string | null;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  hosted_person: string | null;
-
-  @Column({ type: "text", nullable: true })
-  audience: string | null;
-
-  @Column({ type: "text", nullable: false })
-  event_details: string;
-
-  @Column({ type: "text", nullable: false })
-  importance_of_publishing: string;
-
-  @Column({ type: "text", nullable: true })
-  document_event: string | null;
-
-  @Column({
-    type: "enum",
-    enum: RequestForCoverageRequestStatus,
-    default: RequestForCoverageRequestStatus.PENDING,
-    nullable: false
-  })
-  status: RequestForCoverageRequestStatus;
-
-  @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: 500, nullable: true })
-  rejection_reason: string | null;
-
-  constructor(
-    user_id: number,
-    event_date: Date,
-    event_time: string,
-    event_location: string,
-    event_details: string,
-    importance_of_publishing: string,
-    directorate_name: string,
-    required_for_president: boolean = false,
-    status: RequestForCoverageRequestStatus = RequestForCoverageRequestStatus.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,
-    department_id?: number | null,
-    extension_number?: string | null,
-    suggested_photography?: string | null,
-    news_size?: RequestForCoverageNewsSize | null,
-    event_objective?: string | null,
-    organizing_entity?: string | null,
-    hosted_person?: string | null,
-    audience?: string | null,
-    document_event?: string | null,
-    reviewer_user_id?: number | null,
-    assigned_to_user_id?: number | null,
-    assigned_at?: Date | null,
-    workflow_execution_id?: string | null,
-    rejection_reason?: string | null
-  ) {
-    super();
-    this.user_id = user_id;
-    this.event_date = event_date;
-    this.event_time = event_time;
-    this.event_location = event_location;
-    this.event_details = event_details;
-    this.importance_of_publishing = importance_of_publishing;
-    this.directorate_name = directorate_name;
-    this.required_for_president = required_for_president;
-    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.department_id = department_id || null;
-    this.extension_number = extension_number || null;
-    this.suggested_photography = suggested_photography || null;
-    this.news_size = news_size || null;
-    this.event_objective = event_objective || null;
-    this.organizing_entity = organizing_entity || null;
-    this.hosted_person = hosted_person || null;
-    this.audience = audience || null;
-    this.document_event = document_event || 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.rejection_reason = rejection_reason || null;
-  }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum RequestForCoverageRequestStatus {
+  PENDING = "Pending",
+  IN_PROGRESS = "In Progress",
+  COMPLETED = "Completed",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+export enum RequestForCoverageNewsSize {
+  SMALL = "Small",
+  MEDIUM = "Medium",
+  LARGE = "Large"
+}
+
+@Entity({ name: "request_for_coverage_requests" })
+export class RequestForCoverageRequest 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: "boolean", default: false, nullable: false })
+  required_for_president: boolean;
+
+  @Column({ type: "varchar", length: 255, nullable: false })
+  directorate_name: string;
+
+  @Column({ type: "integer", nullable: true })
+  department_id: number | null;
+
+  @Column({ type: "varchar", length: 50, nullable: true })
+  extension_number: string | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  suggested_photography: string | null;
+
+  @Column({ type: "date", nullable: false })
+  event_date: Date;
+
+  @Column({ type: "time", nullable: false })
+  event_time: string;
+
+  @Column({ type: "varchar", length: 255, nullable: false })
+  event_location: string;
+
+  @Column({
+    type: "enum",
+    enum: RequestForCoverageNewsSize,
+    nullable: true
+  })
+  news_size: RequestForCoverageNewsSize | null;
+
+  @Column({ type: "text", nullable: true })
+  event_objective: string | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  organizing_entity: string | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  hosted_person: string | null;
+
+  @Column({ type: "text", nullable: true })
+  audience: string | null;
+
+  @Column({ type: "text", nullable: false })
+  event_details: string;
+
+  @Column({ type: "text", nullable: false })
+  importance_of_publishing: string;
+
+  @Column({ type: "text", nullable: true })
+  document_event: string | null;
+
+  @Column({
+    type: "enum",
+    enum: RequestForCoverageRequestStatus,
+    default: RequestForCoverageRequestStatus.PENDING,
+    nullable: false
+  })
+  status: RequestForCoverageRequestStatus;
+
+  @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: 500, nullable: true })
+  rejection_reason: string | null;
+
+  constructor(
+    user_id: number,
+    event_date: Date,
+    event_time: string,
+    event_location: string,
+    event_details: string,
+    importance_of_publishing: string,
+    directorate_name: string,
+    required_for_president: boolean = false,
+    status: RequestForCoverageRequestStatus = RequestForCoverageRequestStatus.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,
+    department_id?: number | null,
+    extension_number?: string | null,
+    suggested_photography?: string | null,
+    news_size?: RequestForCoverageNewsSize | null,
+    event_objective?: string | null,
+    organizing_entity?: string | null,
+    hosted_person?: string | null,
+    audience?: string | null,
+    document_event?: string | null,
+    reviewer_user_id?: number | null,
+    assigned_to_user_id?: number | null,
+    assigned_at?: Date | null,
+    workflow_execution_id?: string | null,
+    rejection_reason?: string | null
+  ) {
+    super();
+    this.user_id = user_id;
+    this.event_date = event_date;
+    this.event_time = event_time;
+    this.event_location = event_location;
+    this.event_details = event_details;
+    this.importance_of_publishing = importance_of_publishing;
+    this.directorate_name = directorate_name;
+    this.required_for_president = required_for_president;
+    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.department_id = department_id || null;
+    this.extension_number = extension_number || null;
+    this.suggested_photography = suggested_photography || null;
+    this.news_size = news_size || null;
+    this.event_objective = event_objective || null;
+    this.organizing_entity = organizing_entity || null;
+    this.hosted_person = hosted_person || null;
+    this.audience = audience || null;
+    this.document_event = document_event || 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.rejection_reason = rejection_reason || null;
+  }
+}
+

package/src/models/ServiceTransferRequestModel.ts

@@ -80,11 +80,11 @@ export class ServiceTransferRequest extends BaseModel {
     @Column({ type: "varchar", length: 500, nullable: false })
     transferred_to_entity: string;
 
-    @Column({ type: "date", nullable: false })
-    start_date: Date;
+    @Column({ type: "date", nullable: true })
+    start_date: Date | null;
 
-    @Column({ type: "date", nullable: false })
-    end_date: Date;
+    @Column({ type: "date", nullable: true })
+    end_date: Date | null;
 
     @Column({ type: "varchar", length: 20, nullable: false })
     phone_number: string;
@@ -123,8 +123,8 @@ export class ServiceTransferRequest extends BaseModel {
         assigned_job_position?: string,
         current_entity?: string,
         transferred_to_entity?: string,
-        start_date?: Date,
-        end_date?: Date,
+        start_date?: Date | null,
+        end_date?: Date | null,
         phone_number?: string,
         reason_for_request?: string,
         request_type?: ServiceTransferRequestType,
@@ -151,8 +151,8 @@ export class ServiceTransferRequest extends BaseModel {
         this.assigned_job_position = assigned_job_position || "";
         this.current_entity = current_entity || "";
         this.transferred_to_entity = transferred_to_entity || "";
-        this.start_date = start_date || new Date();
-        this.end_date = end_date || new Date();
+        this.start_date = start_date || null;
+        this.end_date = end_date || null;
         this.phone_number = phone_number || "";
         this.reason_for_request = reason_for_request || "";
         this.request_type = request_type || ServiceTransferRequestType.INTERNAL;

package/src/models/ShiftAllowanceRequestModel.ts

@@ -0,0 +1,126 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum ShiftAllowanceRequestStatus {
+    PENDING = "Pending",
+    ASSIGNED = "Assigned",
+    IN_PROGRESS = "In Progress",
+    COMPLETED = "Completed",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+
+export enum ShiftAllowanceValue {
+    TWENTY_TWO_PERCENT = "22%",
+    THIRTY_PERCENT = "30%",
+    SEVENTY_PERCENT = "70%"
+}
+
+@Entity({ name: "shift_allowance_requests" })
+export class ShiftAllowanceRequest 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: true })
+    description: string | null;
+
+    @Column({ type: "enum", enum: ShiftAllowanceRequestStatus, default: ShiftAllowanceRequestStatus.PENDING, nullable: false })
+    status: ShiftAllowanceRequestStatus;
+
+    @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;
+
+    // Shift Allowance specific fields
+    @Column({ type: "varchar", length: 255, nullable: false })
+    employee_name: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    employee_id: string;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    job_title: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    financial_grade: string;
+
+    @Column({ type: "enum", enum: ShiftAllowanceValue, nullable: false })
+    allowance_value: ShiftAllowanceValue;
+
+    @Column({ type: "date", nullable: false })
+    shift_start_date: Date;
+
+    @Column({ type: "date", nullable: false })
+    shift_end_date: Date;
+
+    @Column({ type: "text", nullable: true })
+    reason_for_request: string | null;
+
+    constructor(
+        user_id: number,
+        status: ShiftAllowanceRequestStatus = ShiftAllowanceRequestStatus.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,
+        description?: string | null,
+        reviewer_user_id?: number | null,
+        assigned_to_user_id?: number | null,
+        assigned_at?: Date | null,
+        workflow_execution_id?: string | null,
+        employee_name?: string,
+        employee_id?: string,
+        job_title?: string,
+        financial_grade?: string,
+        allowance_value?: ShiftAllowanceValue,
+        shift_start_date?: Date,
+        shift_end_date?: Date,
+        reason_for_request?: string | null
+    ) {
+        super();
+        this.user_id = user_id;
+        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.description = description || 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.employee_name = employee_name || "";
+        this.employee_id = employee_id || "";
+        this.job_title = job_title || "";
+        this.financial_grade = financial_grade || "";
+        this.allowance_value = allowance_value || ShiftAllowanceValue.TWENTY_TWO_PERCENT;
+        this.shift_start_date = shift_start_date || new Date();
+        this.shift_end_date = shift_end_date || new Date();
+        this.reason_for_request = reason_for_request || null;
+    }
+}