Merge branch 'dev'

Author: Fosol

libs/net/dal/Extensions/JsonDocumentExtensions.cs

@@ -235,9 +235,9 @@ public static JsonDocument ExcludeBCUpdates(this JsonDocument query)
         {
             jsonNode = JsonNode.Parse(query.ToJson());
         }
-        catch (JsonException)
+        catch (JsonException ex)
         {
-            return query;
+            throw new InvalidOperationException("BC Updates exclusion failed due to JSON parsing error", ex);
         }
 
         var json = jsonNode?.AsObject();

libs/net/dal/Services/ReportService.cs

@@ -885,7 +885,10 @@ public IEnumerable<ReportInstance> GetLatestInstances(int id, int? ownerId = nul
 
                 // Determine index.
                 var defaultIndex = filterSettings.SearchUnpublished ? _elasticOptions.ContentIndex : _elasticOptions.PublishedIndex;
-                var content = await _elasticClient.SearchAsync<API.Areas.Services.Models.Content.ContentModel>(defaultIndex, query);
+
+                // Add retry logic for Elasticsearch query to handle failures
+                var content = await RetryElasticsearchQueryAsync(async () =>
+                    await _elasticClient.SearchAsync<API.Areas.Services.Models.Content.ContentModel>(defaultIndex, query));
                 var contentHits = content.Hits.Hits.ToArray();
 
                 // Fetch custom content versions for the requestor.
@@ -940,6 +943,30 @@ public IEnumerable<ReportInstance> GetLatestInstances(int id, int? ownerId = nul
         return searchResults;
     }
 
+    /// <summary>
+    /// Retry Elasticsearch query once after 200ms to handle intermittent failures.
+    /// This helps resolve issues like JSON parsing failures in BC Updates filtering.
+    /// </summary>
+    /// <typeparam name="T">The return type of the Elasticsearch operation</typeparam>
+    /// <param name="operation">The Elasticsearch operation to retry</param>
+    /// <returns>The result of the successful operation</returns>
+    private async Task<T> RetryElasticsearchQueryAsync<T>(Func<Task<T>> operation)
+    {
+        try
+        {
+            return await operation();
+        }
+        catch (Exception ex)
+        {
+            Logger.LogWarning(ex,
+                "Elasticsearch query failed. Retrying in 200ms. Error: {ErrorMessage}",
+                ex.Message);
+
+            await Task.Delay(200);
+            return await operation();
+        }
+    }
+
     /// <summary>
     /// Find content with Elasticsearch for the specified `reportInstance` and `section`.
     /// This method supports regenerating content within a section.
@@ -1061,7 +1088,8 @@ public IEnumerable<ReportInstance> GetLatestInstances(int id, int? ownerId = nul
 
             // Determine index.
             var defaultIndex = filterSettings.SearchUnpublished ? _elasticOptions.ContentIndex : _elasticOptions.PublishedIndex;
-            var content = await _elasticClient.SearchAsync<API.Areas.Services.Models.Content.ContentModel>(defaultIndex, query);
+            var content = await RetryElasticsearchQueryAsync(async () =>
+                await _elasticClient.SearchAsync<API.Areas.Services.Models.Content.ContentModel>(defaultIndex, query));
 
             // Fetch custom content versions for the requestor.
             var contentIds = content.Hits.Hits.Select(h => h.Source.Id).Distinct().ToArray();