Add resolver helper method

FoundatioFx · Mar 4, 2022 · 73e75a7 · 73e75a7
1 parent ffec113
commit 73e75a7
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Foundatio.Parsers.ElasticQueries/ElasticMappingResolver.cs b/src/Foundatio.Parsers.ElasticQueries/ElasticMappingResolver.cs
@@ -169,7 +169,7 @@ public ElasticMappingResolver(ITypeMapping codeMapping, Inferrer inferrer, Func<
     public string GetSortFieldName(string field) {
         return GetNonAnalyzedFieldName(field, ElasticMapping.SortFieldName);
     }
-
+    
     public string GetSortFieldName(Field field) {
         return GetNonAnalyzedFieldName(GetResolvedField(field), ElasticMapping.SortFieldName);
     }
@@ -179,7 +179,11 @@ public ElasticMappingResolver(ITypeMapping codeMapping, Inferrer inferrer, Func<
     }
 
     public string GetAggregationsFieldName(Field field) {
-        return GetNonAnalyzedFieldName(GetResolvedField(field), ElasticMapping.KeywordFieldName);
+        return GetNonAnalyzedFieldName(field, ElasticMapping.KeywordFieldName);
+    }
+
+    public string GetNonAnalyzedFieldName(Field field, string preferredSubField = null) {
+        return GetNonAnalyzedFieldName(GetResolvedField(field), preferredSubField);
     }
 
     public string GetNonAnalyzedFieldName(string field, string preferredSubField = null) {
@@ -188,7 +192,7 @@ public ElasticMappingResolver(ITypeMapping codeMapping, Inferrer inferrer, Func<
 
         var mapping = GetMapping(field, true);
 
-        if (mapping.Property == null || !IsPropertyAnalyzed(mapping.Property))
+        if (mapping?.Property == null || !IsPropertyAnalyzed(mapping.Property))
             return field;
 
         var multiFieldProperty = mapping.Property as ICoreProperty;