not using namespaced keys, due to graphql

src/clj/auto_ap/db/companies.clj

@@ -1,26 +1,16 @@
 (ns auto-ap.db.companies
-  (:require [auto-ap.db.utils :refer [assign-namespace clj->db db->clj
-                                      get-conn]]
+  (:require [auto-ap.db.utils :refer [clj->db db->clj get-conn]]
             [auto-ap.entities.companies :as entity]
             [clojure.edn :as edn]
             [clojure.java.jdbc :as j]))
 
-(defn merge-data [{:keys [::entity/data] :as x}]
-  (merge x (edn/read-string data)))
-
 (defn parse [x]
-  (-> x
-      (db->clj)
-
-      (assign-namespace "auto-ap.entities.companies")
-      merge-data
-      ))
+  (db->clj x))
 
 
 (defn get-all []
   (->> (j/query (get-conn) "SELECT * FROM companies")
-       (map parse)
-       ))
+       (map parse)))
 
 (defn upsert [id data]
   (j/update! (get-conn) :companies (clj->db data) ["id = ?" (Integer/parseInt id)] )