Store custom sources in SQL instead of blobs

equinor · Aug 1, 2024 · 810a79c · 810a79c
1 parent eeb8531
commit 810a79c
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 51 deletions.
diff --git a/backend/api/Database/Models/Source.cs b/backend/api/Database/Models/Source.cs
@@ -15,6 +15,8 @@ public class Source
 
         [Required]
         public MissionSourceType Type { get; set; }
+
+        public string? CustomMissionTasks { get; set; }
     }
 
     public enum MissionSourceType

diff --git a/backend/api/Options/StorageOptions.cs b/backend/api/Options/StorageOptions.cs
diff --git a/backend/api/Program.cs b/backend/api/Program.cs
@@ -120,7 +120,6 @@
 
 builder.Services.Configure<AzureAdOptions>(builder.Configuration.GetSection("AzureAd"));
 builder.Services.Configure<MapBlobOptions>(builder.Configuration.GetSection("Maps"));
-builder.Services.Configure<StorageOptions>(builder.Configuration.GetSection("Blob"));
 
 builder.Services
     .AddControllers()

diff --git a/backend/api/Services/ActionServices/CustomMissionSchedulingService.cs b/backend/api/Services/ActionServices/CustomMissionSchedulingService.cs
@@ -38,14 +38,7 @@ public async Task<MissionDefinition> FindExistingOrCreateCustomMissionDefinition
             {
                 try
                 {
-                    string sourceUrl = await customMissionService.UploadSource(missionTasks);
-                    source = await sourceService.Create(
-                        new Source
-                        {
-                            SourceId = sourceUrl,
-                            Type = MissionSourceType.Custom
-                        }
-                    );
+                    source = await customMissionService.CreateSourceIfOneDoesNotExist(missionTasks);
                 }
                 catch (Exception e)
                 {

diff --git a/backend/api/Services/CustomMissionService.cs b/backend/api/Services/CustomMissionService.cs
@@ -2,51 +2,64 @@
 using System.Text;
 using System.Text.Json;
 using Api.Database.Models;
-using Api.Options;
-using Microsoft.Extensions.Options;
 namespace Api.Services
 {
 
     public interface ICustomMissionService
     {
-        Task<string> UploadSource(List<MissionTask> tasks);
+        Task<Source> CreateSourceIfOneDoesNotExist(List<MissionTask> tasks);
 
         Task<List<MissionTask>?> GetMissionTasksFromSourceId(string id);
 
         string CalculateHashFromTasks(IList<MissionTask> tasks);
     }
 
-    public class CustomMissionService(IOptions<StorageOptions> storageOptions, IBlobService blobService) : ICustomMissionService
+    public class CustomMissionService(ILogger<CustomMissionService> logger, ISourceService sourceService) : ICustomMissionService
     {
-        public async Task<string> UploadSource(List<MissionTask> tasks)
+        public async Task<Source> CreateSourceIfOneDoesNotExist(List<MissionTask> tasks)
         {
             string json = JsonSerializer.Serialize(tasks);
             string hash = CalculateHashFromTasks(tasks);
-            await blobService.UploadJsonToBlob(json, hash, storageOptions.Value.CustomMissionContainerName, storageOptions.Value.AccountName, false);
 
-            return hash;
+            var existingSource = await sourceService.ReadById(hash);
+
+            if (existingSource != null) return existingSource;
+
+            var newSource = await sourceService.Create(
+                new Source
+                {
+                    SourceId = hash,
+                    Type = MissionSourceType.Custom,
+                    CustomMissionTasks = json
+                }
+            );
+
+            return newSource;
         }
 
         public async Task<List<MissionTask>?> GetMissionTasksFromSourceId(string id)
         {
-            List<MissionTask>? content;
+            var existingSource = await sourceService.ReadById(id);
+            if (existingSource == null || existingSource.CustomMissionTasks == null) return null;
+
             try
             {
-                byte[] rawContent = await blobService.DownloadBlob(id, storageOptions.Value.CustomMissionContainerName, storageOptions.Value.AccountName);
-                var rawBinaryContent = new BinaryData(rawContent);
-                content = rawBinaryContent.ToObjectFromJson<List<MissionTask>>();
+                var content = JsonSerializer.Deserialize<List<MissionTask>>(existingSource.CustomMissionTasks);
+
+                if (content == null) return null;
+
                 foreach (var task in content)
                 {
                     task.Id = Guid.NewGuid().ToString(); // This is needed as tasks are owned by mission runs
                     task.IsarTaskId = Guid.NewGuid().ToString(); // This is needed to update the tasks for the correct mission run
                 }
+                return content;
             }
-            catch (Exception)
+            catch (Exception e)
             {
+                logger.LogWarning("Unable to deserialize custom mission tasks with ID {Id}. {ErrorMessage}", id, e);
                 return null;
             }
-
-            return content;
         }
 
         public string CalculateHashFromTasks(IList<MissionTask> tasks)

diff --git a/backend/api/appsettings.Development.json b/backend/api/appsettings.Development.json
@@ -37,10 +37,6 @@
     "MaxRetryAttempts": 5,
     "ShouldFailOnMaxRetries": false
   },
-  "Blob": {
-    "CustomMissionContainerName": "custommission",
-    "AccountName": "flotilladevsa"
-  },
   "Database": {
     "UseInMemoryDatabase": false
   }

diff --git a/backend/api/appsettings.Local.json b/backend/api/appsettings.Local.json
@@ -37,10 +37,6 @@
     "MaxRetryAttempts": 5,
     "ShouldFailOnMaxRetries": false
   },
-  "Blob": {
-    "CustomMissionContainerName": "custommission",
-    "AccountName": "flotilladevsa"
-  },
   "ApplicationInsights": {
     "ConnectionString": ""
   },

diff --git a/backend/api/appsettings.Production.json b/backend/api/appsettings.Production.json
@@ -14,10 +14,6 @@
   },
   "AllowedHosts": "*",
   "AllowedOrigins": ["https://*.equinor.com/"],
-  "Blob": {
-    "CustomMissionContainerName": "custommission",
-    "AccountName": "flotillaprodsa"
-  },
   "Mqtt": {
     "Host": "localhost",
     "Port": 1883,

diff --git a/backend/api/appsettings.Staging.json b/backend/api/appsettings.Staging.json
@@ -18,10 +18,6 @@
     "http://localhost:3001",
     "https://localhost:3001"
   ],
-  "Blob": {
-    "CustomMissionContainerName": "custommission",
-    "AccountName": "flotillastagingsa"
-  },
   "Mqtt": {
     "Host": "localhost",
     "Port": 1883,

diff --git a/backend/api/appsettings.Test.json b/backend/api/appsettings.Test.json
@@ -16,10 +16,6 @@
     "http://localhost:3001",
     "https://localhost:3001"
   ],
-  "Blob": {
-    "CustomMissionContainerName": "custommission",
-    "AccountName": "flotillatestsa"
-  },
   "Mqtt": {
     "Host": "localhost",
     "Port": 1883,