All data on checks are now set up.

src/clj/auto_ap/db/companies.clj

@@ -5,7 +5,6 @@
             [clojure.java.jdbc :as j]
             [honeysql.core :as sql]
             [honeysql.helpers :as helpers]))
-
 (def all-fields #{:name :email :data :id})
 
 (def base-query (sql/build :select :*

src/clj/auto_ap/db/vendors.clj

@@ -7,24 +7,45 @@
             [honeysql.helpers :as helpers]
             [honeysql.format :as f]))
 
+(defn fields->data [x]
+  (-> x
+      (assoc-in [:data :address] (:address x))
+      (dissoc :address)))
+
+(def all-fields [:name
+                 :code
+                 :id
+                 :invoice-reminder-schedule
+                 :primary-contact
+                 :primary-email
+                 :primary-phone
+                 :secondary-contact
+                 :secondary-email
+                 :secondary-phone
+                 :data])
 
 (defn unparse [x]
-  (-> x
-      (select-keys entities/all-keys)))
+  (-> (fields->data x)
+      (select-keys all-fields)
+      (clj->db)))
 
 (def base-query (sql/build :select :*
                            :from :vendors))
 
+(defn data->fields [x]
+  (-> x
+      (merge (:data x))
+      (dissoc :data)))
 
 (defn get-all []
-  (query base-query))
+  (map data->fields (query base-query)))
 
 (defn get-by-id [id]
-  (first (query (-> base-query
-                    (helpers/merge-where [:= :id id])))))
+  (first (map data->fields
+              (query (-> base-query
+                         (helpers/merge-where [:= :id id]))))))
 
 (defn upsert [id data]
-  (println data)
   (-> (sql/build
        :update :vendors
        :set (unparse data)