mz/DiunaBI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove cancelled layers from processors

Browse Source
This commit is contained in:
Michał Zieliński
2025-05-29 11:48:07 +02:00
parent d4044aa7b3
commit 72c6ff73ac
11 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WebAPI/dataProcessors/t1.r1.processor.cs
View File

@@ -26,7 +26,7 @@ public class T1R1Processor(
var processedLayer = db.Layers var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id .Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted) && !x.IsDeleted && !x.IsCancelled)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
@@ -70,7 +70,7 @@ public class T1R1Processor(
var monthCopy = month; var monthCopy = month;
var dataSource = db.Layers.Where(x => var dataSource = db.Layers.Where(x =>
x.Type == LayerType.Processed && x.Type == LayerType.Processed &&
!x.IsDeleted && !x.IsDeleted && !x.IsCancelled &&
x.Name != null && x.Name.Contains($"{year}/{monthCopy:D2}-{source.Desc1}-T3") x.Name != null && x.Name.Contains($"{year}/{monthCopy:D2}-{source.Desc1}-T3")
).Include(x => x.Records) ).Include(x => x.Records)
.AsNoTracking() .AsNoTracking()

4
WebAPI/dataProcessors/t1.r3.processor.cs
View File

@@ -25,7 +25,7 @@ public class T1R3Processor(
var processedLayer = db.Layers var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id .Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted) && !x.IsDeleted && !x.IsCancelled)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
@@ -55,7 +55,7 @@ public class T1R3Processor(
string pattern = @$"^L\d+-P-{year}/\d+-{source}-T5$"; string pattern = @$"^L\d+-P-{year}/\d+-{source}-T5$";
var dataSources = db.Layers var dataSources = db.Layers
.Where(x => !x.IsDeleted) .Where(x => !x.IsDeleted && !x.IsCancelled)
.Include(layer => layer.Records!) .Include(layer => layer.Records!)
.AsNoTracking() .AsNoTracking()
.AsEnumerable() .AsEnumerable()

4
WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodes.processor.cs
View File

@@ -28,7 +28,7 @@ public class T3MultiSourceCopySelectedCodesProcessor(
var processedLayer = db.Layers var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id .Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted) && !x.IsDeleted && !x.IsCancelled)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
@@ -54,7 +54,7 @@ public class T3MultiSourceCopySelectedCodesProcessor(
processedLayer.ModifiedAt = DateTime.UtcNow; processedLayer.ModifiedAt = DateTime.UtcNow;
var dataSources = sources.Select(source => db.Layers 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() .Include(x => x.Records).AsNoTracking()
.FirstOrDefault()) .FirstOrDefault())
.OfType<Layer>() .OfType<Layer>()

4
WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs
View File

@@ -15,7 +15,7 @@ public class T3MultiSourceCopySelectedCodesYearSummaryProcessor(
var processedLayer = db.Layers var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id .Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted) && !x.IsDeleted && !x.IsCancelled)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
@@ -49,7 +49,7 @@ public class T3MultiSourceCopySelectedCodesYearSummaryProcessor(
var j = i; var j = i;
var dataSource = db.Layers.Where(x => var dataSource = db.Layers.Where(x =>
x.Type == LayerType.Processed x.Type == LayerType.Processed
&& !x.IsDeleted && !x.IsDeleted && !x.IsCancelled
&& x.Name != null && x.Name.Contains($"{year}/{j:D2}-AB-T3")) && x.Name != null && x.Name.Contains($"{year}/{j:D2}-AB-T3"))
.Include(x => x.Records) .Include(x => x.Records)
.AsNoTracking() .AsNoTracking()

4
WebAPI/dataProcessors/t3.MultiSourceSummary.processor.cs
View File

@@ -23,7 +23,7 @@ public class T3MultiSourceSummaryProcessor(
var processedLayer = db.Layers var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id .Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted) && !x.IsDeleted && !x.IsCancelled)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
@@ -50,7 +50,7 @@ public class T3MultiSourceSummaryProcessor(
var newRecords = new List<Record>(); var newRecords = new List<Record>();
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) .Include(x => x.Records)
.AsNoTracking() .AsNoTracking()
.FirstOrDefault()) .FirstOrDefault())

4
WebAPI/dataProcessors/t3.MultiSourceYearSummary.processor.cs
View File

@@ -22,7 +22,7 @@ public class T3MultiSourceYearSummaryProcessor(
var processedLayer = db.Layers var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id .Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted) && !x.IsDeleted && !x.IsCancelled)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
@@ -49,7 +49,7 @@ public class T3MultiSourceYearSummaryProcessor(
var newRecords = new List<Record>(); var newRecords = new List<Record>();
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) .Include(x => x.Records)
.AsNoTracking() .AsNoTracking()
.FirstOrDefault()) .FirstOrDefault())

4
WebAPI/dataProcessors/t3.SingleSource.processor.cs
View File

@@ -18,7 +18,7 @@ public class T3SingleSourceProcessor(
{ {
throw new Exception("SourceLayer record not found"); 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) if (sourceImportWorker == null)
{ {
throw new Exception("SourceImportWorkerL layer not found"); throw new Exception("SourceImportWorkerL layer not found");
@@ -61,7 +61,7 @@ public class T3SingleSourceProcessor(
var dataSources = db.Layers var dataSources = db.Layers
.Include(x => x.Records) .Include(x => x.Records)
.Where(x => x.ParentId == sourceImportWorker.Id .Where(x => x.ParentId == sourceImportWorker.Id
&& !x.IsDeleted) && !x.IsDeleted && !x.IsCancelled)
.OrderBy(x => x.CreatedAt) .OrderBy(x => x.CreatedAt)
.AsNoTracking() .AsNoTracking()
.ToList(); .ToList();

4
WebAPI/dataProcessors/t3.SourceYearSummary.processor.cs
View File

@@ -19,7 +19,7 @@ public class T3SourceYearSummaryProcessor(
} }
var processedLayer = db.Layers var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id .Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted) && !x.IsDeleted && !x.IsCancelled)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
@@ -52,7 +52,7 @@ public class T3SourceYearSummaryProcessor(
var j = i; var j = i;
var dataSource = db.Layers.Where(x => var dataSource = db.Layers.Where(x =>
x.Type == LayerType.Processed x.Type == LayerType.Processed
&& !x.IsDeleted && !x.IsDeleted && !x.IsCancelled
&& x.Name!=null && x.Name.Contains($"{year}/{j:D2}-{source}-T3")) && x.Name!=null && x.Name.Contains($"{year}/{j:D2}-{source}-T3"))
.Include(x => x.Records) .Include(x => x.Records)
.AsNoTracking() .AsNoTracking()

7
WebAPI/dataProcessors/t4.SingleSource.processor.cs
View File

@@ -17,7 +17,7 @@ public class T4SingleSourceProcessor(
{ {
throw new Exception("SourceLayer record not found"); 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) if (sourceImportWorker == null)
{ {
throw new Exception("SourceImportWorkerL layer not found"); throw new Exception("SourceImportWorkerL layer not found");
@@ -29,7 +29,8 @@ public class T4SingleSourceProcessor(
} }
var processedLayer = db.Layers var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id) .Where(x => x.ParentId == processWorker.Id &&
!x.IsDeleted && !x.IsCancelled)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
@@ -58,7 +59,7 @@ public class T4SingleSourceProcessor(
var dataSource = db.Layers var dataSource = db.Layers
.Include(x => x.Records) .Include(x => x.Records)
.Where(x => x.ParentId == sourceImportWorker.Id .Where(x => x.ParentId == sourceImportWorker.Id
&& !x.IsDeleted) && !x.IsDeleted && !x.IsCancelled)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.AsNoTracking() .AsNoTracking()
.FirstOrDefault(); .FirstOrDefault();

8
WebAPI/dataProcessors/t4.r2.processor.cs
View File

@@ -33,7 +33,7 @@ public class T4R2Processor(
var processedLayer = db.Layers var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id .Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted) && !x.IsDeleted && !x.IsCancelled)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
@@ -80,7 +80,7 @@ public class T4R2Processor(
var monthCopy = month; var monthCopy = month;
var dataSource = db.Layers.Where(x => var dataSource = db.Layers.Where(x =>
x.Type == LayerType.Processed && x.Type == LayerType.Processed &&
!x.IsDeleted && !x.IsDeleted && !x.IsCancelled &&
x.Name != null && x.Name.Contains($"{year}/{monthCopy:D2}-{source.Desc1}-T") x.Name != null && x.Name.Contains($"{year}/{monthCopy:D2}-{source.Desc1}-T")
) )
.Include(x => x.Records) .Include(x => x.Records)
@@ -145,7 +145,7 @@ public class T4R2Processor(
// year summary // year summary
var dataSourceSum = db.Layers.Where(x => var dataSourceSum = db.Layers.Where(x =>
x.Type == LayerType.Processed && x.Type == LayerType.Processed &&
!x.IsDeleted && !x.IsDeleted && !x.IsCancelled &&
x.Name != null && x.Name.Contains($"{year}/13-{source.Desc1}-T") x.Name != null && x.Name.Contains($"{year}/13-{source.Desc1}-T")
) )
.Include(x => x.Records) .Include(x => x.Records)
@@ -216,7 +216,7 @@ public class T4R2Processor(
var response = request.Execute(); var response = request.Execute();
var r2 = db.Layers var r2 = db.Layers
.Where(x => x.Id == sourceId) .Where(x => x.Id == sourceId && !x.IsDeleted && !x.IsCancelled)
.Include(x => x.Records) .Include(x => x.Records)
.AsNoTracking() .AsNoTracking()
.FirstOrDefault(); .FirstOrDefault();

7
WebAPI/dataProcessors/t5.LastValues.processor.cs
View File

@@ -15,13 +15,14 @@ public class T5LastValuesProcessor(
var month = int.Parse(processWorker.Records?.SingleOrDefault(x => x.Code == "Month")?.Desc1!); var month = int.Parse(processWorker.Records?.SingleOrDefault(x => x.Code == "Month")?.Desc1!);
var sourceLayer = processWorker.Records?.SingleOrDefault(x => x.Code == "SourceLayer")?.Desc1; var sourceLayer = processWorker.Records?.SingleOrDefault(x => x.Code == "SourceLayer")?.Desc1;
if (sourceLayer == null) throw new Exception("SourceLayer record not found"); 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"); if (sourceImportWorker == null) throw new Exception("SourceImportWorker layer not found");
var source = processWorker.Records?.SingleOrDefault(x => x.Code == "Source")?.Desc1; var source = processWorker.Records?.SingleOrDefault(x => x.Code == "Source")?.Desc1;
if (sourceLayer == null) throw new Exception("Source record not found"); if (sourceLayer == null) throw new Exception("Source record not found");
var processedLayer = db.Layers var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id) .Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted && !x.IsCancelled)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
@@ -51,7 +52,7 @@ public class T5LastValuesProcessor(
var dataSources = db.Layers var dataSources = db.Layers
.Include(x => x.Records) .Include(x => x.Records)
.Where(x => x.ParentId == sourceImportWorker.Id .Where(x => x.ParentId == sourceImportWorker.Id
&& !x.IsDeleted) && !x.IsDeleted && !x.IsCancelled)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.AsNoTracking() .AsNoTracking()
.ToList(); .ToList();