Merge branch 'master' into try-tailwind

iol_ion/src/iol_ion/tx.clj

@@ -4,6 +4,9 @@
   (:import [java.util UUID]))
 
 (def random-tempid iol-ion.utils/random-tempid)
+(defn composite-tempid [& pieces]
+  (format "hashed-%d" (.hashCode (set pieces))))
+
 (def by iol-ion.utils/by)
 (def pull-many iol-ion.utils/pull-many)
 (def remove-nils iol-ion.utils/remove-nils)

src/clj/auto_ap/jobs/ntg.clj

@@ -168,7 +168,7 @@
                               :content
                               first
                               Double/parseDouble)
-            invoice      {:db/id (random-tempid)
+            invoice      {:db/id (random-tempid )
                           :invoice/vendor              :vendor/cintas
                           :invoice/import-status       :import-status/imported
                           :invoice/status              :invoice-status/unpaid
@@ -268,7 +268,8 @@
                                                                   (mark-error k)
                                                                   []))))
                                                     (into []))]
-                               (audit-transact transaction {:user/name "sysco importer" :user/role "admin"})
+                               (doseq [t transaction]
+                                 (audit-transact [t] {:user/name "sysco importer" :user/role "admin"}))
                                (log/info ::success
                                          :count (count transaction)
                                          :sample (take 3 transaction)))

src/clj/auto_ap/jobs/sysco.clj

@@ -87,7 +87,7 @@
                                                                                 [{:client/location-matches [:location-match/location :location-match/matches]}
                                                                                  :client/default-location
                                                                                  :client/locations]
-                                                                                matching-client)
+                                                                                (:db/id matching-client))
                                                                        location-hint
                                                                        location-hint )
                        :date                (coerce/to-date date)

src/clj/auto_ap/parse.clj

@@ -124,7 +124,7 @@
 (defn exact-match
   ([clients invoice-client-name]
    (->> clients
-        (filter (fn [{:keys [:client/matches :client/name] :as client :or {matches []}}]
+        (filter (fn [{:keys [:client/matches :client/location-matches :client/locations :client/name] :as client :or {matches []}}]
                   (seq 
                     (filter (fn [m]
                               (and 

src/clj/auto_ap/routes/invoices.clj

@@ -136,8 +136,8 @@
 
 (defn import->invoice [{:keys [invoice-number source-url customer-identifier account-number total date vendor-code text full-text client-override vendor-override location-override import-status]}]
   (let [matching-client   (cond
-                            account-number      (d-clients/exact-match account-number)
-                            customer-identifier (d-clients/best-match customer-identifier)
+                            account-number      (:db/id (d-clients/exact-match account-number))
+                            customer-identifier (:db/id (d-clients/best-match customer-identifier))
                             client-override     (Long/parseLong client-override))
         
         matching-vendor   (match-vendor vendor-code vendor-override)

start-solr.sh

@@ -0,0 +1,3 @@
+#/bin/bash
+sudo docker run --rm -ti -v ~/dev/integreat/data/solr:/var/solr --network=bridge -p 8983:8983 solr
+