diff --git a/backend/api/MQTT/MessageModels/IsarStep.cs b/backend/api/MQTT/MessageModels/IsarStep.cs deleted file mode 100644 index 7106ca56e..000000000 --- a/backend/api/MQTT/MessageModels/IsarStep.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Text.Json.Serialization; - -#nullable disable -namespace Api.Mqtt.MessageModels -{ - public class IsarStepMessage : MqttMessage - { - [JsonPropertyName("robot_name")] - public string RobotName { get; set; } - - [JsonPropertyName("isar_id")] - public string IsarId { get; set; } - - [JsonPropertyName("mission_id")] - public string MissionId { get; set; } - - [JsonPropertyName("task_id")] - public string TaskId { get; set; } - - [JsonPropertyName("step_id")] - public string StepId { get; set; } - - [JsonPropertyName("step_type")] - public string StepType { get; set; } - - [JsonPropertyName("status")] - public string Status { get; set; } - - [JsonPropertyName("timestamp")] - public DateTime Timestamp { get; set; } - } -} diff --git a/backend/api/MQTT/MqttService.cs b/backend/api/MQTT/MqttService.cs index 480430f7e..602694182 100644 --- a/backend/api/MQTT/MqttService.cs +++ b/backend/api/MQTT/MqttService.cs @@ -86,7 +86,6 @@ public MqttService(ILogger logger, IConfiguration config) public static event EventHandler? MqttIsarRobotHeartbeatReceived; public static event EventHandler? MqttIsarMissionReceived; public static event EventHandler? MqttIsarTaskReceived; - public static event EventHandler? MqttIsarStepReceived; public static event EventHandler? MqttIsarBatteryReceived; public static event EventHandler? MqttIsarPressureReceived; public static event EventHandler? MqttIsarPoseReceived; @@ -137,9 +136,6 @@ private Task OnMessageReceived(MqttApplicationMessageReceivedEventArgs messageRe case Type type when type == typeof(IsarTaskMessage): OnIsarTopicReceived(content); break; - case Type type when type == typeof(IsarStepMessage): - OnIsarTopicReceived(content); - break; case Type type when type == typeof(IsarBatteryMessage): OnIsarTopicReceived(content); break; @@ -296,7 +292,6 @@ private void OnIsarTopicReceived(string content) where T : MqttMessage _ when type == typeof(IsarRobotHeartbeatMessage) => MqttIsarRobotHeartbeatReceived, _ when type == typeof(IsarMissionMessage) => MqttIsarMissionReceived, _ when type == typeof(IsarTaskMessage) => MqttIsarTaskReceived, - _ when type == typeof(IsarStepMessage) => MqttIsarStepReceived, _ when type == typeof(IsarBatteryMessage) => MqttIsarBatteryReceived, _ when type == typeof(IsarPressureMessage) => MqttIsarPressureReceived, _ when type == typeof(IsarPoseMessage) => MqttIsarPoseReceived, diff --git a/backend/api/MQTT/MqttTopics.cs b/backend/api/MQTT/MqttTopics.cs index 3d6fcbf42..93dae6b74 100644 --- a/backend/api/MQTT/MqttTopics.cs +++ b/backend/api/MQTT/MqttTopics.cs @@ -28,9 +28,6 @@ public static class MqttTopics { "isar/+/task", typeof(IsarTaskMessage) }, - { - "isar/+/step", typeof(IsarStepMessage) - }, { "isar/+/battery", typeof(IsarBatteryMessage) }, diff --git a/frontend/src/models/Inspection.ts b/frontend/src/models/Inspection.ts index b19ffdaa1..92dd2df84 100644 --- a/frontend/src/models/Inspection.ts +++ b/frontend/src/models/Inspection.ts @@ -2,7 +2,7 @@ import { Position } from './Position' export interface Inspection { id: string - isarStepId?: string + isarTaskId?: string status: InspectionStatus isCompleted: boolean inspectionType: InspectionType