Fix review remarks

Tinkoff · Aug 5, 2023 · 89c4ccc · 89c4ccc
1 parent b9a6c54
commit 89c4ccc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...nd/mockingbird/src/main/scala/ru/tinkoff/tcb/mockingbird/dal2/mongo/HttpStubDAOImpl.scala b/...nd/mockingbird/src/main/scala/ru/tinkoff/tcb/mockingbird/dal2/mongo/HttpStubDAOImpl.scala
@@ -5,13 +5,13 @@ import java.time.Instant
 import com.github.dwickern.macros.NameOf.*
 import eu.timepit.refined.auto.*
 import mouse.boolean.*
-import org.bson.BsonString
 import org.mongodb.scala.MongoCollection
 import org.mongodb.scala.bson.BsonDocument
 import zio.ZIO
 
 import ru.tinkoff.tcb.criteria.*
 import ru.tinkoff.tcb.criteria.Typed.*
+import ru.tinkoff.tcb.criteria.Untyped.*
 import ru.tinkoff.tcb.dataaccess.UpdateResult
 import ru.tinkoff.tcb.mockingbird.api.request.StubPatch
 import ru.tinkoff.tcb.mockingbird.dal
@@ -71,11 +71,11 @@ class HttpStubDAOImpl(collection: MongoCollection[BsonDocument]) extends dal2.Ht
   }
 
   override def fetch(params: dal2.StubFetchParams): Task[Vector[HttpStub]] = {
-    var queryDoc =
+    var queryDoc: Expression[Any] =
       prop[HttpStub](_.scope) =/= Scope.Countdown.asInstanceOf[Scope] || prop[HttpStub](_.times) > Option(0)
 
     queryDoc = params.query.fold(queryDoc) { qs =>
-      val q = Expression[HttpStub]("_id", "_id" -> new BsonString(qs)) ||
+      val q = where(_._id === qs) ||
         prop[HttpStub](_.name).regex(qs, "i") ||
         prop[HttpStub](_.path).regex(qs, "i") ||
         prop[HttpStub](_.pathPattern).regex(qs, "i")