Extract common part

Author: pdelewski

platform/frontend_connectors/search_test.go

@@ -43,6 +43,7 @@ var ctx = context.WithValue(context.TODO(), tracing.RequestIdCtxKey, tracing.Get
 
 func TestAsyncSearchHandler(t *testing.T) {
 	// logger.InitSimpleLoggerForTests()
+
 	table := util.NewSyncMapWith(tableName, &clickhouse.Table{
 		Name:   tableName,
 		Config: clickhouse.NewDefaultCHConfig(),

platform/parsers/elastic_query_dsl/query_parser.go

@@ -1206,26 +1206,24 @@ func ResolveField(ctx context.Context, fieldName string, schemaInstance schema.S
 	fieldName = strings.TrimSuffix(fieldName, ".keyword")
 	fieldName = strings.TrimSuffix(fieldName, ".text")
 
+	updateQuesmaType := func(fieldKey schema.FieldName) {
+		field := schemaInstance.Fields[fieldKey]
+		field.Type = schema.QuesmaTypeKeyword
+		schemaInstance.Fields[field.PropertyName] = field
+	}
+
 	if resolvedField, ok := schemaInstance.ResolveField(fieldName); ok {
-		if isKeyword {
-			fieldKey := schema.FieldName(fieldName)
-			field := schemaInstance.Fields[fieldKey]
-			field.Type = schema.QuesmaTypeKeyword
-			if schemaInstance.Fields != nil {
-				schemaInstance.Fields[field.PropertyName] = field
-			}
+		if isKeyword && schemaInstance.Fields != nil {
+			updateQuesmaType(schema.FieldName(fieldName))
 		}
 		return resolvedField.InternalPropertyName.AsString()
 	} else {
 		if fieldName != "*" && fieldName != "_all" && fieldName != "_doc" && fieldName != "_id" && fieldName != "_index" {
 			logger.DebugWithCtx(ctx).Msgf("field '%s' referenced, but not found in schema, falling back to original name", fieldName)
 		}
-		if isKeyword {
-			fieldKey, _ := schemaInstance.ResolveFieldByInternalName(fieldName)
-			field := schemaInstance.Fields[fieldKey.PropertyName]
-			field.Type = schema.QuesmaTypeKeyword
-			if schemaInstance.Fields != nil {
-				schemaInstance.Fields[field.PropertyName] = field
+		if isKeyword && schemaInstance.Fields != nil {
+			if fieldKey, exists := schemaInstance.ResolveFieldByInternalName(fieldName); exists {
+				updateQuesmaType(fieldKey.PropertyName)
 			}
 		}
 		return fieldName