From 1f489702006c29b1aa345d798e4a9bce329b5c74 Mon Sep 17 00:00:00 2001
From: Bryce <bryce@brycecovertoperations.com>
Date: Mon, 30 Oct 2023 21:01:34 -0700
Subject: [PATCH] minor cleanup.

---
 src/clj/auto_ap/handler.clj   | 32 ++++++++++++++------------------
 src/clj/auto_ap/ssr/utils.clj | 27 ++-------------------------
 2 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/src/clj/auto_ap/handler.clj b/src/clj/auto_ap/handler.clj
index c0dad846..8c584f5b 100644
--- a/src/clj/auto_ap/handler.clj
+++ b/src/clj/auto_ap/handler.clj
@@ -125,6 +125,8 @@
                               :route  (:handler (bidi.bidi/match-route all-routes
                                                                        (:uri request)
                                                                        :request-method (:request-method request)))
+
+                              :source    "request"
                               :query (:uri request)
                               :request-method (:request-method request)
                               :user (dissoc (:identity request)
@@ -134,24 +136,18 @@
                        (not= "/api/graphql" (:uri request))
                        (assoc :query-params (:query-params request)))
       (mu/trace ::http-request-trace
-        []
-        (mu/with-context {:uri       (:uri request)
-                          :source    "request"
-                          :user-role (:user/role (:identity request))
-                          :user-name (:user/name (:identity request))}
-          
-
-          (when-not (str/includes? (:uri request) "health-check")
-            (alog/info ::http-request-starting))
-          (try 
-            (let [response (handler request)]
-              (alog/info ::http-request-done
-                         :status-code (:status response))
-              response)
-            (catch Exception e
-              (alog/error ::request-error
-                          :exception e)
-              (throw e))))))))
+        {:pairs []
+         :capture (fn [r] {:status (:status r)})} 
+        (when-not (str/includes? (:uri request) "health-check")
+          (alog/info ::http-request-starting))
+        (try 
+          (let [response (handler request)]
+            response)
+          (catch Exception e
+            (alog/error ::request-error
+              :status 500
+              :exception e)
+            (throw e)))))))
 
 (defn wrap-idle-session-timeout
   [handler ]
diff --git a/src/clj/auto_ap/ssr/utils.clj b/src/clj/auto_ap/ssr/utils.clj
index 13b53c0d..ed52f939 100644
--- a/src/clj/auto_ap/ssr/utils.clj
+++ b/src/clj/auto_ap/ssr/utils.clj
@@ -46,31 +46,7 @@
                        (assoc-in [:headers "hx-retarget"] "#modal-content")
                        (assoc-in [:headers "hx-reswap"] "innerHTML"))))))
 
-(defn wrap-error-response [handler]
-  (fn  [request]
-    (try
-      (handler request)
-      (catch Exception e
-        (if-let [v (or (:validation-error (ex-data e))
-                       (:validation-error (ex-data (.getCause e))))]
-          
-          (do 
-            (alog/warn ::request-validation-error
-                       :exception e)
-            (html-response
-              [:div.notification.is-warning.is-light
-               v]
-              :status 400))
-          (do 
-            (alog/error ::request-error
-                        :exception e)
-            (when (= "dev" (:dd-env env))
-              (println e))
-            (html-response
-              [:div.notification.is-danger.is-light
-               "Server error occured."
-               (ex-message e)]
-              :status 500)))))))
+
 
 (defn form-data->map [form-data]
   (reduce-kv
@@ -229,6 +205,7 @@
                                query-schema
                                query-params
                                main-transformer)))
+            
                     (catch Exception e
                       (alog/warn ::validation-error :error e)
                       (throw (ex-info (->> (-> e