a lot of progress on typeaheads, etc.

src/clj/auto_ap/db/invoices.clj

@@ -126,15 +126,17 @@
                   (assoc (base-graphql args) :select [:%count.*])))))
 
 (defn import [parsed-invoices companies vendors]
-  (insert-multi!
-   (for [{:keys [total date invoice-number customer-identifier vendor-code] :as row} parsed-invoices]
-     (do
-       (dissoc (assoc row
-                      :company-id (:id (parse/best-match companies customer-identifier))
-                      :vendor-id (:id (first (filter #(= (:code %) vendor-code) vendors)))
-                      :imported false
-                      :potential-duplicate false)
-               :vendor-code)))))
+  (->> (insert-multi!
+        (for [{:keys [total date invoice-number customer-identifier vendor-code] :as row} parsed-invoices]
+          (do
+            (dissoc (assoc row
+                           :company-id (:id (parse/best-match companies customer-identifier))
+                           :vendor-id (:id (first (filter #(= (:code %) vendor-code) vendors)))
+                           :imported false
+                           :potential-duplicate false)
+                    :vendor-code))))
+
+       (map db->clj)))
 
 (defn apply-payment [invoice-id amount]
   (j/db-do-prepared (get-conn)

src/clj/auto_ap/graphql.clj

@@ -13,6 +13,7 @@
     [auto-ap.db.checks :as checks]
     [auto-ap.routes.checks :as rchecks]
     [auto-ap.graphql.users :as gq-users]
+    [auto-ap.graphql.invoices :as gq-invoices]
     [auto-ap.db.reminders :as reminders]
     [auto-ap.db.invoices-checks :as invoices-checks]
     [auto-ap.db.utils :as utils]
@@ -141,7 +142,14 @@
               :name {:type 'String}
               :role {:type 'String}
               :companies {:type '(list Int)}}}
-    }
+
+    :add_invoice
+    {:fields {:id {:type 'Int}
+              :invoice_number {:type 'String}
+              :date {:type 'String}
+              :company_id {:type 'Int}
+              :vendor_id {:type 'Int}
+              :total {:type 'Float}}}}
 
    :mutations
    {:print_checks {:type :check_result
@@ -151,7 +159,11 @@
                    :resolve :mutation/print-checks}
     :edit_user {:type :user
                 :args {:edit_user {:type :edit_user}}
-                :resolve :mutation/edit-user}}})
+                :resolve :mutation/edit-user}
+
+    :add_invoice {:type :invoice
+                  :args {:invoice {:type :add_invoice}}
+                  :resolve :mutation/add-invoice}}})
 
 
 
@@ -281,10 +293,7 @@
                          (:company_id args)
                          (:bank_account_id args))))
 
-(defn edit-user [context args value]
-  (Thread/sleep 1000)
-  (->graphql
-   (gq-users/edit-user (:edit_user args))))
+
 
 (def schema
   (-> integreat-schema
@@ -298,7 +307,8 @@
                          :get-user get-user
                          :get-user-companies get-user-companies
                          :mutation/print-checks print-checks
-                         :mutation/edit-user edit-user
+                         :mutation/edit-user gq-users/edit-user
+                         :mutation/add-invoice gq-invoices/add-invoice
                          :get-vendor get-vendor})
       schema/compile))
 

src/clj/auto_ap/graphql/invoices.clj

@@ -0,0 +1,17 @@
+(ns auto-ap.graphql.invoices
+  (:require [auto-ap.graphql.utils :refer [->graphql]]
+            [auto-ap.db.invoices :as invoices]
+            [auto-ap.time :refer [parse normal-date]]))
+
+(defn add-invoice [context {{:keys [total invoice_number company_id vendor_id date] :as in} :invoice} value]
+
+  (-> (invoices/insert-multi! [{:invoice-number invoice_number
+                                :company-id company_id
+                                :vendor-id vendor_id
+                                :total total
+                                :outstanding-balance total
+                                :status "unpaid"
+                                :imported true
+                                :date (parse date normal-date)}])
+      (first)
+      (->graphql)))

src/clj/auto_ap/graphql/users.clj

@@ -1,8 +1,9 @@
 (ns auto-ap.graphql.users
-  (:require [auto-ap.db.users :as users])) 
-
-(defn edit-user [user]
-  (users/update! user)
-  (users/get-by-id (:id user)))
+  (:require [auto-ap.db.users :as users]
+            [auto-ap.graphql.utils :refer [->graphql]])) 
 
+(defn edit-user [context args value]
+  (users/update! (:edit_user args))
+  (->graphql
+   (users/get-by-id (:edit_user args))))
 

src/clj/auto_ap/graphql/utils.clj

@@ -0,0 +1,40 @@
+(ns auto-ap.graphql.utils
+  (:require [clojure.string :as str]
+            [clojure.walk :as walk]))
+
+
+(defn snake->kebab [s]
+  (str/replace s #"_" "-"))
+
+(defn kebab [x]
+  (keyword (snake->kebab (name x))))
+
+(defn kebab->snake [s]
+  (str/replace s #"-" "_"))
+
+(defn snake [x]
+  (keyword (kebab->snake (name x))))
+
+(defn ->graphql [m]
+  (walk/postwalk
+    (fn [node]
+      (cond
+
+        (keyword? node)
+        (snake node)
+
+        :else
+        node))
+    m))
+
+(defn <-graphql [m]
+  (walk/postwalk
+    (fn [node]
+      (cond
+
+        (keyword? node)
+        (kebab node)
+
+        :else
+        node))
+    m))

src/clj/auto_ap/routes/invoices.clj

@@ -79,11 +79,7 @@
                  {:status 200
                   :body (pr-str (invoices/get-pending (query-params "company")))
                   :headers {"Content-Type" "application/edn"}})
-            (POST "/" {:keys [edn-params]}
-                  (invoices/insert-multi! (:rows edn-params))
-                  {:status 200
-                   :body (pr-str (invoices/get-all))
-                   :headers {"Content-Type" "application/edn"}})
+            
             (POST "/approve" {:keys [query-params]}
                   (invoices/approve)
                   {:status 200

src/clj/auto_ap/time.clj

@@ -1,5 +1,12 @@
 (ns auto-ap.time
-  (:require [clj-time.core :as time]))
+  (:require [clj-time.core :as time]
+            [clj-time.format :as f]))
 
 (defn local-now []
   (time/to-time-zone (time/now) (time/time-zone-for-id "America/Los_Angeles")))
+
+(def normal-date "MM/dd/yyyy")
+
+(defn parse [v format]
+  (time/from-time-zone (f/parse (f/formatter format) v)
+                       (time/time-zone-for-id "America/Los_Angeles")))