a lot of progress towards unification.

src/clj/auto_ap/graphql.clj

@@ -602,7 +602,11 @@
   ([id q v]
    (println "executing graphql query" id q v)
    (try 
-     (time (simplify (execute schema q v {:id id})))
+     (let [result (time (simplify (execute schema q v {:id id})))]
+       (when (seq (:errors result))
+         (throw (ex-info "GraphQL error" {:result result})))
+       result)
+     
      (catch Exception e
        (if-let [v (:validation-error (ex-data e))]
          (println "validation error" v)

src/clj/auto_ap/graphql/clients.clj

@@ -14,7 +14,7 @@
                                :in ['$ '?code]
                                :where ['[?id :client/code ?code]]}
                        :args [(d/db (d/connect uri)) code]}))
-    (throw (ex-info "Client is not unique" {:validation-error "Client is not unique"}))))
+    (throw (ex-info "Client is not unique" {:validation-error (str "Client code '" code "' is not unique.")}))))
 
 (defn edit-client [context {:keys [edit_client new_bank_accounts] :as args} value]
   (assert-admin (:id context))

src/clj/auto_ap/routes/graphql.clj

@@ -21,7 +21,15 @@
                       :body (pr-str (ql/query (:identity r) (query-params "query") variables ))
                       :headers {"Content-Type" "application/edn"}})
                    (catch Exception e
-                     {:status 400
-                      :body (pr-str {:data (merge {:message (.getMessage e)} (ex-data e))})
-                      :headers {"Content-Type" "application/edn"}}))))
+                     (if-let [result (:result (ex-data e))]
+                       {:status 400
+                        :body (pr-str result)
+                        :headers {"Content-Type" "application/edn"}}
+                       (if-let [message (:validation-error (ex-data e) )]
+                         {:status 400
+                          :body (pr-str {:errors [(merge {:message message} (ex-data e))]})
+                          :headers {"Content-Type" "application/edn"}}
+                         {:status 500
+                          :body (pr-str {:errors [(merge {:message (.getMessage e)} (ex-data e))]})
+                          :headers {"Content-Type" "application/edn"}}))))))
    wrap-secure))