From 14c66f7d835241916fadd1bbb1ae81738bb82a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCrkan=20G=C3=BCran?= <grkngrn@gmail.com>
Date: Fri, 6 Jan 2023 13:26:18 +0100
Subject: [PATCH] Refactor

---
 src/modules/Elsa.Elasticsearch/Modules/Management/Extensions.cs | 2 +-
 src/modules/Elsa.Elasticsearch/Modules/Runtime/Extensions.cs    | 2 +-
 src/modules/Elsa.Elasticsearch/Options/ElasticsearchOptions.cs  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/Elsa.Elasticsearch/Modules/Management/Extensions.cs b/src/modules/Elsa.Elasticsearch/Modules/Management/Extensions.cs
index 78f2b9ea22..c4a2bf2d8b 100644
--- a/src/modules/Elsa.Elasticsearch/Modules/Management/Extensions.cs
+++ b/src/modules/Elsa.Elasticsearch/Modules/Management/Extensions.cs
@@ -13,7 +13,7 @@ public static WorkflowInstanceFeature UseElasticsearch(this WorkflowInstanceFeat
         configure += f =>
         {
             f.Options = options;
-            f.IndexConfig = indexConfig ?? new Dictionary<string, string>();
+            f.IndexConfig = indexConfig ?? options.Indices ?? new Dictionary<string, string>();
         };
         
         feature.Module.Configure(configure);
diff --git a/src/modules/Elsa.Elasticsearch/Modules/Runtime/Extensions.cs b/src/modules/Elsa.Elasticsearch/Modules/Runtime/Extensions.cs
index e5093fa39e..bc66235fd5 100644
--- a/src/modules/Elsa.Elasticsearch/Modules/Runtime/Extensions.cs
+++ b/src/modules/Elsa.Elasticsearch/Modules/Runtime/Extensions.cs
@@ -13,7 +13,7 @@ public static ExecutionLogRecordFeature UseElasticsearch(this ExecutionLogRecord
         configure += f =>
         {
             f.Options = options;
-            f.IndexConfig = indexConfig ?? new Dictionary<string, string>();
+            f.IndexConfig = indexConfig ?? options.Indices ?? new Dictionary<string, string>();
         };
         
         feature.Module.Configure(configure);
diff --git a/src/modules/Elsa.Elasticsearch/Options/ElasticsearchOptions.cs b/src/modules/Elsa.Elasticsearch/Options/ElasticsearchOptions.cs
index ddf8e0d938..741382dfdb 100644
--- a/src/modules/Elsa.Elasticsearch/Options/ElasticsearchOptions.cs
+++ b/src/modules/Elsa.Elasticsearch/Options/ElasticsearchOptions.cs
@@ -4,7 +4,7 @@ public class ElasticsearchOptions
 {
     public const string Elasticsearch = "Elasticsearch";
 
-    public Dictionary<string, string> Indices { get; set; }
+    public Dictionary<string, string>? Indices { get; set; }
     public string Endpoint { get; set; }
     public string Username { get; set; }
     public string Password { get; set; }