Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support boost in Range and Bool query #88

Merged
merged 2 commits into from
Feb 8, 2023
Merged

Support boost in Range and Bool query #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b11947
Support boost in Range and Bool query
kevchuang Feb 8, 2023
0ca53f5
Refactoring and cleaning code
kevchuang Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions modules/library/src/main/scala/zio/elasticsearch/Boost.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package zio.elasticsearch

import zio.elasticsearch.ElasticQuery.{ElasticPrimitive, MatchAllQuery, TermQuery, WildcardQuery}
import zio.elasticsearch.ElasticQueryType.{MatchAll, Term, Wildcard}
import zio.elasticsearch.ElasticQuery._
import zio.elasticsearch.ElasticQueryType.{Bool, MatchAll, Range, Term, Wildcard}

object Boost {

Expand All @@ -26,11 +26,22 @@ object Boost {
}

object WithBoost {
implicit val boolWithBoost: WithBoost[Bool] = (query: ElasticQuery[Bool], value: Double) =>
query match {
case q: BoolQuery => q.copy(boost = Some(value))
}

implicit val matchAllWithBoost: WithBoost[MatchAll] = (query: ElasticQuery[MatchAll], value: Double) =>
query match {
case q: MatchAllQuery => q.copy(boost = Some(value))
}

implicit def rangeWithBoost[A, LB <: LowerBound, UB <: UpperBound]: WithBoost[Range[A, LB, UB]] =
(query: ElasticQuery[Range[A, LB, UB]], value: Double) =>
query match {
case q: RangeQuery[A, LB, UB] => q.copy(boost = Some(value))
}

implicit def termWithBoost[A: ElasticPrimitive]: WithBoost[Term[A]] =
(query: ElasticQuery[Term[A]], value: Double) =>
query match {
Expand Down
51 changes: 31 additions & 20 deletions modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ object ElasticQuery {
private[elasticsearch] final case class BoolQuery(
filter: List[ElasticQuery[_]],
must: List[ElasticQuery[_]],
should: List[ElasticQuery[_]]
should: List[ElasticQuery[_]],
boost: Option[Double]
) extends ElasticQuery[Bool] { self =>

def filter(queries: ElasticQuery[_]*): BoolQuery =
Expand All @@ -132,20 +133,21 @@ object ElasticQuery {
def must(queries: ElasticQuery[_]*): BoolQuery =
self.copy(must = must ++ queries)

def paramsToJson: Json = Obj(
"bool" -> Obj(
"filter" -> Arr(filter.map(_.paramsToJson): _*),
"must" -> Arr(must.map(_.paramsToJson): _*),
"should" -> Arr(should.map(_.paramsToJson): _*)
)
)
def paramsToJson: Json = {
val boolFields =
Some("filter" -> Arr(filter.map(_.paramsToJson): _*)) ++
Some("must" -> Arr(must.map(_.paramsToJson): _*)) ++
Some("should" -> Arr(should.map(_.paramsToJson): _*)) ++
boost.map("boost" -> Num(_))
Obj("bool" -> Obj(boolFields.toList: _*))
}

def should(queries: ElasticQuery[_]*): BoolQuery =
self.copy(should = should ++ queries)
}

private[elasticsearch] object BoolQuery {
def empty: BoolQuery = BoolQuery(Nil, Nil, Nil)
def empty: BoolQuery = BoolQuery(filter = Nil, must = Nil, should = Nil, boost = None)
}

private[elasticsearch] final case class ExistsQuery private (field: String) extends ElasticQuery[Exists] {
Expand Down Expand Up @@ -192,8 +194,9 @@ object ElasticQuery {
private[elasticsearch] final case class RangeQuery[A, LB <: LowerBound, UB <: UpperBound] private (
Copy link
Member

Choose a reason for hiding this comment

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

Currently, we are working on some code improvements - take a look here.

Therefore, after that is applied we should be able to keep private here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changes done !

field: String,
lower: LB,
upper: UB
) extends ElasticQuery[Range] { self =>
upper: UB,
boost: Option[Double]
) extends ElasticQuery[Range[A, LB, UB]] { self =>

def gt[B <: A: ElasticPrimitive](value: B)(implicit
@unused ev: LB =:= Unbounded.type
Expand All @@ -215,12 +218,20 @@ object ElasticQuery {
): RangeQuery[B, LB, LessThanOrEqualTo[B]] =
self.copy(upper = LessThanOrEqualTo(value))

def paramsToJson: Json = Obj("range" -> Obj(field -> Obj(List(lower.toJson, upper.toJson).flatten: _*)))
def paramsToJson: Json = {
val rangeFields = Some(field -> Obj(List(lower.toJson, upper.toJson).flatten: _*)) ++ boost.map("boost" -> Num(_))
Obj("range" -> Obj(rangeFields.toList: _*))
}
}

private[elasticsearch] object RangeQuery {
def empty[A](field: String): RangeQuery[A, Unbounded.type, Unbounded.type] =
RangeQuery[A, Unbounded.type, Unbounded.type](field, Unbounded, Unbounded)
RangeQuery[A, Unbounded.type, Unbounded.type](
field = field,
lower = Unbounded,
upper = Unbounded,
boost = None
)
}

private[elasticsearch] final case class TermQuery[A: ElasticPrimitive](
Expand Down Expand Up @@ -256,11 +267,11 @@ object ElasticQuery {
sealed trait ElasticQueryType

object ElasticQueryType {
sealed trait Bool extends ElasticQueryType
sealed trait Exists extends ElasticQueryType
sealed trait Match extends ElasticQueryType
sealed trait MatchAll extends ElasticQueryType
sealed trait Range extends ElasticQueryType
sealed trait Term[A] extends ElasticQueryType
sealed trait Wildcard extends ElasticQueryType
sealed trait Bool extends ElasticQueryType
sealed trait Exists extends ElasticQueryType
sealed trait Match extends ElasticQueryType
sealed trait MatchAll extends ElasticQueryType
sealed trait Range[A, LB, UB] extends ElasticQueryType
sealed trait Term[A] extends ElasticQueryType
sealed trait Wildcard extends ElasticQueryType
}
Loading