From 75ab49d4978432be94e48d92edad84d3ee9d11a0 Mon Sep 17 00:00:00 2001 From: Enkidu93 Date: Fri, 18 Oct 2024 09:40:27 -0400 Subject: [PATCH] Fix issue with null coalescing operator in filters --- .../src/Serval.Translation/Services/BuildService.cs | 10 +++++++--- .../Services/UnitializedEntityCleanupService.cs | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Serval/src/Serval.Translation/Services/BuildService.cs b/src/Serval/src/Serval.Translation/Services/BuildService.cs index fbc4ce73..aa437890 100644 --- a/src/Serval/src/Serval.Translation/Services/BuildService.cs +++ b/src/Serval/src/Serval.Translation/Services/BuildService.cs @@ -12,7 +12,7 @@ public async Task> GetAllAsync(string parentId, CancellationT return Entities.GetAsync( b => b.EngineRef == parentId - && (b.IsInitialized ?? true) + && (b.IsInitialized == null || b.IsInitialized.Value) && (b.State == JobState.Active || b.State == JobState.Pending), cancellationToken ); @@ -24,7 +24,11 @@ public Task> GetNewerRevisionAsync( CancellationToken cancellationToken = default ) { - return GetNewerRevisionAsync(e => e.Id == id && (e.IsInitialized ?? true), minRevision, cancellationToken); + return GetNewerRevisionAsync( + e => e.Id == id && (e.IsInitialized == null || e.IsInitialized.Value), + minRevision, + cancellationToken + ); } public Task> GetActiveNewerRevisionAsync( @@ -36,7 +40,7 @@ public Task> GetActiveNewerRevisionAsync( return GetNewerRevisionAsync( b => b.EngineRef == parentId - && (b.IsInitialized ?? true) + && (b.IsInitialized == null || b.IsInitialized.Value) && (b.State == JobState.Active || b.State == JobState.Pending), minRevision, cancellationToken diff --git a/src/Serval/src/Serval.Translation/Services/UnitializedEntityCleanupService.cs b/src/Serval/src/Serval.Translation/Services/UnitializedEntityCleanupService.cs index 2febbb1d..7ca67a0d 100644 --- a/src/Serval/src/Serval.Translation/Services/UnitializedEntityCleanupService.cs +++ b/src/Serval/src/Serval.Translation/Services/UnitializedEntityCleanupService.cs @@ -25,7 +25,11 @@ public async Task CheckEntitiesAsync(IRepository entities, CancellationToken { var now = DateTime.UtcNow; IEnumerable uninitializedEntities = await entities.GetAllAsync( - e => !(e.IsInitialized ?? true) && e.DateCreated != null && (now - e.DateCreated) > _timeout, + e => + e.IsInitialized != null + && !e.IsInitialized.Value + && e.DateCreated != null + && (now - e.DateCreated) > _timeout, cancellationToken );