Merge pull request #18 from Trendyol/feature/improve-put-in-the-field

feature: Improve `putInTheField` methods

Author: GokselKUCUKSAHIN

es/aggregations.go

@@ -180,9 +180,10 @@ func AggCustom(agg Object) aggsType {
 }
 
 func (agg aggsType) putInTheField(key string, value any) aggsType {
-	for field := range agg {
-		if fieldObject, ok := agg[field].(Object); ok {
+	for _, fieldObj := range agg {
+		if fieldObject, ok := fieldObj.(Object); ok {
 			fieldObject[key] = value
+			break
 		}
 	}
 	return agg

es/base_query.go

@@ -224,9 +224,10 @@ func Sort(field string) sortType {
 }
 
 func (s sortType) putInTheField(key string, value any) sortType {
-	for field := range s {
-		if fieldObject, ok := s[field].(Object); ok {
+	for _, fieldObj := range s {
+		if fieldObject, ok := fieldObj.(Object); ok {
 			fieldObject[key] = value
+			break
 		}
 	}
 	return s

es/match_none_query.go

@@ -34,9 +34,10 @@ func MatchNone[T any](key string, query T) matchNoneType {
 
 func (m matchNoneType) putInTheField(key string, value any) matchNoneType {
 	if matchNone, ok := m["match_none"].(Object); ok {
-		for field := range matchNone {
-			if fieldObject, foOk := matchNone[field].(Object); foOk {
+		for _, fieldObj := range matchNone {
+			if fieldObject, foOk := fieldObj.(Object); foOk {
 				fieldObject[key] = value
+				break
 			}
 		}
 	}

es/match_query.go

@@ -34,9 +34,10 @@ func Match[T any](key string, query T) matchType {
 
 func (m matchType) putInTheField(key string, value any) matchType {
 	if match, ok := m["match"].(Object); ok {
-		for field := range match {
-			if fieldObject, foOk := match[field].(Object); foOk {
+		for _, fieldObj := range match {
+			if fieldObject, foOk := fieldObj.(Object); foOk {
 				fieldObject[key] = value
+				break
 			}
 		}
 	}

es/query_string.go

@@ -557,9 +557,10 @@ func (q queryStringType) TimeZone(value string) queryStringType {
 }
 
 func (q queryStringType) putInTheField(key string, value any) queryStringType {
-	for field := range q {
-		if fieldObject, ok := q[field].(Object); ok {
+	for _, fieldObj := range q {
+		if fieldObject, ok := fieldObj.(Object); ok {
 			fieldObject[key] = value
+			break
 		}
 	}
 	return q

es/regexp_query.go

@@ -32,9 +32,10 @@ func Regexp(key string, value string) regexpType {
 
 func (r regexpType) putInTheField(key string, value any) regexpType {
 	if regexp, ok := r["regexp"].(Object); ok {
-		for field := range regexp {
-			if fieldObject, foOk := regexp[field].(Object); foOk {
+		for _, fieldObj := range regexp {
+			if fieldObject, foOk := fieldObj.(Object); foOk {
 				fieldObject[key] = value
+				break
 			}
 		}
 	}

es/simple_query_string.go

@@ -298,9 +298,10 @@ func (q simpleQueryStringType) QuoteFieldSuffix(value string) simpleQueryStringT
 }
 
 func (q simpleQueryStringType) putInTheField(key string, value any) simpleQueryStringType {
-	for field := range q {
-		if fieldObject, ok := q[field].(Object); ok {
+	for _, fieldObj := range q {
+		if fieldObject, ok := fieldObj.(Object); ok {
 			fieldObject[key] = value
+			break
 		}
 	}
 	return q