graphql used for invoices

src/clj/auto_ap/db/vendors.clj

@@ -1,33 +1,46 @@
 (ns auto-ap.db.vendors
-  (:require [auto-ap.db.utils :refer [clj->db db->clj get-conn]]
+  (:require [auto-ap.db.utils :refer [clj->db db->clj get-conn query execute!]]
             [auto-ap.entities.vendors :as entities]
             [clojure.edn :as edn]
-            [clojure.java.jdbc :as j]))
+            [clojure.java.jdbc :as j]
+            [honeysql.core :as sql]
+            [honeysql.helpers :as helpers]
+            [honeysql.format :as f]))
 
 
-(defn parse [x]
-  (db->clj x))
-
 (defn unparse [x]
   (-> x
-      (select-keys entities/all-keys)
-      clj->db))
+      (select-keys entities/all-keys)))
+
+(def base-query (sql/build :select :*
+                           :from :vendors))
+
 
 (defn get-all []
-  (->> (j/query (get-conn) "SELECT * FROM vendors")
-       (map parse)))
+  (query base-query))
 
 (defn get-by-id [id]
-  (parse (first (j/query (get-conn) ["SELECT * FROM vendors WHERE id = ?" id]))))
+  (first (query (-> base-query
+                    (helpers/merge-where [:= :id id])))))
 
 (defn upsert [id data]
-  (j/update! (get-conn) :vendors (unparse data) ["id = ?" (Integer/parseInt id)] )
-  (parse (first (j/query (get-conn) ["SELECT * FROM vendors WHERE id = ?" (Integer/parseInt id)]))))
+  (-> (sql/build
+       :update :vendors
+       :set (unparse data)
+       :where [:= :id (if (int? id)
+                        id
+                        (Integer/parseInt id))])
+      execute!) 
+  (get-by-id (if (int? id)
+               id
+               (Integer/parseInt id))))
 
 (defn insert [data]
-  (parse (first (j/insert! (get-conn)
-                           :vendors
-                           (unparse data)))))
+  (let [[id] (-> (sql/build :insert-into :vendors
+                            :values [(unparse data)])
+                 execute!)]
+    (get-by-id id)))
 
 (defn find-with-reminders []
-  (map parse (j/query (get-conn) ["SELECT * FROM vendors WHERE invoice_reminder_schedule = ?" "Weekly"])))
+  (query (-> base-query
+             (helpers/merge-where [:= :invoice-reminder-schedule "Weekly"]))))