From 1892c94e02d227523acfa54e02ad3ecc290af512 Mon Sep 17 00:00:00 2001
From: Wes Morgan <git@wesmorgan.me>
Date: Thu, 13 Jul 2023 11:59:43 -0600
Subject: [PATCH] DRY up query validation error humanization

---
 src/fluree/db/api/query.cljc        | 9 +++++----
 src/fluree/db/query/exec/eval.cljc  | 8 ++++----
 src/fluree/db/query/fql/syntax.cljc | 4 ++--
 src/fluree/db/query/history.cljc    | 4 ----
 src/fluree/db/validation.cljc       | 7 ++++++-
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/fluree/db/api/query.cljc b/src/fluree/db/api/query.cljc
index 0cbed6673..e92ab5766 100644
--- a/src/fluree/db/api/query.cljc
+++ b/src/fluree/db/api/query.cljc
@@ -1,7 +1,7 @@
 (ns fluree.db.api.query
   "Primary API ns for any user-invoked actions. Wrapped by language & use specific APIS
   that are directly exposed"
-  (:require [clojure.core.async :as async :refer [<! go]]
+  (:require [clojure.core.async :as async]
             [fluree.db.fuel :as fuel]
             [fluree.db.time-travel :as time-travel]
             [fluree.db.query.fql :as fql]
@@ -11,7 +11,8 @@
             [fluree.db.util.core :as util :refer [try* catch*]]
             [fluree.db.util.async :as async-util :refer [<? go-try]]
             [fluree.db.json-ld.policy :as perm]
-            [fluree.db.json-ld.credential :as cred]))
+            [fluree.db.json-ld.credential :as cred]
+            [fluree.db.validation :as v]))
 
 #?(:clj (set! *warn-on-reflection* true))
 
@@ -89,7 +90,7 @@
                                (str "History query not properly formatted. Provided "
                                     (pr-str query-map))
                                {:status  400
-                                :message (history/humanize-error e)
+                                :message (v/humanize-error e)
                                 :error   :db/invalid-query}))))
          history-query (cond-> coerced-query did (assoc-in [:opts :did] did))]
      (<? (history* db history-query)))))
@@ -148,7 +149,7 @@
   [source flureeQL]
   (go-try
    (let [{flureeQL :subject, did :did} (or (<? (cred/verify flureeQL))
-                                              {:subject flureeQL})
+                                           {:subject flureeQL})
          global-opts         (cond-> (:opts flureeQL) did (assoc :did did))
          db                  (if-let [policy-opts (perm/policy-opts global-opts)]
                                (<? (perm/wrap-policy source policy-opts))
diff --git a/src/fluree/db/query/exec/eval.cljc b/src/fluree/db/query/exec/eval.cljc
index abc053bba..3353e7a99 100644
--- a/src/fluree/db/query/exec/eval.cljc
+++ b/src/fluree/db/query/exec/eval.cljc
@@ -255,8 +255,8 @@
      ;; hash fns
      sha256 sha512
      ;; rdf term fns
-     uuid struuid isNumeric isBlank str
-     })
+     uuid struuid isNumeric isBlank str})
+
 
 (def allowed-symbols
   (set/union allowed-aggregate-fns allowed-scalar-fns))
@@ -307,8 +307,8 @@
     struuid     fluree.db.query.exec.eval/struuid
     isNumeric   fluree.db.query.exec.eval/isNumeric
     isBlank     fluree.db.query.exec.eval/isBlank
-    str         fluree.db.query.exec.eval/sparql-str
-    })
+    str         fluree.db.query.exec.eval/sparql-str})
+
 
 (defn variable?
   [sym]
diff --git a/src/fluree/db/query/fql/syntax.cljc b/src/fluree/db/query/fql/syntax.cljc
index 7cf93550b..c1dd7e68b 100644
--- a/src/fluree/db/query/fql/syntax.cljc
+++ b/src/fluree/db/query/fql/syntax.cljc
@@ -167,7 +167,7 @@
      (throw (ex-info "Invalid Query"
                      {:status  400
                       :error   :db/invalid-query
-                      :reasons (-> e ex-data :data :explain me/humanize)})))))
+                      :reasons (v/humanize-error e)})))))
 
 (def coerce-modification*
   (m/coercer ::modification (mt/transformer {:name :fql}) {:registry registry}))
@@ -180,4 +180,4 @@
      (throw (ex-info "Invalid Ledger Modification"
                      {:status  400
                       :error   :db/invalid-query
-                      :reasons (-> e ex-data :data :explain me/humanize)})))))
+                      :reasons (v/humanize-error e)})))))
diff --git a/src/fluree/db/query/history.cljc b/src/fluree/db/query/history.cljc
index 146517d49..f61a5d762 100644
--- a/src/fluree/db/query/history.cljc
+++ b/src/fluree/db/query/history.cljc
@@ -103,10 +103,6 @@
 (def explain-error
   (m/explainer ::history-query {:registry registry}))
 
-(defn humanize-error
-  [query-validation-error]
-  (-> query-validation-error Throwable->map :data :data :explain me/humanize))
-
 (def parse-history-query
   (m/parser ::history-query {:registry registry}))
 
diff --git a/src/fluree/db/validation.cljc b/src/fluree/db/validation.cljc
index db5608de8..90e12ea28 100644
--- a/src/fluree/db/validation.cljc
+++ b/src/fluree/db/validation.cljc
@@ -1,7 +1,8 @@
 (ns fluree.db.validation
   (:require [fluree.db.util.core :refer [pred-ident?]]
             [fluree.db.constants :as const]
-            [malli.core :as m]))
+            [malli.core :as m]
+            [malli.error :as me]))
 
 (defn iri?
   [v]
@@ -54,6 +55,10 @@
   [x]
   (or (fn-string? x) (fn-list? x)))
 
+(defn humanize-error
+  [error]
+  (-> error ex-data :data :explain me/humanize))
+
 (def registry
   (merge
    (m/base-schemas)