Merge pull request #186 from bcgov/dev

Dev To Test 2026-04-28

Author: AndreGAot

applications/Grants.ApplicantPortal/src/Grants.ApplicantPortal.Backend/src/Grants.ApplicantPortal.API.Infrastructure/Messaging/Jobs/InboxProcessorJob.cs

@@ -73,9 +73,6 @@ public async Task Execute(IJobExecutionContext context)
 
         try
         {
-            // First, release any expired locks
-            await _inboxRepository.ReleaseExpiredLocksAsync(cancellationToken);
-
             // Acquire distributed lock to ensure only one instance processes messages
             var lockResult = await _distributedLock.AcquireLockAsync(_lockKey, _lockDuration, TimeSpan.FromSeconds(5), cancellationToken);
 
@@ -96,6 +93,9 @@ public async Task Execute(IJobExecutionContext context)
 
             try
             {
+                // Release any expired application-level inbox message locks (only the pod that won the distributed lock does this)
+                await _inboxRepository.ReleaseExpiredLocksAsync(cancellationToken);
+
                 var processed = 0;
                 var startTime = DateTime.UtcNow;
 

applications/Grants.ApplicantPortal/src/Grants.ApplicantPortal.Backend/src/Grants.ApplicantPortal.API.Infrastructure/Messaging/Jobs/OutboxProcessorJob.cs

@@ -58,9 +58,6 @@ public async Task Execute(IJobExecutionContext context)
 
         try
         {
-            // First, release any expired locks
-            await _outboxRepository.ReleaseExpiredLocksAsync(cancellationToken);
-
             // Acquire distributed lock to ensure only one instance processes messages
             var lockResult = await _distributedLock.AcquireLockAsync(_lockKey, _lockDuration, TimeSpan.FromSeconds(5), cancellationToken);
 
@@ -81,6 +78,9 @@ public async Task Execute(IJobExecutionContext context)
 
             try
             {
+                // Release any expired message processing locks (only the pod that won the distributed lock does this)
+                await _outboxRepository.ReleaseExpiredLocksAsync(cancellationToken);
+
                 var processed = 0;
                 var startTime = DateTime.UtcNow;