Merge pull request #9 from Trendyol/feature/range-v2

feature: update range v2

es/range.go

@@ -20,10 +20,34 @@ type rangeType Object
 //	A rangeType object with the specified field ready for defining range conditions.
 func Range(key string) rangeType {
 	return rangeType{
-		key: Object{},
+		"range": Object{
+			key: Object{},
+		},
 	}
 }
 
+func (r rangeType) putInTheField(key string, value any) rangeType {
+	if rang, ok := r["range"].(Object); ok {
+		for field := range rang {
+			if fieldObject, foOk := rang[field].(Object); foOk {
+				fieldObject[key] = value
+			}
+		}
+	}
+	return r
+}
+
+func (r rangeType) delete(key string) rangeType {
+	if rang, ok := r["range"].(Object); ok {
+		for field := range rang {
+			if fieldObject, foOk := rang[field].(Object); foOk {
+				delete(fieldObject, key)
+			}
+		}
+	}
+	return r
+}
+
 // LesserThan sets the "lt" (less than) field for the range query.
 //
 // This method specifies that the range query should match values that are less than
@@ -42,13 +66,7 @@ func Range(key string) rangeType {
 //
 //	The updated rangeType object with the "lt" field set to the specified value.
 func (r rangeType) LesserThan(lt any) rangeType {
-	for key := range r {
-		if rangeObject, ok := r[key].(Object); ok {
-			rangeObject["lt"] = lt
-			delete(rangeObject, "lte")
-		}
-	}
-	return r
+	return r.putInTheField("lt", lt).delete("lte")
 }
 
 // LesserThanOrEqual sets the "lte" (less than or equal to) field for the range query.
@@ -69,13 +87,7 @@ func (r rangeType) LesserThan(lt any) rangeType {
 //
 //	The updated rangeType object with the "lte" field set to the specified value.
 func (r rangeType) LesserThanOrEqual(lte any) rangeType {
-	for key := range r {
-		if rangeObject, ok := r[key].(Object); ok {
-			rangeObject["lte"] = lte
-			delete(rangeObject, "lt")
-		}
-	}
-	return r
+	return r.putInTheField("lte", lte).delete("lt")
 }
 
 // GreaterThan sets the "gt" (greater than) field for the range query.
@@ -96,13 +108,7 @@ func (r rangeType) LesserThanOrEqual(lte any) rangeType {
 //
 //	The updated rangeType object with the "gt" field set to the specified value.
 func (r rangeType) GreaterThan(gt any) rangeType {
-	for key := range r {
-		if rangeObject, ok := r[key].(Object); ok {
-			rangeObject["gt"] = gt
-			delete(rangeObject, "gte")
-		}
-	}
-	return r
+	return r.putInTheField("gt", gt).delete("gte")
 }
 
 // GreaterThanOrEqual sets the "gte" (greater than or equal to) field for the range query.
@@ -123,13 +129,7 @@ func (r rangeType) GreaterThan(gt any) rangeType {
 //
 //	The updated rangeType object with the "gte" field set to the specified value.
 func (r rangeType) GreaterThanOrEqual(gte any) rangeType {
-	for key := range r {
-		if rangeObject, ok := r[key].(Object); ok {
-			rangeObject["gte"] = gte
-			delete(rangeObject, "gt")
-		}
-	}
-	return r
+	return r.putInTheField("gte", gte).delete("gt")
 }
 
 // Format sets the "format" field for the range query.
@@ -150,12 +150,7 @@ func (r rangeType) GreaterThanOrEqual(gte any) rangeType {
 //
 //	The updated rangeType object with the "format" field set to the specified value.
 func (r rangeType) Format(format string) rangeType {
-	for key := range r {
-		if rangeObject, ok := r[key].(Object); ok {
-			rangeObject["format"] = format
-		}
-	}
-	return r
+	return r.putInTheField("format", format)
 }
 
 // Boost sets the "boost" field for the range query.
@@ -175,10 +170,5 @@ func (r rangeType) Format(format string) rangeType {
 //
 //	The updated rangeType object with the "boost" field set to the specified value.
 func (r rangeType) Boost(boost float64) rangeType {
-	for key := range r {
-		if rangeObject, ok := r[key].(Object); ok {
-			rangeObject["boost"] = boost
-		}
-	}
-	return r
+	return r.putInTheField("boost", boost)
 }

es/types.go

@@ -14,11 +14,8 @@ func correctType(b any) (any, bool) {
 	if b == nil || unsafeIsNil(b) {
 		return Object{}, false
 	}
-	switch b.(type) {
-	case BoolType:
+	if _, ok := b.(BoolType); ok {
 		return Object{"bool": b}, true
-	case rangeType:
-		return Object{"range": b}, true
 	}
 	return b, true
 }