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

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

@@ -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();