Merge pull request #797 from bcgov/hotfix

fix: takedown confirmation not being processed

Author: ychung-mot

server/StrDss.Data/Repositories/UploadDeliveryRepository.cs

@@ -14,7 +14,7 @@ public interface IUploadDeliveryRepository
         Task AddUploadDeliveryAsync(DssUploadDelivery upload);
         Task<DssUploadDelivery?> GetUploadToProcessAsync(string reportType);
         Task<DssUploadDelivery?> GetNonTakedownUploadToProcessAsync();
-        Task<DssUploadDelivery[]> GetUploadsToProcessAsync(string reportType);
+        Task<DssUploadDelivery[]> GetUploadsToProcessForOneYearAsync(string reportType);
         Task<DssUploadDelivery?> GetRentalListingUploadWithErrors(long uploadId);
         Task<DssUploadLine?> GetUploadLineAsync(long uploadId, string orgCd, string listingId);
         Task<List<UploadLineToProcess>> GetUploadLinesToProcessAsync(long uploadId);
@@ -65,11 +65,13 @@ public async Task<bool> IsDuplicateRentalReportUploadAsnyc(DateOnly? periodYm, l
                 .FirstOrDefaultAsync();
         }
 
-        public async Task<DssUploadDelivery[]> GetUploadsToProcessAsync(string reportType)
+        public async Task<DssUploadDelivery[]> GetUploadsToProcessForOneYearAsync(string reportType)
         {
+            var dateFrom = DateTime.UtcNow.AddMonths(-12);
+
             return await _dbSet
                 .Include(x => x.ProvidingOrganization)
-                .Where(x => x.DssUploadLines.Any(line => !line.IsProcessed) && x.UploadDeliveryType == reportType)
+                .Where(x => x.DssUploadLines.Any(line => !line.IsProcessed) && x.UploadDeliveryType == reportType && x.UpdDtm >= dateFrom)
                 .OrderBy(x => x.ProvidingOrganizationId)
                     .ThenBy(x => x.ReportPeriodYm)
                         .ThenBy(x => x.UpdDtm) //Users can upload the same listing multiple times. The processing of these listings follows a first-come, first-served approach.

server/StrDss.Service/Hangfire/HangfireJobs.cs

@@ -67,7 +67,7 @@ public async Task ProcessUpload()
                     await _linstingReportService.ProcessRentalReportUploadAsync(upload);
                     break;
                 case UploadDeliveryTypes.TakedownData:
-                    await _tdcService.ProcessTakedownConfirmationUploadAsync(upload);
+                    await _tdcService.ProcessTakedownConfirmationUploadsAsync();
                     break;
                 case UploadDeliveryTypes.LicenceData:
                     await _bizLicService.ProcessBizLicenceUploadMainAsync(upload);

server/StrDss.Service/TakedownConfirmationService.cs

@@ -15,6 +15,7 @@ namespace StrDss.Service
     public interface ITakedownConfirmationService
     {
         Task ProcessTakedownConfirmationUploadAsync(DssUploadDelivery upload);
+        Task ProcessTakedownConfirmationUploadsAsync();
     }
     public class TakedownConfirmationService : ServiceBase, ITakedownConfirmationService
     {
@@ -34,11 +35,21 @@ public TakedownConfirmationService(
             _orgRepo = orgRepo;
         }
 
+        public async Task ProcessTakedownConfirmationUploadsAsync()
+        {
+            var uploads = await _uploadRepo.GetUploadsToProcessForOneYearAsync(UploadDeliveryTypes.TakedownData);
+
+            foreach (var upload in uploads)
+            {
+                await ProcessTakedownConfirmationUploadAsync(upload);
+            }
+        }
+        
         public async Task ProcessTakedownConfirmationUploadAsync(DssUploadDelivery upload)
         {
             var processStopwatch = Stopwatch.StartNew();
 
-            _logger.LogInformation($"Processing Takedown Confirmation {upload.ProvidingOrganizationId} - {upload.ReportPeriodYm} - {upload.ProvidingOrganization.OrganizationNm}");
+            _logger.LogInformation($"Processing Takedown Confirmation ({upload.UploadDeliveryId}) {upload.ProvidingOrganization.OrganizationNm} - {upload.ReportPeriodYm}");
 
             var count = 0;