Skip to content

armgit / Ix

Public Imported from GitHub
0

Understand any codebase instantly. System intelligence for codebases, built for humans and AI.

fix: surface JSON parse errors instead of silently dropping results

riley022771aac09c3b4d
diff --git a/memory-layer/src/main/scala/ix/memory/db/ArangoClient.scala b/memory-layer/src/main/scala/ix/memory/db/ArangoClient.scala
index d4672f97..994acd7a 100644
--- a/memory-layer/src/main/scala/ix/memory/db/ArangoClient.scala
+++ b/memory-layer/src/main/scala/ix/memory/db/ArangoClient.scala
@@ -1,6 +1,7 @@
package ix.memory.db
import cats.effect.{IO, Resource}
+import cats.syntax.traverse._
import com.arangodb.{ArangoDB, ArangoDatabase}
import com.fasterxml.jackson.databind.ObjectMapper
import io.circe.Json
@@ -11,25 +12,30 @@ import scala.jdk.CollectionConverters._
class ArangoClient private (db: ArangoDatabase) {
private val mapper = new ObjectMapper()
- private def toJson(value: AnyRef): Option[Json] =
- Option(value).flatMap(v => parseJson(mapper.writeValueAsString(v)).toOption)
+ private def toJson(value: AnyRef): IO[Json] =
+ IO.fromEither(
+ parseJson(mapper.writeValueAsString(value))
+ .left.map(e => new RuntimeException(s"Failed to parse ArangoDB result: ${e.message}"))
+ )
+
+ private def asJava(bindVars: Map[String, AnyRef]): java.util.Map[String, AnyRef] = {
+ val m = new java.util.HashMap[String, AnyRef]()
+ bindVars.foreach { case (k, v) => m.put(k, v) }
+ m
+ }
def query(aql: String, bindVars: Map[String, AnyRef] = Map.empty): IO[List[Json]] =
IO.blocking {
- val javaVars = new java.util.HashMap[String, AnyRef]()
- bindVars.foreach { case (k, v) => javaVars.put(k, v) }
- val cursor = db.query(aql, classOf[AnyRef], javaVars)
- cursor.asListRemaining().asScala.toList.flatMap(toJson)
- }
+ val cursor = db.query(aql, classOf[AnyRef], asJava(bindVars))
+ cursor.asListRemaining().asScala.toList
+ }.flatMap(_.traverse(toJson))
def queryOne(aql: String, bindVars: Map[String, AnyRef] = Map.empty): IO[Option[Json]] =
query(aql, bindVars).map(_.headOption)
def execute(aql: String, bindVars: Map[String, AnyRef] = Map.empty): IO[Unit] =
IO.blocking {
- val javaVars = new java.util.HashMap[String, AnyRef]()
- bindVars.foreach { case (k, v) => javaVars.put(k, v) }
- db.query(aql, classOf[Void], javaVars)
+ db.query(aql, classOf[Void], asJava(bindVars))
()
}