(dsl): Support regexp query
#302
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
August 15, 2023 12:44
dbulaja98
requested changes
Aug 16, 2023
| res <- Executor | ||
| .execute(ElasticRequest.search(firstSearchIndex, query)) | ||
| .documentAs[TestDocument] | ||
| } yield assert(res)(!Assertion.contains(firstDocument)) |
There was a problem hiding this comment.
It does not make sense to me. Should it maybe be assert(res)(Assertion.contains(firstDocument))?
There was a problem hiding this comment.
Agreed to just change the name of the test.
Comment on lines
1081
to
1108
| test("search for a document using regexp query with case insensitive") { | ||
| checkOnce(genDocumentId, genTestDocument, genDocumentId, genTestDocument) { | ||
| (firstDocumentId, firstDocument, secondDocumentId, secondDocument) => | ||
| for { | ||
| _ <- Executor.execute(ElasticRequest.deleteByQuery(firstSearchIndex, matchAll)) | ||
| _ <- Executor.execute( | ||
| ElasticRequest.upsert[TestDocument](firstSearchIndex, firstDocumentId, firstDocument) | ||
| ) | ||
| _ <- Executor.execute( | ||
| ElasticRequest | ||
| .upsert[TestDocument](firstSearchIndex, secondDocumentId, secondDocument) | ||
| .refreshTrue | ||
| ) | ||
| query = ElasticQuery | ||
| .regexp( | ||
| field = TestDocument.stringField, | ||
| value = s"${firstDocument.stringField.take(1)}.*${firstDocument.stringField.takeRight(1)}" | ||
| ) | ||
| .caseInsensitiveTrue | ||
| res <- Executor | ||
| .execute(ElasticRequest.search(firstSearchIndex, query)) | ||
| .documentAs[TestDocument] | ||
| } yield (assert(res)(Assertion.contains(firstDocument)) && assert(res)(!Assertion.contains(secondDocument))) | ||
| } | ||
| } @@ around( | ||
| Executor.execute(ElasticRequest.createIndex(firstSearchIndex)), | ||
| Executor.execute(ElasticRequest.deleteIndex(firstSearchIndex)).orDie | ||
| ), |
There was a problem hiding this comment.
I think you can remove this test.
There was a problem hiding this comment.
Agreed to just change the name of the previous test.
| * [[zio.elasticsearch.query.RegexpQuery]] returns documents that contain terms matching a regular expression. | ||
| * | ||
| * @param field | ||
| * the field for which query is specified for |
There was a problem hiding this comment.
Suggested change
| * the field for which query is specified for | |
| * the type-safe field for which query is specified for |
| test("regexp") { | ||
| val query = regexp("stringField", "t.*st") | ||
| val queryTs = regexp(TestDocument.stringField, "t.*st") | ||
| val queryWithCaseInsensitive = regexp("stringField", "t.*st").caseInsensitiveTrue |
There was a problem hiding this comment.
You don't need this one. (line 1171)
| val query = regexp("stringField", "t.*st") | ||
| val queryTs = regexp(TestDocument.stringField, "t.*st") | ||
| val queryWithCaseInsensitive = regexp("stringField", "t.*st").caseInsensitiveTrue | ||
| val queryTsWithCaseInsensitive = regexp(TestDocument.stringField, "t.*st").caseInsensitiveTrue |
There was a problem hiding this comment.
Rename this one to queryWithCaseInsensitive. (line 1171)
There was a problem hiding this comment.
And add another one val queryWithSuffix, where you can do something like this: TestDocument.stringField.raw.
| @@ -2772,6 +2783,40 @@ object ElasticQuerySpec extends ZIOSpecDefault { | |||
| assert(queryMixedBoundsWithBoost.toJson(fieldPath = None))(equalTo(expectedMixedBoundsWithBoost.toJson)) && | |||
| assert(queryWithFormat.toJson(fieldPath = None))(equalTo(expectedWithFormat.toJson)) | |||
| }, | |||
| test("regexp") { | |||
There was a problem hiding this comment.
Do the same as above here.
milicns
commented
Aug 16, 2023
| ) && | ||
| assert(queryWithSuffix)( | ||
| equalTo(Regexp[TestDocument](field = "stringField.raw", value = "t.*st", caseInsensitive = None)) | ||
| ) |
There was a problem hiding this comment.
Sbt prepare divide these asserts in the new lines
dbulaja98
approved these changes
Aug 17, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #91