graphql used for invoices

src/clj/auto_ap/db/companies.clj

@@ -1,20 +1,33 @@
 (ns auto-ap.db.companies
-  (: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.companies :as entity]
             [clojure.edn :as edn]
-            [clojure.java.jdbc :as j]))
+            [clojure.java.jdbc :as j]
+            [honeysql.core :as sql]
+            [honeysql.helpers :as helpers]))
 
-(defn parse [x]
-  (db->clj x))
+(def base-query (sql/build :select :*
+                           :from :companies))
 
 
 (defn get-all []
-  (->> (j/query (get-conn) "SELECT * FROM companies")
-       (map parse)))
-
-(defn upsert [id data]
-  (j/update! (get-conn) :companies (clj->db data) ["id = ?" (Integer/parseInt id)] )
-  (parse (first (j/query (get-conn) ["SELECT * FROM companies WHERE id = ?" (Integer/parseInt id)]))))
+  (query base-query))
 
 (defn get-by-id [id]
-  (parse (first (j/query (get-conn) ["SELECT * FROM companies WHERE id = ?" id]))))
+  (first (query (-> base-query
+                    (helpers/merge-where [:= :id id])))))
+(defn upsert [id data]
+  (prn (clj->db (select-keys data entity/all-keys)))
+  (-> (sql/build
+       :update :companies
+       :set (clj->db (select-keys data entity/all-keys ))
+       :where [:= :id (if (int? id)
+                        id
+                        (Integer/parseInt id))])
+      execute!) 
+  (get-by-id (if (int? id)
+               id
+               (Integer/parseInt id))))
+
+
+