diff --git a/WebAPI/dataProcessors/t1.r1.processor.cs b/WebAPI/dataProcessors/t1.r1.processor.cs index ce1bc04..f865f35 100644 --- a/WebAPI/dataProcessors/t1.r1.processor.cs +++ b/WebAPI/dataProcessors/t1.r1.processor.cs @@ -26,7 +26,7 @@ public class T1R1Processor( var processedLayer = db.Layers .Where(x => x.ParentId == processWorker.Id - && !x.IsDeleted) + && !x.IsDeleted && !x.IsCancelled) .OrderByDescending(x => x.CreatedAt) .FirstOrDefault(); @@ -70,7 +70,7 @@ public class T1R1Processor( var monthCopy = month; var dataSource = db.Layers.Where(x => x.Type == LayerType.Processed && - !x.IsDeleted && + !x.IsDeleted && !x.IsCancelled && x.Name != null && x.Name.Contains($"{year}/{monthCopy:D2}-{source.Desc1}-T3") ).Include(x => x.Records) .AsNoTracking() diff --git a/WebAPI/dataProcessors/t1.r3.processor.cs b/WebAPI/dataProcessors/t1.r3.processor.cs index 3c08472..bc0941b 100644 --- a/WebAPI/dataProcessors/t1.r3.processor.cs +++ b/WebAPI/dataProcessors/t1.r3.processor.cs @@ -25,7 +25,7 @@ public class T1R3Processor( var processedLayer = db.Layers .Where(x => x.ParentId == processWorker.Id - && !x.IsDeleted) + && !x.IsDeleted && !x.IsCancelled) .OrderByDescending(x => x.CreatedAt) .FirstOrDefault(); @@ -55,7 +55,7 @@ public class T1R3Processor( string pattern = @$"^L\d+-P-{year}/\d+-{source}-T5$"; var dataSources = db.Layers - .Where(x => !x.IsDeleted) + .Where(x => !x.IsDeleted && !x.IsCancelled) .Include(layer => layer.Records!) .AsNoTracking() .AsEnumerable() diff --git a/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodes.processor.cs b/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodes.processor.cs index 68480f2..ed4b900 100644 --- a/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodes.processor.cs +++ b/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodes.processor.cs @@ -28,7 +28,7 @@ public class T3MultiSourceCopySelectedCodesProcessor( var processedLayer = db.Layers .Where(x => x.ParentId == processWorker.Id - && !x.IsDeleted) + && !x.IsDeleted && !x.IsCancelled) .OrderByDescending(x => x.CreatedAt) .FirstOrDefault(); @@ -54,7 +54,7 @@ public class T3MultiSourceCopySelectedCodesProcessor( processedLayer.ModifiedAt = DateTime.UtcNow; var dataSources = sources.Select(source => db.Layers - .Where(x => x.Type == LayerType.Processed && !x.IsDeleted && x.Name != null && x.Name.Contains($"{year}/{month:D2}-{source.Desc1}-T3")) + .Where(x => x.Type == LayerType.Processed && !x.IsDeleted && !x.IsCancelled && x.Name != null && x.Name.Contains($"{year}/{month:D2}-{source.Desc1}-T3")) .Include(x => x.Records).AsNoTracking() .FirstOrDefault()) .OfType() diff --git a/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs b/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs index 129ae2d..58e884e 100644 --- a/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs +++ b/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs @@ -15,7 +15,7 @@ public class T3MultiSourceCopySelectedCodesYearSummaryProcessor( var processedLayer = db.Layers .Where(x => x.ParentId == processWorker.Id - && !x.IsDeleted) + && !x.IsDeleted && !x.IsCancelled) .OrderByDescending(x => x.CreatedAt) .FirstOrDefault(); @@ -49,7 +49,7 @@ public class T3MultiSourceCopySelectedCodesYearSummaryProcessor( var j = i; var dataSource = db.Layers.Where(x => x.Type == LayerType.Processed - && !x.IsDeleted + && !x.IsDeleted && !x.IsCancelled && x.Name != null && x.Name.Contains($"{year}/{j:D2}-AB-T3")) .Include(x => x.Records) .AsNoTracking() diff --git a/WebAPI/dataProcessors/t3.MultiSourceSummary.processor.cs b/WebAPI/dataProcessors/t3.MultiSourceSummary.processor.cs index b8e3f62..ff9f0f2 100644 --- a/WebAPI/dataProcessors/t3.MultiSourceSummary.processor.cs +++ b/WebAPI/dataProcessors/t3.MultiSourceSummary.processor.cs @@ -23,7 +23,7 @@ public class T3MultiSourceSummaryProcessor( var processedLayer = db.Layers .Where(x => x.ParentId == processWorker.Id - && !x.IsDeleted) + && !x.IsDeleted && !x.IsCancelled) .OrderByDescending(x => x.CreatedAt) .FirstOrDefault(); @@ -50,7 +50,7 @@ public class T3MultiSourceSummaryProcessor( var newRecords = new List(); - var dataSources = sources.Select(source => db.Layers.Where(x => x.Type == LayerType.Processed && !x.IsDeleted && x.Name != null && x.Name.Contains($"{year}/{month:D2}-{source.Desc1}-T3")) + var dataSources = sources.Select(source => db.Layers.Where(x => x.Type == LayerType.Processed && !x.IsDeleted && !x.IsCancelled && x.Name != null && x.Name.Contains($"{year}/{month:D2}-{source.Desc1}-T3")) .Include(x => x.Records) .AsNoTracking() .FirstOrDefault()) diff --git a/WebAPI/dataProcessors/t3.MultiSourceYearSummary.processor.cs b/WebAPI/dataProcessors/t3.MultiSourceYearSummary.processor.cs index fab5270..45bba10 100644 --- a/WebAPI/dataProcessors/t3.MultiSourceYearSummary.processor.cs +++ b/WebAPI/dataProcessors/t3.MultiSourceYearSummary.processor.cs @@ -22,7 +22,7 @@ public class T3MultiSourceYearSummaryProcessor( var processedLayer = db.Layers .Where(x => x.ParentId == processWorker.Id - && !x.IsDeleted) + && !x.IsDeleted && !x.IsCancelled) .OrderByDescending(x => x.CreatedAt) .FirstOrDefault(); @@ -49,7 +49,7 @@ public class T3MultiSourceYearSummaryProcessor( var newRecords = new List(); - var dataSources = sources.Select(source => db.Layers.Where(x => x.Type == LayerType.Processed && !x.IsDeleted && x.Name != null && x.Name.Contains($"{year}/13-{source.Desc1}-T3")) + var dataSources = sources.Select(source => db.Layers.Where(x => x.Type == LayerType.Processed && !x.IsDeleted && !x.IsCancelled && x.Name != null && x.Name.Contains($"{year}/13-{source.Desc1}-T3")) .Include(x => x.Records) .AsNoTracking() .FirstOrDefault()) diff --git a/WebAPI/dataProcessors/t3.SingleSource.processor.cs b/WebAPI/dataProcessors/t3.SingleSource.processor.cs index 105ac72..63b1eb0 100644 --- a/WebAPI/dataProcessors/t3.SingleSource.processor.cs +++ b/WebAPI/dataProcessors/t3.SingleSource.processor.cs @@ -18,7 +18,7 @@ public class T3SingleSourceProcessor( { throw new Exception("SourceLayer record not found"); } - var sourceImportWorker = db.Layers.SingleOrDefault(x => x.Name == sourceLayer); + var sourceImportWorker = db.Layers.SingleOrDefault(x => x.Name == sourceLayer && !x.IsDeleted && !x.IsCancelled); if (sourceImportWorker == null) { throw new Exception("SourceImportWorkerL layer not found"); @@ -61,7 +61,7 @@ public class T3SingleSourceProcessor( var dataSources = db.Layers .Include(x => x.Records) .Where(x => x.ParentId == sourceImportWorker.Id - && !x.IsDeleted) + && !x.IsDeleted && !x.IsCancelled) .OrderBy(x => x.CreatedAt) .AsNoTracking() .ToList(); diff --git a/WebAPI/dataProcessors/t3.SourceYearSummary.processor.cs b/WebAPI/dataProcessors/t3.SourceYearSummary.processor.cs index 0d03f4f..9953f30 100644 --- a/WebAPI/dataProcessors/t3.SourceYearSummary.processor.cs +++ b/WebAPI/dataProcessors/t3.SourceYearSummary.processor.cs @@ -19,7 +19,7 @@ public class T3SourceYearSummaryProcessor( } var processedLayer = db.Layers .Where(x => x.ParentId == processWorker.Id - && !x.IsDeleted) + && !x.IsDeleted && !x.IsCancelled) .OrderByDescending(x => x.CreatedAt) .FirstOrDefault(); @@ -52,7 +52,7 @@ public class T3SourceYearSummaryProcessor( var j = i; var dataSource = db.Layers.Where(x => x.Type == LayerType.Processed - && !x.IsDeleted + && !x.IsDeleted && !x.IsCancelled && x.Name!=null && x.Name.Contains($"{year}/{j:D2}-{source}-T3")) .Include(x => x.Records) .AsNoTracking() diff --git a/WebAPI/dataProcessors/t4.SingleSource.processor.cs b/WebAPI/dataProcessors/t4.SingleSource.processor.cs index ac00184..91fb4a8 100644 --- a/WebAPI/dataProcessors/t4.SingleSource.processor.cs +++ b/WebAPI/dataProcessors/t4.SingleSource.processor.cs @@ -17,7 +17,7 @@ public class T4SingleSourceProcessor( { throw new Exception("SourceLayer record not found"); } - var sourceImportWorker = db.Layers.SingleOrDefault(x => x.Name == sourceLayer); + var sourceImportWorker = db.Layers.SingleOrDefault(x => x.Name == sourceLayer && !x.IsDeleted && !x.IsCancelled); if (sourceImportWorker == null) { throw new Exception("SourceImportWorkerL layer not found"); @@ -29,7 +29,8 @@ public class T4SingleSourceProcessor( } var processedLayer = db.Layers - .Where(x => x.ParentId == processWorker.Id) + .Where(x => x.ParentId == processWorker.Id && + !x.IsDeleted && !x.IsCancelled) .OrderByDescending(x => x.CreatedAt) .FirstOrDefault(); @@ -58,7 +59,7 @@ public class T4SingleSourceProcessor( var dataSource = db.Layers .Include(x => x.Records) .Where(x => x.ParentId == sourceImportWorker.Id - && !x.IsDeleted) + && !x.IsDeleted && !x.IsCancelled) .OrderByDescending(x => x.CreatedAt) .AsNoTracking() .FirstOrDefault(); diff --git a/WebAPI/dataProcessors/t4.r2.processor.cs b/WebAPI/dataProcessors/t4.r2.processor.cs index e6cf672..382cfee 100644 --- a/WebAPI/dataProcessors/t4.r2.processor.cs +++ b/WebAPI/dataProcessors/t4.r2.processor.cs @@ -33,7 +33,7 @@ public class T4R2Processor( var processedLayer = db.Layers .Where(x => x.ParentId == processWorker.Id - && !x.IsDeleted) + && !x.IsDeleted && !x.IsCancelled) .OrderByDescending(x => x.CreatedAt) .FirstOrDefault(); @@ -80,7 +80,7 @@ public class T4R2Processor( var monthCopy = month; var dataSource = db.Layers.Where(x => x.Type == LayerType.Processed && - !x.IsDeleted && + !x.IsDeleted && !x.IsCancelled && x.Name != null && x.Name.Contains($"{year}/{monthCopy:D2}-{source.Desc1}-T") ) .Include(x => x.Records) @@ -145,7 +145,7 @@ public class T4R2Processor( // year summary var dataSourceSum = db.Layers.Where(x => x.Type == LayerType.Processed && - !x.IsDeleted && + !x.IsDeleted && !x.IsCancelled && x.Name != null && x.Name.Contains($"{year}/13-{source.Desc1}-T") ) .Include(x => x.Records) @@ -216,7 +216,7 @@ public class T4R2Processor( var response = request.Execute(); var r2 = db.Layers - .Where(x => x.Id == sourceId) + .Where(x => x.Id == sourceId && !x.IsDeleted && !x.IsCancelled) .Include(x => x.Records) .AsNoTracking() .FirstOrDefault(); diff --git a/WebAPI/dataProcessors/t5.LastValues.processor.cs b/WebAPI/dataProcessors/t5.LastValues.processor.cs index 092638f..db54119 100644 --- a/WebAPI/dataProcessors/t5.LastValues.processor.cs +++ b/WebAPI/dataProcessors/t5.LastValues.processor.cs @@ -15,13 +15,14 @@ public class T5LastValuesProcessor( var month = int.Parse(processWorker.Records?.SingleOrDefault(x => x.Code == "Month")?.Desc1!); var sourceLayer = processWorker.Records?.SingleOrDefault(x => x.Code == "SourceLayer")?.Desc1; if (sourceLayer == null) throw new Exception("SourceLayer record not found"); - var sourceImportWorker = db.Layers.SingleOrDefault(x => x.Name == sourceLayer); + var sourceImportWorker = db.Layers.SingleOrDefault(x => x.Name == sourceLayer && !x.IsDeleted && !x.IsCancelled); if (sourceImportWorker == null) throw new Exception("SourceImportWorker layer not found"); var source = processWorker.Records?.SingleOrDefault(x => x.Code == "Source")?.Desc1; if (sourceLayer == null) throw new Exception("Source record not found"); var processedLayer = db.Layers - .Where(x => x.ParentId == processWorker.Id) + .Where(x => x.ParentId == processWorker.Id + && !x.IsDeleted && !x.IsCancelled) .OrderByDescending(x => x.CreatedAt) .FirstOrDefault(); @@ -51,7 +52,7 @@ public class T5LastValuesProcessor( var dataSources = db.Layers .Include(x => x.Records) .Where(x => x.ParentId == sourceImportWorker.Id - && !x.IsDeleted) + && !x.IsDeleted && !x.IsCancelled) .OrderByDescending(x => x.CreatedAt) .AsNoTracking() .ToList();