use query error formatting fn in query error coercion

deps.edn

@@ -1,7 +1,7 @@
 {:deps  {org.clojure/clojure            {:mvn/version "1.11.1"}
          org.clojure/core.async         {:mvn/version "1.6.681"}
          com.fluree/db                  {:git/url "https://github.com/fluree/db.git"
-                                         :git/sha "a9cbf41c355ac7415239fa37e6eb3790faad15b0"}
+                                         :git/sha "310e71e0175302660f8312f1410173e2b63c66a3"}
          com.fluree/json-ld             {:git/url "https://github.com/fluree/json-ld.git"
                                          :git/sha "2b4a4cf75f2b823eea7fa221c6b9cbeb68299e90"}
 
@@ -29,7 +29,8 @@
          info.sunng/ring-jetty9-adapter ^{:antq/exclude "0.30.x"} {:mvn/version  "0.22.2"}
          metosin/reitit                 {:mvn/version "0.6.0"}
          metosin/muuntaja               {:mvn/version "0.6.8"}
-         metosin/malli                  {:mvn/version "0.13.0"}
+         metosin/malli                  {:git/url "https://github.com/metosin/malli.git"
+                                         :git/sha "5211aca498ff7b022c36de4ca713990f5e731a9c" }
          ring-cors/ring-cors            {:mvn/version "0.1.13"}
 
          ;; retries

src/fluree/server/components/http.clj

@@ -7,6 +7,7 @@
    [fluree.db.json-ld.credential :as cred]
    [fluree.db.json-ld.transact :as transact]
    [fluree.db.util.log :as log]
+   [fluree.db.validation :as v]
    [fluree.server.handlers.ledger :as ledger]
    [fluree.server.handlers.create :as create]
    [fluree.server.handlers.remote-resource :as remote]
@@ -75,7 +76,7 @@
 
 (def FqlQuery (m/schema [:and
                          [:map-of :keyword :any]
-                         (fql/query-schema [[:from LedgerAlias]])]
+                         (fql/query-schema [])]
                         {:registry fql/registry}))
 
 (def SparqlQuery (m/schema :string))
@@ -137,12 +138,21 @@
                  {:port  (ds/ref [:env :http/server :port])
                   :join? false}}})
 
+(def query-coercer
+  (reitit.coercion.malli/create
+   {:strip-extra-keys false
+    :error-keys #{}
+    :encode-error (fn [explained]
+                    {:error :db/invalid-query
+                     :message (v/format-explained-errors explained nil)})}))
+
 (def query-endpoint
   {:summary    "Endpoint for submitting queries"
    :parameters {:body QueryRequestBody}
    :responses  {200 {:body QueryResponse}
                 400 {:body ErrorResponse}
                 500 {:body ErrorResponse}}
+   :coercion   ^:replace  query-coercer
    :handler    #'ledger/query})
 
 
@@ -152,6 +162,7 @@
    :responses  {200 {:body HistoryQueryResponse}
                 400 {:body ErrorResponse}
                 500 {:body ErrorResponse}}
+   :coercion   ^:replace  query-coercer
    :handler    #'ledger/history})
 
 (defn wrap-assoc-system

src/fluree/server/handlers/ledger.clj

@@ -16,7 +16,7 @@
                          did (assoc :did did)))
         query* (if opts (assoc query :opts opts) query)]
     {:status 200
-     :body   (deref! (fluree/from-query conn query* {:format format}))}))
+     :body   (deref! (fluree/query-connection conn query* {:format format}))}))
 
 (defhandler history
   [{:keys [fluree/conn credential/did]