Edit analysis result

to match new format in SARA equinor/sara#243

Author: tsundvoll

backend/api/Database/Models/AnalysisResult.cs

@@ -1,42 +1,30 @@
 using System.ComponentModel.DataAnnotations;
-using System.Text.Json.Serialization;
 
 namespace Api.Database.Models
 {
     public class AnalysisResult
     {
-        [JsonPropertyName("inspectionId")]
         [Key]
         public required string InspectionId { get; set; }
 
-        [JsonPropertyName("analysisType")]
+        [Required]
         public required string AnalysisType { get; set; }
 
-        [JsonPropertyName("displayText")]
-        public required string DisplayText { get; set; }
+        public string? Value { get; set; }
 
-        [JsonPropertyName("value")]
-        public float? Value { get; set; }
-
-        [JsonPropertyName("unit")]
         public string? Unit { get; set; }
 
-        [JsonPropertyName("class")]
-        public string? Class { get; set; }
-
-        [JsonPropertyName("confidence")]
         public float? Confidence { get; set; }
 
-        [JsonPropertyName("warning")]
         public string? Warning { get; set; }
 
-        [JsonPropertyName("storageAccount")]
+        [Required]
         public required string StorageAccount { get; set; }
 
-        [JsonPropertyName("blobContainer")]
+        [Required]
         public required string BlobContainer { get; set; }
 
-        [JsonPropertyName("blobName")]
+        [Required]
         public required string BlobName { get; set; }
     }
 }

backend/api/EventHandlers/MqttEventHandler.cs

@@ -814,10 +814,8 @@ private async void OnSaraAnalysisResultMessage(object? sender, MqttReceivedArgs
             {
                 InspectionId = saraAnalysisResult.InspectionId,
                 AnalysisType = saraAnalysisResult.AnalysisType,
-                DisplayText = saraAnalysisResult.DisplayText,
                 Value = saraAnalysisResult.Value,
                 Unit = saraAnalysisResult.Unit,
-                Class = saraAnalysisResult.Class,
                 Warning = saraAnalysisResult.Warning,
                 Confidence = saraAnalysisResult.Confidence,
                 StorageAccount = saraAnalysisResult.StorageAccount,

backend/api/MQTT/MessageModels/SaraAnalysisResult.cs

@@ -2,32 +2,25 @@
 
 namespace Api.Mqtt.MessageModels
 {
-#nullable disable
     public class SaraAnalysisResultMessage : MqttMessage
     {
         [JsonPropertyName("inspection_id")]
-        public string InspectionId { get; set; }
+        public required string InspectionId { get; set; }
 
         [JsonPropertyName("analysisType")]
         public required string AnalysisType { get; set; }
 
-        [JsonPropertyName("displayText")]
-        public required string DisplayText { get; set; }
-
         [JsonPropertyName("value")]
-        public float Value { get; set; }
+        public string? Value { get; set; }
 
         [JsonPropertyName("unit")]
-        public string Unit { get; set; }
-
-        [JsonPropertyName("class")]
-        public string Class { get; set; }
+        public string? Unit { get; set; }
 
         [JsonPropertyName("confidence")]
-        public float Confidence { get; set; }
+        public float? Confidence { get; set; }
 
         [JsonPropertyName("warning")]
-        public string Warning { get; set; }
+        public string? Warning { get; set; }
 
         [JsonPropertyName("storageAccount")]
         public required string StorageAccount { get; set; }