(dsl): Support `geoPolygon` query #264

LeonaNedeljkovic · 2023-06-24T12:22:40Z

Part of #91

modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala

drmarjanovic · 2023-06-24T12:50:44Z

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala

+      "geo_polygon" -> Obj(
+        Chunk(
+          Some(field -> Obj("points" -> Arr(points.map(Json.Str(_)): _*))),
+          queryName.map(qn => "_name" -> qn.toJson),


Let's use queryName.map("_name" -> _.toJson).

drmarjanovic · 2023-06-24T12:51:17Z

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala

+        Chunk(
+          Some(field -> Obj("points" -> Arr(points.map(Json.Str(_)): _*))),
+          queryName.map(qn => "_name" -> qn.toJson),
+          validationMethod.map(vm => "validation_method" -> vm.toString.toJson)


Let's use validationMethod.map("validation_method" -> _.toString.toJson).

drmarjanovic · 2023-06-24T12:54:42Z

modules/library/src/test/scala/zio/elasticsearch/ElasticQuerySpec.scala

+              )
+            )
+          ) &&
+          assert(queryString)(


Should we move this in the row above?

drmarjanovic · 2023-06-24T12:55:11Z

modules/library/src/test/scala/zio/elasticsearch/ElasticQuerySpec.scala

+            .validationMethod(IgnoreMalformed)
+            .name("name")
+
+          println(queryWithName.toJson(fieldPath = None))


Please remove println.

dbulaja98 · 2023-06-24T13:29:20Z

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala

+   * field to identify the query
+   *
+   * @param value
+   *   the [[String]] value to represent the name field


Suggested change

* the [[String]] value to represent the name field

* the text value to represent the name field

dbulaja98 · 2023-06-24T13:30:18Z

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala

+  validationMethod: Option[ValidationMethod]
+) extends GeoPolygonQuery[S] { self =>
+
+  def name(value: String): GeoPolygonQuery[S] = self.copy(queryName = Some(value))


Move self.copy(queryName = Some(value)) to new line.

markaya · 2023-06-24T15:04:34Z

modules/library/src/it/scala/zio/elasticsearch/HttpExecutorSpec.scala

+                          )
+                        )
+                        .documentAs[TestDocument]
+              } yield assertTrue(r1 == Chunk(document))


Suggested change

} yield assertTrue(r1 == Chunk(document))

} yield assert(equalTo(Chunk(document)))

markaya · 2023-06-24T15:05:58Z

modules/library/src/test/scala/zio/elasticsearch/ElasticQuerySpec.scala

+            geoPolygon(TestDocument.stringField, List("40, -70", "30, -80", "20, -90")).validationMethod(
+              IgnoreMalformed
+            )
+          val queryWithAllParams = geoPolygon(TestDocument.stringField, List("40, -70", "30, -80", "20, -90"))


Suggested change

val queryWithAllParams = geoPolygon(TestDocument.stringField, List("40, -70", "30, -80", "20, -90"))

val queryWithAllParams =

geoPolygon(TestDocument.stringField, List("40, -70", "30, -80", "20, -90"))

drmarjanovic · 2023-09-26T10:17:02Z

@LeonaNedeljkovic, are you still working on this? Is there anything that's blocking you?

dbulaja98 · 2023-12-18T00:15:42Z

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala

+   * field to identify the query
+   *
+   * @param value
+   *   the text value to represent the name field


Suggested change

* the text value to represent the name field

* the text value that represents the name field

dbulaja98 · 2023-12-18T13:24:15Z

modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala

+   *   the type-safe field for which query is specified for
+   * @param coordinates
+   *   list of longitudes and latitudes of the desired points written as string (e.g. ["40, 31", "25, 31"]) or geo hash
+   *   (e.g. ["drm3btev3e86", "drm3btev3e87"] )


Suggested change

* (e.g. ["drm3btev3e86", "drm3btev3e87"] )

* (e.g. ["drm3btev3e86", "drm3btev3e87"])

dbulaja98 · 2023-12-18T13:24:26Z

modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala

+   *   the field for which query is specified for
+   * @param coordinates
+   *   list of longitudes and latitudes of the desired points written as string (e.g. ["40, 31", "25, 31"]) or geo hash
+   *   (e.g. ["drm3btev3e86", "drm3btev3e87"] )


Suggested change

* (e.g. ["drm3btev3e86", "drm3btev3e87"] )

* (e.g. ["drm3btev3e86", "drm3btev3e87"])

dbulaja98 · 2023-12-18T13:25:45Z

modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala

+   * @return
+   *   an instance of [[zio.elasticsearch.query.GeoPolygonQuery]] that represents `geo_polygon` query to be performed.
+   */
+  final def geoPolygon(field: String, coordinates: List[String]): GeoPolygonQuery[Any] =


Can you replace List[String] with Chunk[String]?

dbulaja98 · 2023-12-18T13:54:13Z

modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala

+   * @return
+   *   an instance of [[zio.elasticsearch.query.GeoPolygonQuery]] that represents `geo_polygon` query to be performed.
+   */
+  final def geoPolygon[S](field: Field[S, _], coordinates: List[String]): GeoPolygonQuery[S] =


Can you replace List[String] with Chunk[String]?

dbulaja98 · 2023-12-18T15:45:33Z

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala

+
+private[elasticsearch] final case class GeoPolygon[S](
+  field: String,
+  points: List[String],


Can you replace List[String] with Chunk[String]?

dbulaja98 · 2023-12-18T15:47:10Z

modules/library/src/test/scala/zio/elasticsearch/ElasticQuerySpec.scala

+        test("geoPolygon") {
+          val query =
+            geoPolygon("testField", List("40, -70", "30, -80", "20, -90"))
+          val queryString =


Suggested change

val queryString =

val queryTs =

dbulaja98 · 2023-12-18T15:49:07Z

modules/library/src/test/scala/zio/elasticsearch/ElasticQuerySpec.scala

+        test("geoPolygon") {
+          val query =
+            geoPolygon("testField", List("40, -70", "30, -80", "20, -90"))
+          val queryString =


Suggested change

val queryString =

val queryTs =

dbulaja98 · 2023-12-18T15:49:28Z

modules/library/src/test/scala/zio/elasticsearch/ElasticQuerySpec.scala

+              |}
+              |""".stripMargin
+
+          val expectedWithString =


Suggested change

val expectedWithString =

val expectedTs =

dbulaja98 · 2023-12-18T15:51:12Z

docs/overview/queries/elastic_query_geo_polygon.md

+val query: GeoPolygonQuery = geoPolygon(field = Document.location, List("0, 0", "0, 90", "90, 90", "90, 0"))
+```
+
+


Omit one empty line.

markaya reviewed Jun 24, 2023

View reviewed changes

modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala Show resolved Hide resolved

drmarjanovic changed the title ~~(dsl) Support geopolygon query~~ (dsl): Support geoPolygon query Jun 24, 2023

drmarjanovic requested changes Jun 24, 2023

View reviewed changes

dbulaja98 requested changes Jun 24, 2023

View reviewed changes

markaya previously approved these changes Jun 24, 2023

View reviewed changes

dbulaja98 previously approved these changes Jun 24, 2023

View reviewed changes

LeonaNedeljkovic dismissed stale reviews from dbulaja98 and markaya via b901e6d June 24, 2023 14:46

markaya suggested changes Jun 24, 2023

View reviewed changes

drmarjanovic previously approved these changes Jun 24, 2023

View reviewed changes

dbulaja98 previously approved these changes Jun 28, 2023

View reviewed changes

LeonaNedeljkovic added 5 commits December 4, 2023 20:30

(dsl) Support geopolygon query

75d3dd4

Reformat code, remove empty line

2aa0dca

Reformat code

8d3d807

Move self.copy to new line

5adaefc

Add integration test

c20d077

LeonaNedeljkovic dismissed stale reviews from dbulaja98 and drmarjanovic via 410578f December 8, 2023 09:08

LeonaNedeljkovic force-pushed the task-support-geopolygon-query branch 2 times, most recently from 410578f to 7856cc4 Compare December 14, 2023 18:45

Add docs

39bc4ca

LeonaNedeljkovic force-pushed the task-support-geopolygon-query branch from 7856cc4 to 39bc4ca Compare December 14, 2023 18:59

dbulaja98 requested changes Dec 18, 2023

View reviewed changes

Change namings, remove redundant empty lines

5565098

dbulaja98 approved these changes Dec 21, 2023

View reviewed changes

dbulaja98 merged commit f1a33dd into lambdaworks:main Dec 21, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(dsl): Support `geoPolygon` query #264

(dsl): Support `geoPolygon` query #264

LeonaNedeljkovic commented Jun 24, 2023 •

edited by dbulaja98

Loading

drmarjanovic Jun 24, 2023

drmarjanovic Jun 24, 2023

drmarjanovic Jun 24, 2023

drmarjanovic Jun 24, 2023

dbulaja98 Jun 24, 2023

dbulaja98 Jun 24, 2023

markaya Jun 24, 2023

markaya Jun 24, 2023

drmarjanovic commented Sep 26, 2023

dbulaja98 Dec 18, 2023

dbulaja98 Dec 18, 2023

dbulaja98 Dec 18, 2023

dbulaja98 Dec 18, 2023

dbulaja98 Dec 18, 2023

dbulaja98 Dec 18, 2023

dbulaja98 Dec 18, 2023

dbulaja98 Dec 18, 2023

dbulaja98 Dec 18, 2023

dbulaja98 Dec 18, 2023

	* the [[String]] value to represent the name field
	* the text value to represent the name field

	} yield assertTrue(r1 == Chunk(document))
	} yield assert(equalTo(Chunk(document)))

	val queryWithAllParams = geoPolygon(TestDocument.stringField, List("40, -70", "30, -80", "20, -90"))
	val queryWithAllParams =
	geoPolygon(TestDocument.stringField, List("40, -70", "30, -80", "20, -90"))

	* the text value to represent the name field
	* the text value that represents the name field

	* (e.g. ["drm3btev3e86", "drm3btev3e87"] )
	* (e.g. ["drm3btev3e86", "drm3btev3e87"])

		val query: GeoPolygonQuery = geoPolygon(field = Document.location, List("0, 0", "0, 90", "90, 90", "90, 0"))
		```

(dsl): Support geoPolygon query #264

(dsl): Support geoPolygon query #264

Conversation

LeonaNedeljkovic commented Jun 24, 2023 • edited by dbulaja98 Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

drmarjanovic commented Sep 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

(dsl): Support `geoPolygon` query #264

(dsl): Support `geoPolygon` query #264

LeonaNedeljkovic commented Jun 24, 2023 •

edited by dbulaja98

Loading