WIP

Author: ianfnelson

src/ServiceLayer.Mesh/Functions/FileDiscoveryFunction.cs

@@ -14,8 +14,7 @@ public class FileDiscoveryFunction(
     IFileDiscoveryFunctionConfiguration configuration,
     IMeshInboxService meshInboxService,
     ServiceLayerDbContext serviceLayerDbContext,
-    IFileExtractQueueClient fileExtractQueueClient,
-    IMeshFileStatusService meshFileStatusService)
+    IFileExtractQueueClient fileExtractQueueClient)
 {
     [Function("FileDiscoveryFunction")]
     public async Task Run([TimerTrigger("%FileDiscoveryTimerExpression%")] TimerInfo myTimer)
@@ -34,11 +33,15 @@ public async Task Run([TimerTrigger("%FileDiscoveryTimerExpression%")] TimerInfo
 
             if (!existing)
             {
-                var file = MeshFile.Create(
-                    FileEventSource.DiscoveryFunction,
-                    MeshFileType.NbssAppointmentEvents,
-                    messageId,
-                    configuration.NbssMeshMailboxId);
+                var file = new MeshFile
+                {
+                    FileId = messageId,
+                    FileType = MeshFileType.NbssAppointmentEvents,
+                    MailboxId = configuration.NbssMeshMailboxId,
+                    Status = MeshFileStatus.Discovered,
+                    FirstSeenUtc = DateTime.UtcNow,
+                    LastUpdatedUtc = DateTime.UtcNow
+                };
 
                 serviceLayerDbContext.MeshFiles.Add(file);
 

src/ServiceLayer.Mesh/Functions/FileExtractFunction.cs

@@ -48,7 +48,6 @@ public async Task Run([QueueTrigger("%FileExtractQueueName%")] FileExtractQueueM
     private async Task<MeshFile?> GetFileAsync(string fileId)
     {
         var file = await serviceLayerDbContext.MeshFiles
-            .Include(x => x.Events)
             .FirstOrDefaultAsync(f => f.FileId == fileId);
 
         if (file == null)
@@ -79,7 +78,8 @@ private bool IsFileSuitableForExtraction(MeshFile file)
 
     private async Task UpdateFileStatusForExtraction(MeshFile file)
     {
-        file.SetStatus(FileEventSource.ExtractFunction, MeshFileStatus.Extracting);
+        file.Status = MeshFileStatus.Extracting;
+        file.LastUpdatedUtc = DateTime.UtcNow;
         await serviceLayerDbContext.SaveChangesAsync();
     }
 
@@ -100,7 +100,8 @@ private async Task ProcessFileExtraction(MeshFile file)
         }
 
         file.BlobPath = blobPath;
-        file.SetStatus(FileEventSource.ExtractFunction, MeshFileStatus.Extracted);
+        file.Status = MeshFileStatus.Extracted;
+        file.LastUpdatedUtc = DateTime.UtcNow;
         await serviceLayerDbContext.SaveChangesAsync();
 
         await fileTransformQueueClient.EnqueueFileTransformAsync(file);
@@ -109,7 +110,8 @@ private async Task ProcessFileExtraction(MeshFile file)
     private async Task HandleExtractionError(MeshFile file, FileExtractQueueMessage message, Exception ex)
     {
         logger.LogError(ex, "An exception occurred during file extraction for fileId: {FileId}", message.FileId);
-        file.SetStatus(FileEventSource.ExtractFunction, MeshFileStatus.FailedExtract);
+        file.Status = MeshFileStatus.FailedExtract;
+        file.LastUpdatedUtc = DateTime.UtcNow;
         await serviceLayerDbContext.SaveChangesAsync();
         await fileExtractQueueClient.SendToPoisonQueueAsync(message);
     }

src/ServiceLayer.Mesh/Functions/FileRetryFunction.cs

@@ -29,7 +29,6 @@ public async Task Run([TimerTrigger("%FileRetryTimerExpression%")] TimerInfo myT
     private async Task RetryStaleExtractions(DateTime staleDateTimeUtc)
     {
         var staleFiles = await serviceLayerDbContext.MeshFiles
-            .Include(x => x.Events)
             .Where(f =>
                 (f.Status == MeshFileStatus.Discovered || f.Status == MeshFileStatus.Extracting)
                 && f.LastUpdatedUtc <= staleDateTimeUtc)
@@ -49,7 +48,6 @@ private async Task RetryStaleExtractions(DateTime staleDateTimeUtc)
     private async Task RetryStaleTransformations(DateTime staleDateTimeUtc)
     {
         var staleFiles = await serviceLayerDbContext.MeshFiles
-            .Include(x => x.Events)
             .Where(f =>
                 (f.Status == MeshFileStatus.Extracted || f.Status == MeshFileStatus.Transforming)
                 && f.LastUpdatedUtc <= staleDateTimeUtc)

src/ServiceLayer.Mesh/Functions/FileTransformFunction.cs

@@ -58,7 +58,6 @@ public async Task Run([QueueTrigger("%FileTransformQueueName%")] FileTransformQu
     private async Task<MeshFile?> GetFileAsync(string fileId)
     {
         var file = await serviceLayerDbContext.MeshFiles
-            .Include(x => x.Events)
             .FirstOrDefaultAsync(f => f.FileId == fileId);
 
         if (file == null)

src/ServiceLayer.Mesh/Functions/MeshFileStatusService.cs

@@ -24,8 +24,6 @@
 
         services.AddApplicationConfiguration();
         services.AddNbssAppointmentEventServices();
-
-        services.AddScoped<IMeshFileStatusService, MeshFileStatusService>();
     });
 
 var app = host.Build();

src/ServiceLayer.Mesh/Program.cs

@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using System.Runtime.InteropServices;
 
 namespace ServiceLayer.Data.Models;
 
@@ -19,21 +18,4 @@ public class MeshFile
     public DateTime LastUpdatedUtc { get; set; }
     // ReSharper disable once EntityFramework.ModelValidation.UnlimitedStringLength
     public string? ValidationErrors { get; set; }
-
-    public void SetStatus(FileEventSource source, MeshFileStatus status)
-    {
-        var now = DateTime.UtcNow;
-
-        Events.Add(new MeshFileEvent
-        {
-            FileId = FileId,
-            Source = source,
-            OldStatus = Status,
-            NewStatus = status,
-            TimestampUtc = now
-        });
-
-        Status = status;
-        LastUpdatedUtc = now;
-    }
 }

src/ServiceLayer.Shared/Data/Models/MeshFile.cs

@@ -37,15 +37,16 @@ protected MeshFile SaveMeshFile(MeshFileStatus status = MeshFileStatus.Extracted
             LastUpdatedUtc = lastUpdated
         };
 
-        file.Events.Add(new MeshFileEvent
+        var fileEvent = new MeshFileEvent
         {
             FileId = fileId,
             NewStatus = status,
             TimestampUtc = lastUpdated,
             Source = FileEventSource.DiscoveryFunction
-        });
+        };
 
         DbContext.MeshFiles.Add(file);
+        DbContext.MeshFileEvents.Add(fileEvent);
         DbContext.SaveChanges();
         return file;
     }
@@ -62,12 +63,15 @@ protected MeshFile AssertFileUnchanged(string fileId, MeshFileStatus expectedSta
     protected MeshFile AssertFileUpdated(string fileId, MeshFileStatus expectedStatus, FileEventSource expectedSource)
     {
         var updated = DbContext.MeshFiles
-            .Include(x => x.Events)
             .Single(x => x.FileId == fileId);
         Assert.Equal(expectedStatus, updated.Status);
         Assert.True(updated.LastUpdatedUtc > DateTime.UtcNow.AddSeconds(-10));
 
-        var lastEvent = updated.Events.OrderByDescending(x => x.TimestampUtc).First();
+        var lastEvent = DbContext.MeshFileEvents
+            .Where(x => x.FileId == fileId)
+            .OrderByDescending(x => x.TimestampUtc)
+            .First();
+
         Assert.Equal(expectedStatus, lastEvent.NewStatus);
         Assert.True(lastEvent.TimestampUtc > DateTime.UtcNow.AddSeconds(-10));
         Assert.Equal(expectedSource, lastEvent.Source);