From 0fdf8179e154c6c4cc9db2c3b9be71177ac67cfc Mon Sep 17 00:00:00 2001
From: Chase Tucker <chase.tucker@infineon.com>
Date: Wed, 10 Jul 2024 09:19:04 -0700
Subject: [PATCH] Remove cancelled TECNs from expirations

---
 FabApprovalWorkerService/Services/ECNService.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FabApprovalWorkerService/Services/ECNService.cs b/FabApprovalWorkerService/Services/ECNService.cs
index 1a6cd4d..93b32ae 100644
--- a/FabApprovalWorkerService/Services/ECNService.cs
+++ b/FabApprovalWorkerService/Services/ECNService.cs
@@ -78,7 +78,8 @@ public class ECNService : IECNService {
             StringBuilder queryBuilder = new StringBuilder();
             queryBuilder.Append("select ECNNumber, IsTECN, ExpirationDate, ExtensionDate, OriginatorID, Title ");
             queryBuilder.Append($"from ECN where IsTECN = 1 and ");
-            queryBuilder.Append("Cancelled = 0 and Deleted = 0;");
+            queryBuilder.Append("Cancelled = 0 and Deleted = 0 and ");
+            queryBuilder.Append($"CancellationDate is null;");
 
             IEnumerable<ECN> activeTecns = await _dalService.QueryAsync<ECN>(queryBuilder.ToString());
 
@@ -115,7 +116,8 @@ public class ECNService : IECNService {
             StringBuilder queryBuilder = new StringBuilder();
             queryBuilder.Append("select * from ECN ");
             queryBuilder.Append($"where IsTECN = 1 and ");
-            queryBuilder.Append("Cancelled = 0 and Deleted = 0;");
+            queryBuilder.Append("Cancelled = 0 and Deleted = 0 and ");
+            queryBuilder.Append($"CancellationDate is null;");
 
             IEnumerable<ECN> activeTecns = (await _dalService.QueryAsync<ECN>(queryBuilder.ToString()));