From 315ac73e987b6704cf514fe81737552660a6b119 Mon Sep 17 00:00:00 2001
From: sangyongchoi <csy7792@naver.com>
Date: Tue, 3 Aug 2021 23:23:59 +0900
Subject: [PATCH] add Criteria infix func

---
 .../core/query/TypedCriteriaExtensions.kt     | 22 +++++++++
 .../query/TypedCriteriaExtensionsTests.kt     | 48 +++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensions.kt
index b8762ffbe1..eb1868e300 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensions.kt
@@ -364,6 +364,28 @@ infix fun KProperty<GeoJson<*>>.maxDistance(d: Double): Criteria =
 infix fun KProperty<GeoJson<*>>.minDistance(d: Double): Criteria =
 		Criteria(asString(this)).minDistance(d)
 
+/**
+ * Creates a geo-spatial criterion using a $maxDistance operation, for use with $near
+ *
+ * See [MongoDB Query operator:
+ * $maxDistance](https://docs.mongodb.com/manual/reference/operator/query/maxDistance/)
+ * @author Sangyong Choi
+ * @since 3.2
+ * @see Criteria.maxDistance
+ */
+infix fun Criteria.maxDistance(d: Double): Criteria =
+		this.maxDistance(d)
+
+/**
+ * Creates a geospatial criterion using a $minDistance operation, for use with $near or
+ * $nearSphere.
+ * @author Sangyong Choi
+ * @since 3.2
+ * @see Criteria.minDistance
+ */
+infix fun Criteria.minDistance(d: Double): Criteria =
+		this.minDistance(d)
+
 /**
  * Creates a criterion using the $elemMatch operator
  *
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensionsTests.kt
index 54969476d3..3b9dfc9342 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensionsTests.kt
@@ -317,6 +317,54 @@ class TypedCriteriaExtensionsTests {
 		assertThat(typed).isEqualTo(expected)
 	}
 
+	@Test
+	fun `maxDistance() should equal expected criteria with nearSphere`() {
+		val point = Point(0.0, 0.0)
+
+		val typed = Building::location nearSphere point maxDistance 3.0
+		val expected = Criteria("location")
+			.nearSphere(point)
+			.maxDistance(3.0)
+
+		assertThat(typed).isEqualTo(expected)
+	}
+
+	@Test
+	fun `minDistance() should equal expected criteria with nearSphere`() {
+		val point = Point(0.0, 0.0)
+
+		val typed = Building::location nearSphere point minDistance 3.0
+		val expected = Criteria("location")
+			.nearSphere(point)
+			.minDistance(3.0)
+
+		assertThat(typed).isEqualTo(expected)
+	}
+
+	@Test
+	fun `maxDistance() should equal expected criteria with near`() {
+		val point = Point(0.0, 0.0)
+
+		val typed = Building::location near point maxDistance 3.0
+		val expected = Criteria("location")
+			.near(point)
+			.maxDistance(3.0)
+
+		assertThat(typed).isEqualTo(expected)
+	}
+
+	@Test
+	fun `minDistance() should equal expected criteria with near`() {
+		val point = Point(0.0, 0.0)
+
+		val typed = Building::location near point minDistance 3.0
+		val expected = Criteria("location")
+			.near(point)
+			.minDistance(3.0)
+
+		assertThat(typed).isEqualTo(expected)
+	}
+
 	@Test
 	fun `elemMatch() should equal expected criteria`() {