Couple of updates after reviewing PR

DEFRA · Dec 6, 2024 · 39a1c08 · 39a1c08
1 parent 0051577
commit 39a1c08
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Btms.Backend.Data/MigrationException.cs → Btms.Backend.Data/ConcurrencyException.cs b/Btms.Backend.Data/MigrationException.cs → Btms.Backend.Data/ConcurrencyException.cs
diff --git a/Btms.Business/Services/LinkingService.cs b/Btms.Business/Services/LinkingService.cs
@@ -115,6 +115,7 @@ await dbContext.Notifications.Update(notification, notification._Etag, transacti
             }
             catch (Exception e)
             {
+                // No Exception is logged at this point, as its logged further up the stack
                 metrics.Faulted(e);
                 throw new LinkException(e);
             }

diff --git a/Btms.Consumers/AlvsClearanceRequestConsumer.cs b/Btms.Consumers/AlvsClearanceRequestConsumer.cs
@@ -40,11 +40,10 @@ public async Task OnHandle(AlvsClearanceRequest message)
 
                 if (existingMovement is not null)
                 {
-                    persistedMovement = existingMovement.DeepClone();
                     if (movement.ClearanceRequests[0].Header?.EntryVersionNumber >
                         existingMovement.ClearanceRequests[0].Header?.EntryVersionNumber)
                     {
-                        ////movement.AuditEntries = existingMovement.AuditEntries;
+                        persistedMovement = existingMovement.DeepClone();
                         var auditEntry = AuditEntry.CreateUpdated(existingMovement.ClearanceRequests[0],
                             movement.ClearanceRequests[0],
                             BuildNormalizedAlvsPath(auditId!),
@@ -68,6 +67,7 @@ public async Task OnHandle(AlvsClearanceRequest message)
                     {
                         logger.MessageSkipped(Context.GetJobId()!, auditId!, GetType().Name, message.Header?.EntryReference!);
                         Context.Skipped();
+                        return;
                     }
                 }
                 else

diff --git a/Btms.Consumers/NotificationConsumer.cs b/Btms.Consumers/NotificationConsumer.cs
@@ -38,10 +38,10 @@ public async Task OnHandle(ImportNotification message)
                 Model.Ipaffs.ImportNotification persistedNotification = null!;
                 if (existingNotification is not null)
                 {
-                    persistedNotification = existingNotification.DeepClone();
                     if (internalNotification.UpdatedSource.TrimMicroseconds() >
                         existingNotification.UpdatedSource.TrimMicroseconds())
                     {
+                        persistedNotification = existingNotification.DeepClone();
                         internalNotification.AuditEntries = existingNotification.AuditEntries;
                         internalNotification.CreatedSource = existingNotification.CreatedSource;
                         internalNotification.Update(BuildNormalizedIpaffsPath(auditId!), existingNotification);
@@ -51,6 +51,7 @@ public async Task OnHandle(ImportNotification message)
                     {
                         logger.MessageSkipped(Context.GetJobId()!, auditId!, GetType().Name, message.ReferenceNumber!);
                         Context.Skipped();
+                        return;
                     }
                 }
                 else