not using namespaced keys, due to graphql
This commit is contained in:
@@ -5,8 +5,7 @@
|
||||
[auto-ap.db.vendors :as vendors]
|
||||
[auto-ap.entities.companies :as company]
|
||||
[auto-ap.entities.vendors :as vendor]
|
||||
[clojure.java.jdbc :as j]
|
||||
[aggregate.core :as agg]))
|
||||
[clojure.java.jdbc :as j]))
|
||||
|
||||
(defn insert-multi! [rows]
|
||||
(j/insert-multi! (get-conn)
|
||||
@@ -15,13 +14,14 @@
|
||||
|
||||
(defn with-relations [results]
|
||||
(let [companies (reduce
|
||||
#(assoc %1 (::company/id %2) %2)
|
||||
#(assoc %1 (:id %2) %2)
|
||||
{}
|
||||
(companies/get-all))
|
||||
vendors (reduce
|
||||
#(assoc %1 (::vendor/id %2) %2)
|
||||
#(assoc %1 (:id %2) %2)
|
||||
{}
|
||||
(vendors/get-all))]
|
||||
(println companies vendors)
|
||||
(->> results
|
||||
(map #(assoc % :vendor (vendors (:vendor-id %))))
|
||||
(map #(assoc % :company (companies (:company-id %)))))))
|
||||
@@ -56,8 +56,8 @@
|
||||
(for [{:keys [total date invoice-number customer-identifier vendor-code] :as row} parsed-invoices]
|
||||
(do
|
||||
(dissoc (assoc row
|
||||
:company-id (::company/id (parse/best-match companies customer-identifier))
|
||||
:vendor-id (::vendor/id (first (filter #(= (::vendor/code %) vendor-code) vendors)))
|
||||
: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)))))
|
||||
|
||||
Reference in New Issue
Block a user