loading relations

src/clj/auto_ap/db/utils.clj

@@ -1,5 +1,6 @@
 (ns auto-ap.db.utils
   (:require [clojure.string :as str]
+            [clojure.edn :as edn]
             [config.core :refer [env]]))
 
 (defn snake->kebab [s]
@@ -8,12 +9,18 @@
 (defn kebab->snake [s]
   (str/replace s #"-" "_"))
 
-(defn db->clj [x]
-  (into {}
-        (map
-         (fn [[k v]]
-           [(keyword (snake->kebab (name k))) v])
-         x)))
+(defn db->clj
+  ([x]
+   (let [kebabed (into {}
+                       (map
+                        (fn [[k v]]
+                          [(keyword (snake->kebab (name k))) v])
+                        x))
+         merged (merge kebabed (edn/read-string (:data kebabed)))]
+     merged))
+  ([x namespace]
+   (let [x (db->clj x)]
+     (assign-namespace x namespace))))
 
 (defn clj->db [x]
   (into {}
@@ -22,6 +29,9 @@
            [(keyword (kebab->snake (name k))) v])
          x)))
 
+(defn merge-data [{:keys [data] :as x}]
+  (merge x (edn/read-string data)))
+
 (defn get-conn []
   (let [db-host (:server (:db env))
         db-port 5432