Add CLR error message from ElasticSearch (#46)

* Add CLR error message from ElasticSearch * Fix commented smells
VirtoCommerce · Nov 21, 2022 · cff9b8d · cff9b8d
1 parent c4d5ae4
commit cff9b8d
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/src/VirtoCommerce.ElasticSearchModule.Data/ElasticSearchProvider.cs b/src/VirtoCommerce.ElasticSearchModule.Data/ElasticSearchProvider.cs
@@ -26,6 +26,8 @@ public class ElasticSearchProvider : ISearchProvider, ISupportIndexSwap, ISuppor
         public const string NGramFilterName = "custom_ngram";
         public const string EdgeNGramFilterName = "custom_edge_ngram";
 
+        private const string _exceptionTitle = "Elasticsearch Server";
+
         private readonly ConcurrentDictionary<string, Properties<IProperties>> _mappings = new ConcurrentDictionary<string, Properties<IProperties>>();
         private readonly SearchOptions _searchOptions;
 
@@ -278,15 +280,25 @@ protected virtual async Task<IndexingResult> InternalIndexAsync(string documentT
             var bulkResponse = await Client.BulkAsync(bulkDefinition);
             await Client.Indices.RefreshAsync(indexName);
 
-            var result = new IndexingResult
+            var result = new IndexingResult();
+            result.Items = new List<IndexingResultItem>();
+
+            if (!bulkResponse.IsValid)
             {
-                Items = bulkResponse.Items.Select(i => new IndexingResultItem
+                result.Items.Add(new IndexingResultItem
                 {
-                    Id = i.Id,
-                    Succeeded = i.IsValid,
-                    ErrorMessage = i.Error?.Reason
-                }).ToArray()
-            };
+                    Id = _exceptionTitle,
+                    ErrorMessage = bulkResponse.OriginalException?.Message,
+                    Succeeded = false
+                });
+            }
+
+            result.Items.AddRange(bulkResponse.Items.Select(i => new IndexingResultItem
+            {
+                Id = i.Id,
+                Succeeded = i.IsValid,
+                ErrorMessage = i.Error?.Reason
+            }));
 
             return result;
         }