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)

src/clj/auto_ap/parse.clj

@@ -71,7 +71,7 @@
   (println companies)
   (->> companies
        (map (fn [company]
-              (if-let [matches (:matches (:data company))]
+              (if-let [matches (:matches company)]
                 [company (apply min (map #(m/jaccard (.toLowerCase company-identifier) %) matches))]
                 [company 1])))
        (filter #(< (second %) 0.25))

src/clj/auto_ap/routes/checks.clj

@@ -86,8 +86,8 @@
          [[:cell]
           [:cell {:colspan 5} [:paragraph
                                vendor-name "\n"
-                               (:address1 vendor) "\n"
-                               (:city vendor) ", " (:state vendor) " " (:zip vendor)]]
+                               (:street1 (:address vendor)) "\n"
+                               (:city (:address vendor)) ", " (:state (:address vendor)) " " (:zip (:address vendor))]]
           [:cell {:align :right}
            "Paid to:\n"
            "Amount:\n"