(dsl): Support intervalQuery by markok4 · Pull Request #647 · lambdaworks/zio-elasticsearch

markok4 · 2025-06-12T13:29:23Z

Part of #91

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

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

drmarjanovic · 2025-06-12T14:05:26Z

Another thing - change PR title as well as reference to the issue you're resolving.

…twith, endwith), Regex instead of String in intervalRegexp, remove useless imports

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

dbulaja98 · 2025-06-13T11:38:08Z

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

+   * @param query
+   *   the text to match in the intervals.


Suggested change

* @param query

* the text to match in the intervals.

* @param query

* the text to match in the intervals

dbulaja98 · 2025-06-13T11:38:41Z

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

+   * @param prefix
+   *   the prefix string to match.


Suggested change

* @param prefix

* the prefix string to match.

* @param prefix

* the prefix string to match

dbulaja98 · 2025-06-13T11:40:55Z

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

+/**
+ * Represents a `match` interval query. Matches analyzed text within intervals.
+ *
+ * @param query
+ *   The text to match.
+ * @param analyzer
+ *   Optional analyzer to use for this query.
+ * @param useField
+ *   Optional alternative field used for term extraction.
+ */
+
+/** `match` interval-query */


This shouldn't be here. We are using scaladoc only for public api methods.

dbulaja98 · 2025-06-13T12:07:29Z

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

+   *   an instance of [[zio.elasticsearch.query.IntervalMatch]] that represents the `match` interval query.
+   */
+
+  final def intervalMatch(query: String): IntervalMatch[String] =


We should have specific trait here as return type for methods here. (you can see other methods)

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

dbulaja98

Good first PR.

Few more things to do besides other comments:

Rename PR
Add IT tests
Add documentation

…scala

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

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

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

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

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

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

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

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

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

markok4 · 2025-06-17T08:50:12Z

I have a problem with scalafixAll and scalafmtAll, after formatting it tells me that everything is not formatted.

docs/overview/elastic_interval_query.md

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

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

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

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

modules/library/src/main/scala/zio/elasticsearch/query/options/HasUseField.scala

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

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

docs/overview/elastic_interval_query.md

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

dbulaja98 · 2025-06-18T07:46:13Z

modules/library/src/main/scala/zio/elasticsearch/query/options/HasAnalyzer.scala

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2022 LambdaWorks
+ *


I see that you resolved this comment, but I still see some strange chars here.

modules/library/src/main/scala/zio/elasticsearch/query/options/HasAnalyzer.scala

modules/library/src/main/scala/zio/elasticsearch/query/options/HasUseField.scala

docs/overview/elastic_interval_query.md

dbulaja98 · 2025-06-18T20:38:48Z

docs/overview/elastic_interval_query.md

+Alternatively, you can pass a `Field` object directly:
+```scala
+val queryWithFieldObject: IntervalQuery[Document] =
+  intervals(field = "content", rule = intervalMatch("targetWord").useField(Document.stringField))
+```


This seems like duplicate example of queryWithField.

dbulaja98 · 2025-06-18T20:41:36Z

modules/integration/src/test/scala/zio/elasticsearch/HttpExecutorSpec.scala

-/*
- * Copyright 2022 LambdaWorks
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-


You have resolved this comment, but you are still missing copyright here.

dbulaja98 · 2025-06-18T20:43:14Z

modules/integration/src/test/scala/zio/elasticsearch/HttpExecutorSpec.scala

+                  query =
+                    term(field = TestDocument.stringField, value = secondDocumentUpdated.stringField.toLowerCase)


This is also resolved, but there is still unnecessary change here.

modules/integration/src/test/scala/zio/elasticsearch/HttpExecutorSpec.scala

dbulaja98 · 2025-06-18T20:56:11Z

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

-}
+/*
+ * Copyright 2022 LambdaWorks
+ *


There are still weird chars here.

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

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

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

Mitep · 2025-06-19T11:19:12Z

modules/integration/src/test/scala/zio/elasticsearch/IntegrationSpec.scala

 /*
 * Copyright 2022 LambdaWorks
- *
+ * 


this is unnecessary

Mitep · 2025-06-19T11:19:32Z

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

+
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
+
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
+


please remove this

Mitep · 2025-06-19T11:21:10Z

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

 /*
 * Copyright 2022 LambdaWorks
- *
+ * 


please remove this

Mitep · 2025-06-19T11:22:08Z

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

Please fix this file

drmarjanovic

Two additional notes:

website generating fails
tests fail for Scala 2.12 and Java 17

docs/overview/queries/elastic_query_interval.md

modules/integration/src/test/scala/zio/elasticsearch/HttpExecutorSpec.scala

drmarjanovic · 2025-06-19T19:19:39Z

modules/integration/src/test/scala/zio/elasticsearch/HttpExecutorSpec.scala

+              val docWithTerm = doc.copy(stringField = s"$term banana orange")
+
+              val query = intervals(
+                "stringField",


Please use TestDocument.stringField.

Is there any issue with this?

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

drmarjanovic · 2025-06-20T11:22:03Z

modules/integration/src/test/scala/zio/elasticsearch/HttpExecutorSpec.scala

+              val docWithTerm = doc.copy(stringField = s"$term banana orange")
+
+              val query = intervals(
+                "stringField",


Is there any issue with this?

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

dbulaja98

Please rename ElasticIntervalQuery.scala and ElasticIntervalQuerySpec because it's actually rule, not query.
And, please add unit tests for the query itself

dbulaja98 · 2025-06-20T13:51:02Z

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

Should this be also renamed to Rule?

Done: matches case for IntervalQuery

861a986

drmarjanovic requested changes Jun 12, 2025

View reviewed changes

Disable empty chunk in interval allof, Wildcard (with cointains, star…

7bb2df6

…twith, endwith), Regex instead of String in intervalRegexp, remove useless imports

dbulaja98 requested changes Jun 13, 2025

View reviewed changes

markok4 added 3 commits June 13, 2025 14:36

Implement IntervalRange test

907980b

Implement: export methods from Queries.scala to ElasticIntervalQuery.…

3b97832

…scala

Implement: documentation in ElasticQuery.scala

ee269c2

markok4 changed the title ~~Done: matches case for IntervalQuery~~ (dsl): Support intervalQuery Jun 13, 2025

Implement: move methods to another file, fix tests

441fe9f

drmarjanovic requested changes Jun 16, 2025

View reviewed changes

modules/library/src/test/scala/zio/elasticsearch/ElasticQuerySpec.scala Outdated Show resolved Hide resolved

markok4 added 2 commits June 16, 2025 10:21

Fix formater bug, create ElasticIntervalQuerySpec

af9b2fe

Fix IntervalRange, Change order of methods in ElasticQuery

805f6bd

drmarjanovic requested changes Jun 16, 2025

View reviewed changes

markok4 added 7 commits June 16, 2025 12:26

Add ElasticIntervalQuery.scala

f9a4a13

Add HasAnalyzer and HasUseField, correct some mistakes

84c908b

Error: Scalafmt

d5b8bc8

Work on It tests

7af2c13

Add integration tests for IntervalMatch

ba54dc1

Refactor code in HttpExecutorSpec and create suite for IntervalMatch

593f575

Add elastic_interval_query.md file

5f42ed1

drmarjanovic requested changes Jun 17, 2025

View reviewed changes

markok4 added 3 commits June 17, 2025 13:37

Complete changes on Boosting, refactor on type-safe useField

ff1916d

Use fieldPath

ca243e9

Implemented methods for gt,gte,lt,lte

640500d

drmarjanovic requested changes Jun 18, 2025

View reviewed changes

dbulaja98 requested changes Jun 18, 2025

View reviewed changes

markok4 added 5 commits June 18, 2025 12:52

Revert boost, add another type parameter into HasUseField

41df198

Fix some warnings about casting.

f7cb287

Try to remove strange chars.

a136f4f

Done sbt prepared

7391cec

Remove manually strange chars

45bc91e

dbulaja98 reviewed Jun 18, 2025

View reviewed changes

Resolve some comments.

cf31617

markok4 force-pushed the IntervalsQuery branch from 350a5a4 to cf31617 Compare June 19, 2025 08:19

markok4 added 6 commits June 19, 2025 10:32

Change elastic_interval_query.md file.

3f44d44

Fix line endings and cleanup .gitattributes

dfece62

Remove strange chars.

500610f

Remove space from ElasticQuerySpec.

72715df

Return copyright to HttpExecutorSpec.

7941fe3

Add copyright in intervalSpec and some changes.

26150f1

Mitep suggested changes Jun 19, 2025

View reviewed changes

markok4 added 5 commits June 19, 2025 13:50

Try to fix.

4d60d5f

Fix space in copyright

c7eab4e

Fix space in copyright

377bf8c

Fix space in copyright

b21a202

Add to sidebars.js

b14e4d9

dbulaja98 previously approved these changes Jun 19, 2025

View reviewed changes

drmarjanovic requested changes Jun 19, 2025

View reviewed changes

Move ElasticInterval object in separated file, fix some problems.

72e782b

markok4 dismissed dbulaja98’s stale review via 72e782b June 20, 2025 08:08

markok4 added 2 commits June 20, 2025 10:12

Add line in elastic_query_interval.md and do sbt prepare

626dfda

Done.

61a4949

drmarjanovic requested changes Jun 20, 2025

View reviewed changes

Some fixes.

1aae089

dbulaja98 requested changes Jun 20, 2025

View reviewed changes

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

Copy link

Collaborator

dbulaja98 Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be also renamed to Rule?

Add unit tests for query.

689ab2e

		query =
		term(field = TestDocument.stringField, value = secondDocumentUpdated.stringField.toLowerCase)

Conversation

markok4 commented Jun 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

drmarjanovic commented Jun 12, 2025

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dbulaja98 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

markok4 commented Jun 17, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

markok4 commented Jun 12, 2025 •

edited

Loading

dbulaja98 left a comment •

edited

Loading