@platform-modules/civil-aviation-authority 2.3.290 → 2.3.291

package/dist/models/AppealAgainstAdministrativeDecisionRequestModel.d.ts

@@ -24,18 +24,18 @@ export declare class AppealAgainstAdministrativeDecisionRequest extends BaseMode
     submission_date: Date;
     title_of_complaint: string;
     appeal_against_decision: string;
-    description: string;
+    description: string | null;
     decision_number: string;
-    decision_date: Date;
+    decision_date: Date | null;
     decision_subject: string;
-    grievance_details: string;
+    grievance_details: string | null;
     individuals_involved: string[] | null;
     times: string[] | null;
     dates: Date | null;
     location: string | null;
     requests: string[] | null;
     events: string[] | null;
-    grievant_name: string;
+    grievant_name: string | null;
     grievant_employee_number: string;
     grievant_directorate_id: number | null;
     grievant_department_id: number | null;

package/dist/models/AppealAgainstAdministrativeDecisionRequestModel.js

@@ -90,24 +90,24 @@ __decorate([
     __metadata("design:type", String)
 ], AppealAgainstAdministrativeDecisionRequest.prototype, "appeal_against_decision", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "text", nullable: false }),
-    __metadata("design:type", String)
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
 ], AppealAgainstAdministrativeDecisionRequest.prototype, "description", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
     __metadata("design:type", String)
 ], AppealAgainstAdministrativeDecisionRequest.prototype, "decision_number", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "date", nullable: false }),
-    __metadata("design:type", Date)
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    __metadata("design:type", Object)
 ], AppealAgainstAdministrativeDecisionRequest.prototype, "decision_date", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "text", nullable: false }),
     __metadata("design:type", String)
 ], AppealAgainstAdministrativeDecisionRequest.prototype, "decision_subject", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "text", nullable: false }),
-    __metadata("design:type", String)
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
 ], AppealAgainstAdministrativeDecisionRequest.prototype, "grievance_details", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "jsonb", nullable: true }),
@@ -134,8 +134,8 @@ __decorate([
     __metadata("design:type", Object)
 ], AppealAgainstAdministrativeDecisionRequest.prototype, "events", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 500, nullable: false }),
-    __metadata("design:type", String)
+    (0, typeorm_1.Column)({ type: "varchar", length: 500, nullable: true }),
+    __metadata("design:type", Object)
 ], AppealAgainstAdministrativeDecisionRequest.prototype, "grievant_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: false }),

package/dist/models/CyberSecurityAuditRequestModel.d.ts

@@ -37,5 +37,7 @@ export declare class CyberSecurityAuditRequest extends BaseModel {
     application_to_be_audited: CyberSecurityAuditApplicationType;
     application_to_be_audited_other: string | null;
     submission_date: Date;
+    date: Date | null;
+    time: string | null;
     constructor(user_id: number, request_classification: CyberSecurityAuditClassification, application_to_be_audited: CyberSecurityAuditApplicationType, submission_date: Date, status?: CyberSecurityAuditRequestStatus, service_id?: number | null, sub_service_id?: number | null, req_user_department_id?: number | null, req_user_section_id?: number | null, requesting_to_department_id?: number | null, requesting_to_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, request_id?: string | null, application_to_be_audited_other?: string | null);
 }

package/dist/models/CyberSecurityAuditRequestModel.js

@@ -134,6 +134,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: "date", nullable: false }),
     __metadata("design:type", Date)
 ], CyberSecurityAuditRequest.prototype, "submission_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    __metadata("design:type", Object)
+], CyberSecurityAuditRequest.prototype, "date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 8, nullable: true }),
+    __metadata("design:type", Object)
+], CyberSecurityAuditRequest.prototype, "time", void 0);
 exports.CyberSecurityAuditRequest = CyberSecurityAuditRequest = __decorate([
     (0, typeorm_1.Entity)({ name: "cyber_security_audit_requests" }),
     __metadata("design:paramtypes", [Number, String, String, Date, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])

package/dist/models/CyberSecurityRiskManagementRiskModel.d.ts

@@ -28,6 +28,8 @@ export declare class CyberSecurityRiskManagementRisk extends BaseModel {
     end_date: Date;
     iso_control_reference: string | null;
     risk_treatment_plan: string;
+    treatment: string | null;
+    action: string | null;
     confidentiality: number | null;
     integrity: number | null;
     availability: number | null;

package/dist/models/CyberSecurityRiskManagementRiskModel.js

@@ -98,6 +98,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: "text", nullable: false }),
     __metadata("design:type", String)
 ], CyberSecurityRiskManagementRisk.prototype, "risk_treatment_plan", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
+], CyberSecurityRiskManagementRisk.prototype, "treatment", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
+], CyberSecurityRiskManagementRisk.prototype, "action", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Object)

package/dist/models/MaintenanceRequestModel.d.ts

@@ -3,7 +3,9 @@ export declare enum AssetMaintenanceCategory {
     BUILDING = "Building",
     EQUIPMENT = "Equipment",
     RESIDENTIAL = "Residential",
-    STATION = "Station"
+    STATION = "Station",
+    PLOT_OF_LAND = "Plot of land",
+    OTHER = "Other"
 }
 export declare enum AssetMaintenanceSubCategory {
     ELECTRICAL = "Electrical",

package/dist/models/MaintenanceRequestModel.js

@@ -18,6 +18,8 @@ var AssetMaintenanceCategory;
     AssetMaintenanceCategory["EQUIPMENT"] = "Equipment";
     AssetMaintenanceCategory["RESIDENTIAL"] = "Residential";
     AssetMaintenanceCategory["STATION"] = "Station";
+    AssetMaintenanceCategory["PLOT_OF_LAND"] = "Plot of land";
+    AssetMaintenanceCategory["OTHER"] = "Other";
 })(AssetMaintenanceCategory || (exports.MaintenanceCategory = exports.AssetMaintenanceCategory = AssetMaintenanceCategory = {}));
 var AssetMaintenanceSubCategory;
 (function (AssetMaintenanceSubCategory) {

package/dist/models/RequestATenderRequestModel.d.ts

@@ -18,6 +18,8 @@ export declare class RequestATenderRequest extends BaseModel {
     scope_of_work: string;
     type_of_request: RequestATenderType;
     date_of_submission: Date;
+    date: Date | null;
+    time: string | null;
     phone: string;
     budget_code: string | null;
     estimated_cost: string;

package/dist/models/RequestATenderRequestModel.js

@@ -69,6 +69,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: "date", nullable: false }),
     __metadata("design:type", Date)
 ], RequestATenderRequest.prototype, "date_of_submission", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    __metadata("design:type", Object)
+], RequestATenderRequest.prototype, "date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 8, nullable: true }),
+    __metadata("design:type", Object)
+], RequestATenderRequest.prototype, "time", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 30, nullable: false }),
     __metadata("design:type", String)

package/dist/models/ResidentialUnitRentalRequestModel.d.ts

@@ -19,7 +19,7 @@ export declare class ResidentialUnitRentalRequest extends BaseModel {
         three_room?: boolean;
     };
     extension_number: string;
-    preferred_start_date: Date;
+    preferred_start_date: Date | null;
     family_size: number;
     phone_number: string;
     location_of_unit: string;

package/dist/models/ResidentialUnitRentalRequestModel.js

@@ -54,8 +54,8 @@ __decorate([
     __metadata("design:type", String)
 ], ResidentialUnitRentalRequest.prototype, "extension_number", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
-    __metadata("design:type", Date)
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
 ], ResidentialUnitRentalRequest.prototype, "preferred_start_date", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: false }),

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.3.290",
+  "version": "2.3.291",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
   "scripts": {

package/sql/add_all_workflow_chat_arabic_columns.sql

@@ -1 +1 @@
--- Auto-generated: Arabic columns for all CAA workflow/chat tables
+-- Auto-generated: Arabic columns for all CAA workflow/chat tables

package/sql/caa_api_payload_changes_2026_07.sql

@@ -0,0 +1,32 @@
+-- CAA API payload changes (Jul 2026)
+-- Run after deploying updated shared_models and services.
+
+-- 1. Maintenance: add category enum values
+ALTER TYPE asset_maintenance_category_en ADD VALUE IF NOT EXISTS 'Plot of land';
+ALTER TYPE asset_maintenance_category_en ADD VALUE IF NOT EXISTS 'Other';
+
+-- 2. Residential unit rental: preferred_start_date optional
+ALTER TABLE residential_unit_rental_requests
+  ALTER COLUMN preferred_start_date DROP NOT NULL;
+
+-- 3. Appeal against administrative decision: optional / removed payload fields
+ALTER TABLE appeal_against_administrative_decision_requests
+  ALTER COLUMN description DROP NOT NULL,
+  ALTER COLUMN grievance_details DROP NOT NULL,
+  ALTER COLUMN decision_date DROP NOT NULL,
+  ALTER COLUMN grievant_name DROP NOT NULL;
+
+-- 4. Cyber security audit: date and time fields
+ALTER TABLE cyber_security_audit_requests
+  ADD COLUMN IF NOT EXISTS date DATE,
+  ADD COLUMN IF NOT EXISTS time VARCHAR(8);
+
+-- 5. Request a tender: date and time fields
+ALTER TABLE request_a_tender_requests
+  ADD COLUMN IF NOT EXISTS date DATE,
+  ADD COLUMN IF NOT EXISTS time VARCHAR(8);
+
+-- 6. Cyber security risk management risks: treatment and action fields
+ALTER TABLE cyber_security_risk_management_risks
+  ADD COLUMN IF NOT EXISTS treatment TEXT,
+  ADD COLUMN IF NOT EXISTS action TEXT;

package/src/models/AccessCardChatModel.ts

@@ -28,9 +28,9 @@ export class AccessCardRequestChat extends BaseModel {
   role_id: number;
 
   @Column({ type: "text", nullable: false })
-  message: string;
-  @Column({ type: "text", nullable: true })
-  message_ar: string | null;
+  message: string;
+  @Column({ type: "text", nullable: true })
+  message_ar: string | null;
 
 
     @Column({
@@ -42,9 +42,9 @@ export class AccessCardRequestChat extends BaseModel {
   messageType: AccessCardMessageType;
 
   @Column({ type: 'text', nullable: true })
-  status: string;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+  status: string;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
 
 
   constructor(

package/src/models/AccessCardWorkflowModel.ts

@@ -19,9 +19,9 @@ export class AccessCardWorkflow extends BaseModel {
   sub_service_id: number | null;
 
   @Column({ type: "varchar", length: 500, nullable: false })
-  content: string;
-  @Column({ type: "varchar", length: 500, nullable: true })
-  content_ar: string | null;
+  content: string;
+  @Column({ type: "varchar", length: 500, nullable: true })
+  content_ar: string | null;
 
 
   @Column({
@@ -30,9 +30,9 @@ export class AccessCardWorkflow extends BaseModel {
     default: AccessCardWorkflowStatus.NOT_YET_STARTED,
     nullable: false
   })
-  status: AccessCardWorkflowStatus;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+  status: AccessCardWorkflowStatus;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
 
 
   @Column({ type: "integer", nullable: true })

package/src/models/AccommodationChatModel.ts

@@ -24,9 +24,9 @@ export class AccommodationChat extends BaseModel {
     user_id: number;
 
     @Column({ type: 'text', nullable: false })
-    message: string;
-  @Column({ type: "text", nullable: true })
-  message_ar: string | null;
+    message: string;
+  @Column({ type: "text", nullable: true })
+  message_ar: string | null;
 
 
     @Column({ type: 'varchar', length: 20, nullable: false })
@@ -39,9 +39,9 @@ export class AccommodationChat extends BaseModel {
     approver_role_id: number;
 
     @Column({ type: 'varchar', length: 50, nullable: true })
-    status: string;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+    status: string;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
  // Submitted, Pending, Approved, Rejected
 
     @Column({ type: 'int', nullable: false })

package/src/models/AccommodationWorkflowModel.ts

@@ -27,9 +27,9 @@ export class AccommodationWorkflow extends BaseModel {
     current_level: number;
 
     @Column({ type: 'varchar', length: 500, nullable: true })
-    content: string;
-  @Column({ type: "varchar", length: 500, nullable: true })
-  content_ar: string | null;
+    content: string;
+  @Column({ type: "varchar", length: 500, nullable: true })
+  content_ar: string | null;
 
 
     @Column({ 
@@ -38,9 +38,9 @@ export class AccommodationWorkflow extends BaseModel {
         default: AccommodationWorkFlowStatus.Pending,
         nullable: false 
     })
-    status: AccommodationWorkFlowStatus;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+    status: AccommodationWorkFlowStatus;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
 
 
     @Column({ type: 'int', nullable: true })

package/src/models/AirportEntryPermitChatModel.ts

@@ -29,9 +29,9 @@ export class AirportEntryPermitChat extends BaseModel {
   role_id: number | null;
 
   @Column({ type: 'text', nullable: false })
-  message: string;
-  @Column({ type: "text", nullable: true })
-  message_ar: string | null;
+  message: string;
+  @Column({ type: "text", nullable: true })
+  message_ar: string | null;
 
 
   @Column({ 
@@ -43,9 +43,9 @@ export class AirportEntryPermitChat extends BaseModel {
   messageType: AirportEntryPermitMessageTypes;
 
   @Column({ type: 'text', nullable: true })
-  status: string;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+  status: string;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
 
 
   constructor(

package/src/models/AirportEntryPermitWorkflowModel.ts

@@ -19,15 +19,15 @@ export class AirportEntryPermitWorkFlow extends BaseModel {
   sub_service_id: number | null;
 
   @Column({ type: 'varchar', length: 500, nullable: false })
-  content: string;
-  @Column({ type: "varchar", length: 500, nullable: true })
-  content_ar: string | null;
+  content: string;
+  @Column({ type: "varchar", length: 500, nullable: true })
+  content_ar: string | null;
 
 
   @Column({ type: 'enum', enum: AirportEntryPermitWorkFlowStatus, default: AirportEntryPermitWorkFlowStatus.NOT_YET_STARTED, nullable: false })
-  status: AirportEntryPermitWorkFlowStatus;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+  status: AirportEntryPermitWorkFlowStatus;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
 
 
   @Column({ type: 'integer', nullable: true })

package/src/models/AnnualTrainingPlanChatModel.ts

@@ -31,9 +31,9 @@ export class AnnualTrainingPlanRequestChat extends BaseModel {
     user_id: number;
 
     @Column({ type: "text", nullable: false })
-    message: string;
-  @Column({ type: "text", nullable: true })
-  message_ar: string | null;
+    message: string;
+  @Column({ type: "text", nullable: true })
+  message_ar: string | null;
 
 
     @Column({ type: "integer", nullable: true })
@@ -51,9 +51,9 @@ export class AnnualTrainingPlanRequestChat extends BaseModel {
     is_internal: boolean;
 
     @Column({ type: "text", nullable: false })
-    status: string;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+    status: string;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
 
 
     constructor(

package/src/models/AnnualTrainingPlanWorkflowModel.ts

@@ -23,9 +23,9 @@ export class AnnualTrainingPlanWorkFlow extends BaseModel {
     order: number | null;
 
     @Column({ type: "varchar", length: 255, nullable: false })
-    content: string;
-  @Column({ type: "varchar", length: 500, nullable: true })
-  content_ar: string | null;
+    content: string;
+  @Column({ type: "varchar", length: 500, nullable: true })
+  content_ar: string | null;
 
 
     @Column({ type: "integer", nullable: true })
@@ -43,9 +43,9 @@ export class AnnualTrainingPlanWorkFlow extends BaseModel {
         default: AnnualTrainingPlanWorkFlowStatus.PENDING,
         nullable: false
     })
-    status: AnnualTrainingPlanWorkFlowStatus;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+    status: AnnualTrainingPlanWorkFlowStatus;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
 
 
     constructor(

package/src/models/AppealAgainstAdministrativeDecisionRequestModel.ts

@@ -63,20 +63,20 @@ export class AppealAgainstAdministrativeDecisionRequest extends BaseModel {
     @Column({ type: "text", nullable: false })
     appeal_against_decision: string;
 
-    @Column({ type: "text", nullable: false })
-    description: string;
+    @Column({ type: "text", nullable: true })
+    description: string | null;
 
     @Column({ type: "varchar", length: 255, nullable: false })
     decision_number: string;
 
-    @Column({ type: "date", nullable: false })
-    decision_date: Date;
+    @Column({ type: "date", nullable: true })
+    decision_date: Date | null;
 
     @Column({ type: "text", nullable: false })
     decision_subject: string;
 
-    @Column({ type: "text", nullable: false })
-    grievance_details: string;
+    @Column({ type: "text", nullable: true })
+    grievance_details: string | null;
 
     @Column({ type: "jsonb", nullable: true })
     individuals_involved: string[] | null;
@@ -96,8 +96,8 @@ export class AppealAgainstAdministrativeDecisionRequest extends BaseModel {
     @Column({ type: "jsonb", nullable: true })
     events: string[] | null;
 
-    @Column({ type: "varchar", length: 500, nullable: false })
-    grievant_name: string;
+    @Column({ type: "varchar", length: 500, nullable: true })
+    grievant_name: string | null;
 
     @Column({ type: "varchar", length: 100, nullable: false })
     grievant_employee_number: string;

package/src/models/AssignTasksEmpChatModel.ts

@@ -28,9 +28,9 @@ export class AssignTasksEmpRequestChat extends BaseModel {
     role_id: number;
 
     @Column({ type: 'text', nullable: false })
-    message: string;
-  @Column({ type: "text", nullable: true })
-  message_ar: string | null;
+    message: string;
+  @Column({ type: "text", nullable: true })
+  message_ar: string | null;
 
 
     @Column({
@@ -42,9 +42,9 @@ export class AssignTasksEmpRequestChat extends BaseModel {
     messageType: AssignTasksEmpMessageType;
 
     @Column({ type: 'text', nullable: true })
-    status: string | null;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+    status: string | null;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
 
 
     constructor(

package/src/models/AssignTasksEmpWorkflowModel.ts

@@ -20,15 +20,15 @@ export class AssignTasksEmpWorkFlow extends BaseModel {
   sub_service_id: number | null;
 
   @Column({ type: 'varchar', length: 500, nullable: false })
-  content: string;
-  @Column({ type: "varchar", length: 500, nullable: true })
-  content_ar: string | null;
+  content: string;
+  @Column({ type: "varchar", length: 500, nullable: true })
+  content_ar: string | null;
 
 
   @Column({ type: 'enum', enum: AssignTasksEmpWorkFlowStatus, default: AssignTasksEmpWorkFlowStatus.NOT_YET_STARTED, nullable: false })
-  status: AssignTasksEmpWorkFlowStatus;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+  status: AssignTasksEmpWorkFlowStatus;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
 
 
   @Column({ type: 'integer', nullable: true })

package/src/models/ComplaintLostPropertyReportChatModel.ts

@@ -24,18 +24,18 @@ export class ComplaintLostPropertyReportChat extends BaseModel {
   user_id: number;
 
   @Column({ type: "text", nullable: false })
-  message: string;
-  @Column({ type: "text", nullable: true })
-  message_ar: string | null;
+  message: string;
+  @Column({ type: "text", nullable: true })
+  message_ar: string | null;
 
 
   @Column({ type: "int", nullable: true })
   approver_role_id: number | null;
 
   @Column({ type: "varchar", length: 255, nullable: false, default: "Pending" })
-  status: string;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+  status: string;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
 
 
   @Column({

package/src/models/ComplaintLostPropertyReportWorkflowModel.ts

@@ -19,15 +19,15 @@ export class ComplaintLostPropertyReportWorkflow extends BaseModel {
   current_level: number;
 
   @Column({ type: "varchar", length: 500, nullable: true })
-  content: string;
-  @Column({ type: "varchar", length: 500, nullable: true })
-  content_ar: string | null;
+  content: string;
+  @Column({ type: "varchar", length: 500, nullable: true })
+  content_ar: string | null;
 
 
   @Column({ type: "varchar", length: 50, nullable: false })
-  status: string;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+  status: string;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
 
 
   @Column({ type: "int", nullable: true })

package/src/models/CyberSecurityAuditRequestModel.ts

@@ -81,6 +81,12 @@ export class CyberSecurityAuditRequest extends BaseModel {
     @Column({ type: "date", nullable: false })
     submission_date: Date;
 
+    @Column({ type: "date", nullable: true })
+    date: Date | null;
+
+    @Column({ type: "varchar", length: 8, nullable: true })
+    time: string | null;
+
     constructor(
         user_id: number,
         request_classification: CyberSecurityAuditClassification,

package/src/models/CyberSecurityRiskManagementRiskModel.ts

@@ -68,6 +68,12 @@ export class CyberSecurityRiskManagementRisk extends BaseModel {
     @Column({ type: "text", nullable: false })
     risk_treatment_plan: string;
 
+    @Column({ type: "text", nullable: true })
+    treatment: string | null;
+
+    @Column({ type: "text", nullable: true })
+    action: string | null;
+
     @Column({ type: "integer", nullable: true })
     confidentiality: number | null;
 

package/src/models/DutyMissionChatModel.ts

@@ -29,9 +29,9 @@ export class DutyMissionRequestChat extends BaseModel {
     role_id: number;
 
     @Column({ type: 'text', nullable: false })
-    message: string;
-  @Column({ type: "text", nullable: true })
-  message_ar: string | null;
+    message: string;
+  @Column({ type: "text", nullable: true })
+  message_ar: string | null;
 
 
     @Column({
@@ -43,9 +43,9 @@ export class DutyMissionRequestChat extends BaseModel {
     messageType: DutyMissionMessageType;
 
     @Column({ type: 'text', nullable: true })
-    status: string | null;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
+    status: string | null;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
 
 
     constructor(