Add integration tests

lambdaworks · Jan 30, 2023 · 297eff7 · 297eff7
1 parent a4809f8
commit 297eff7
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 7 deletions.
diff --git a/modules/library/src/it/scala/zio/elasticsearch/HttpExecutorSpec.scala b/modules/library/src/it/scala/zio/elasticsearch/HttpExecutorSpec.scala
@@ -204,6 +204,72 @@ object HttpExecutorSpec extends IntegrationSpec {
             }
           } @@ before(ElasticRequest.createIndex(secondSearchIndex, None).execute) @@ after(
             ElasticRequest.deleteIndex(secondSearchIndex).execute.orDie
+          ),
+          test("search for document using wildcard query - contains") {
+            checkOnce(genDocumentId, genCustomer, genDocumentId, genCustomer) {
+              (firstDocumentId, firstCustomer, secondDocumentId, secondCustomer) =>
+                val result =
+                  for {
+                    _ <- ElasticRequest.deleteByQuery(firstSearchIndex, matchAll()).execute
+                    _ <-
+                      ElasticRequest.upsert[CustomerDocument](firstSearchIndex, firstDocumentId, firstCustomer).execute
+                    _ <-
+                      ElasticRequest
+                        .upsert[CustomerDocument](firstSearchIndex, secondDocumentId, secondCustomer)
+                        .refreshTrue
+                        .execute
+                    query = ElasticQuery.contains("name.keyword", firstCustomer.name.take(3))
+                    res  <- ElasticRequest.search[CustomerDocument](firstSearchIndex, query).execute
+                  } yield res
+
+                assertZIO(result)(Assertion.contains(firstCustomer))
+            }
+          } @@ before(ElasticRequest.createIndex(firstSearchIndex, None).execute) @@ after(
+            ElasticRequest.deleteIndex(firstSearchIndex).execute.orDie
+          ),
+          test("search for document using wildcard query - starts with") {
+            checkOnce(genDocumentId, genCustomer, genDocumentId, genCustomer) {
+              (firstDocumentId, firstCustomer, secondDocumentId, secondCustomer) =>
+                val result =
+                  for {
+                    _ <- ElasticRequest.deleteByQuery(firstSearchIndex, matchAll()).execute
+                    _ <-
+                      ElasticRequest.upsert[CustomerDocument](firstSearchIndex, firstDocumentId, firstCustomer).execute
+                    _ <-
+                      ElasticRequest
+                        .upsert[CustomerDocument](firstSearchIndex, secondDocumentId, secondCustomer)
+                        .refreshTrue
+                        .execute
+                    query = ElasticQuery.startsWith("name.keyword", firstCustomer.name.take(3))
+                    res  <- ElasticRequest.search[CustomerDocument](firstSearchIndex, query).execute
+                  } yield res
+
+                assertZIO(result)(Assertion.contains(firstCustomer))
+            }
+          } @@ before(ElasticRequest.createIndex(firstSearchIndex, None).execute) @@ after(
+            ElasticRequest.deleteIndex(firstSearchIndex).execute.orDie
+          ),
+          test("search for document using wildcard query") {
+            checkOnce(genDocumentId, genCustomer, genDocumentId, genCustomer) {
+              (firstDocumentId, firstCustomer, secondDocumentId, secondCustomer) =>
+                val result =
+                  for {
+                    _ <- ElasticRequest.deleteByQuery(firstSearchIndex, matchAll()).execute
+                    _ <-
+                      ElasticRequest.upsert[CustomerDocument](firstSearchIndex, firstDocumentId, firstCustomer).execute
+                    _ <-
+                      ElasticRequest
+                        .upsert[CustomerDocument](firstSearchIndex, secondDocumentId, secondCustomer)
+                        .refreshTrue
+                        .execute
+                    query = wildcard("name.keyword", s"*${firstCustomer.name.take(3)}*")
+                    res  <- ElasticRequest.search[CustomerDocument](firstSearchIndex, query).execute
+                  } yield res
+
+                assertZIO(result)(Assertion.contains(firstCustomer))
+            }
+          } @@ before(ElasticRequest.createIndex(firstSearchIndex, None).execute) @@ after(
+            ElasticRequest.deleteIndex(firstSearchIndex).execute.orDie
           )
         ) @@ shrinks(0),
         suite("deleting by query")(

diff --git a/modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala b/modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala
@@ -181,7 +181,7 @@ object ElasticQuery {
     caseInsensitive: Option[Boolean] = None
   ) extends ElasticQuery[Wildcard] { self =>
     override def toJson: Json = {
-      val wildcardFields = Some("value" -> value.toJson) ++ boost.map("boost" -> Num(_)) ++ caseInsensitive.map(
+      val wildcardFields = Some("wildcard" -> value.toJson) ++ boost.map("boost" -> Num(_)) ++ caseInsensitive.map(
         "case_insensitive" -> Json.Bool(_)
       )
       Obj("wildcard" -> Obj(field -> Obj(wildcardFields.toList: _*)))

diff --git a/modules/library/src/test/scala/zio/elasticsearch/QueryDSLSpec.scala b/modules/library/src/test/scala/zio/elasticsearch/QueryDSLSpec.scala
@@ -607,8 +607,8 @@ object QueryDSLSpec extends ZIOSpecDefault {
               |}
               |""".stripMargin
 
-          assert(query1.toJsonBody)(equalTo(expected1.toJson))
-          assert(query2.toJsonBody)(equalTo(expected23.toJson))
+          assert(query1.toJsonBody)(equalTo(expected1.toJson)) &&
+          assert(query2.toJsonBody)(equalTo(expected23.toJson)) &&
           assert(query3.toJsonBody)(equalTo(expected23.toJson))
         },
         test("properly encode case insensitive Wildcard query") {
@@ -642,8 +642,8 @@ object QueryDSLSpec extends ZIOSpecDefault {
               |}
               |""".stripMargin
 
-          assert(query1.toJsonBody)(equalTo(expected1.toJson))
-          assert(query2.toJsonBody)(equalTo(expected23.toJson))
+          assert(query1.toJsonBody)(equalTo(expected1.toJson)) &&
+          assert(query2.toJsonBody)(equalTo(expected23.toJson)) &&
           assert(query3.toJsonBody)(equalTo(expected23.toJson))
         },
         test("properly encode case insensitive Wildcard query with boost") {
@@ -679,8 +679,8 @@ object QueryDSLSpec extends ZIOSpecDefault {
               |}
               |""".stripMargin
 
-          assert(query1.toJsonBody)(equalTo(expected1.toJson))
-          assert(query2.toJsonBody)(equalTo(expected23.toJson))
+          assert(query1.toJsonBody)(equalTo(expected1.toJson)) &&
+          assert(query2.toJsonBody)(equalTo(expected23.toJson)) &&
           assert(query3.toJsonBody)(equalTo(expected23.toJson))
         },
         test("properly encode Bulk request body") {