Merge pull request #478 from bcgov/yj

Yj

server/StrDss.Data/Repositories/RentalListingRepository.cs

@@ -23,6 +23,7 @@ public interface IRentalListingRepository
         Task ConfirmAddressAsync(long rentalListingId);
         Task<DssRentalListing> UpdateAddressAsync(UpdateListingAddressDto dto);
         DateTime GetLatestRentalListingExportTime();
+        Task<bool> IsListingUploadProcessRunning();
     }
     public class RentalListingRepository : RepositoryBase<DssRentalListingVw>, IRentalListingRepository
     {
@@ -552,5 +553,11 @@ public DateTime GetLatestRentalListingExportTime()
                 return DateTime.UtcNow.AddDays(-1);
             }
         }
+
+        public async Task<bool> IsListingUploadProcessRunning()
+        {
+            return await _dbContext.DssUploadLines
+                .AnyAsync(x => x.IncludingUploadDelivery.UploadDeliveryType == "rental_report" && x.IsProcessed == false);                
+        }
     }
 }

server/StrDss.Service/Hangfire/DisableConcurrentExecutionAttribute.cs

@@ -0,0 +1,39 @@
+using Hangfire.Common;
+using Hangfire.Server;
+using Hangfire;
+
+namespace StrDss.Service.Hangfire
+{
+    /// <summary>
+    /// Usage:
+    /// 
+    ///     [DisableConcurrentExecution(timeoutInSeconds: 10 * 60)]
+    /// 
+    /// </summary>
+
+    public class DisableConcurrentExecutionAttribute : JobFilterAttribute, IServerFilter
+    {
+        private readonly int _timeoutInSeconds;
+
+        public DisableConcurrentExecutionAttribute(int timeoutInSeconds)
+        {
+            _timeoutInSeconds = timeoutInSeconds;
+        }
+
+        public void OnPerforming(PerformingContext filterContext)
+        {
+            var jobId = filterContext.BackgroundJob.Id;
+            var connection = JobStorage.Current.GetConnection();
+            var currentJob = connection.GetJobData(jobId);
+
+            if (currentJob != null && currentJob.State == "Processing")
+            {
+                throw new InvalidOperationException("This job is already being processed.");
+            }
+        }
+
+        public void OnPerformed(PerformedContext filterContext)
+        {
+        }
+    }
+}

server/StrDss.Service/RentalListingService.cs

@@ -104,6 +104,14 @@ public async Task CreateRentalListingExportFiles()
                 return;
             }
 
+            var isListingUploadProcessRunning = await _listingRepo.IsListingUploadProcessRunning();
+
+            if (isListingUploadProcessRunning)
+            {
+                _logger.LogInformation("Skipping CreateRentalListingExportFiles: Rental Listing Upload Process is running");
+                return;
+            }
+
             var listingIds = await _listingRepo.GetRentalListingIdsToExport();
             var headers = RentalListingExport.GetHeadersAsCsv();