notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Supports importing mama lu

Browse Source
This commit is contained in:
Bryce Covert
2019-10-21 23:25:36 -07:00
parent 8df6fb0279
commit 823d4998a7
4 changed files with 127 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/clj/auto_ap/parse.clj
View File

@@ -1,31 +1,16 @@
(ns auto-ap.parse (ns auto-ap.parse
(:require [auto-ap.parse.excel :as excel] (:require [auto-ap.parse.excel :as excel]
[auto-ap.parse.templates :as t] [auto-ap.parse.templates :as t]
[auto-ap.parse.util :as u]
[auto-ap.parse.csv :as csv]
[clj-fuzzy.metrics :as m] [clj-fuzzy.metrics :as m]
[clojure.java.shell :as sh] [clojure.java.shell :as sh]
[clojure.string :as str] [clojure.string :as str]
[clj-time.format :as f] [clj-time.format :as f]
[clj-time.core :as time])) [clj-time.core :as time]
[clojure.set :as set]))
(defmulti parse-value (fn [method _ _]
method))
(defmethod parse-value :trim-commas
[_ _ value]
(str/replace value #"," "")
)
(defmethod parse-value :clj-time
[_ format value]
(time/from-time-zone (f/parse (f/formatter format) value)
(time/time-zone-for-id "America/Los_Angeles")))
(defmethod parse-value nil
[_ _ value]
value)
(def last-text (atom nil)) (def last-text (atom nil))
@@ -46,7 +31,7 @@
(let [value (some-> (first (map second (re-seq v text))) (let [value (some-> (first (map second (re-seq v text)))
str/trim ) str/trim )
[value-parser parser-params] (-> template :parser k)] [value-parser parser-params] (-> template :parser k)]
(assoc result k (parse-value value-parser parser-params value)))) (assoc result k (u/parse-value value-parser parser-params value))))
{:vendor-code (:vendor template) {:vendor-code (:vendor template)
:text text}))]))) :text text}))])))
@@ -67,6 +52,11 @@
:out :out
parse)) parse))
(defmethod parse-file
"csv"
[file filename]
(csv/parse-file file filename))
(defmethod parse-file (defmethod parse-file
"xls" "xls"
[file filename] [file filename]
@@ -79,15 +69,32 @@
(excel/parse-file file filename)) (excel/parse-file file filename))
(defn best-match [clients invoice-client-name] (defn best-match [clients invoice-client-name]
(->> clients (let [fuzzy-match (->> clients
(mapcat (fn [{:keys [:db/id :client/matches :client/name] :as client :or {matches []}}]
(map (fn [m]
[client (m/jaccard (.toLowerCase invoice-client-name) (.toLowerCase m))])
(conj matches name))))
(filter #(< (second %) 0.25))
(sort-by second)
ffirst)
(mapcat (fn [{:keys [:db/id :client/matches :client/name] :as client :or {matches []}}] word-set (set (str/split (.toLowerCase invoice-client-name) #"\s" ))
(map (fn [m] client-word-match (->> clients
[client (m/jaccard (.toLowerCase invoice-client-name) (.toLowerCase m))]) (map
(conj matches name)))) (fn [{:keys [:db/id :client/matches :client/name] :as client :or {matches []}}]
(filter #(< (second %) 0.25)) (let [client-words (-> #{}
(sort-by second) (into
ffirst)) (mapcat
(fn [match] (str/split (.toLowerCase match) #"\s" ))
matches))
(into
(str/split (.toLowerCase name) #"\s" )))]
[client (count (set/intersection client-words word-set))])))
(filter (fn [[_ c]] (> c 0)))
(sort-by (fn [[_ c]] c))
reverse
ffirst)]
(or fuzzy-match client-word-match)))
(defn best-location-match [client text] (defn best-location-match [client text]
(or (->> client (or (->> client

46
src/clj/auto_ap/parse/csv.clj Normal file
View File

@@ -0,0 +1,46 @@
(ns auto-ap.parse.csv
(:require [auto-ap.parse.util :as u]
[clojure.data.csv :as csv]
[clojure.java.io :as io]
[clojure.string :as str]))
(defn determine
[[header :as z]]
(prn header)
(cond (str/includes? (second header) "Customer's PO No.")
:mama-lus
:else
nil))
(defmulti parse-csv
determine
:default (fn default [rows]
nil))
(defmethod parse-csv :mama-lus
[rows]
(println "MAMA LU")
(transduce
(comp (drop 1)
(map (fn [[_ po-number despatch-number invoice-number invoice-date customer value :as row]]
{:vendor-code "Mama Lu's Foods"
:customer-identifier customer
:invoice-number (str invoice-number " " po-number)
:date (u/parse-value :clj-time "MM/dd/yy HH:ss" invoice-date)
:total value
:text (str/join " " row)})))
conj
[]
rows))
(defmethod parse-csv nil
[rows]
nil)
(defn parse-file [file filename]
(println "HEREERE")
(with-open [reader (io/reader file)]
(let [rows (csv/read-csv reader :separator \,)]
(parse-csv rows))))

25
src/clj/auto_ap/parse/util.clj Normal file
View File

@@ -0,0 +1,25 @@
(ns auto-ap.parse.util
(:require [clj-fuzzy.metrics :as m]
[clojure.java.shell :as sh]
[clojure.string :as str]
[clj-time.format :as f]
[clj-time.core :as time]))
(defmulti parse-value (fn [method _ _]
method))
(defmethod parse-value :trim-commas
[_ _ value]
(str/replace value #"," "")
)
(defmethod parse-value :clj-time
[_ format value]
(time/from-time-zone (f/parse (f/formatter format) value)
(time/time-zone-for-id "America/Los_Angeles")))
(defmethod parse-value nil
[_ _ value]
value)

33
src/clj/auto_ap/routes/invoices.clj
View File

@@ -175,21 +175,28 @@
matching-client (parse/best-match clients customer-identifier) matching-client (parse/best-match clients customer-identifier)
_ (println "New invoice matches client" matching-client) _ (println "New invoice matches client" matching-client)
matching-location (parse/best-location-match matching-client text ) matching-location (parse/best-location-match matching-client text )
[existing-id existing-outstanding-balance existing-status import-status] (->> (d/query [existing-id existing-outstanding-balance existing-status import-status] (when (and matching-client matching-location)
(cond-> {:query {:find ['?e '?outstanding-balance '?status '?import-status2] (->> (d/query
:in ['$ '?invoice-number '?vendor '?client] (cond-> {:query {:find ['?e '?outstanding-balance '?status '?import-status2]
:where '[[?e :invoice/invoice-number ?invoice-number] :in ['$ '?invoice-number '?vendor '?client]
[?e :invoice/vendor ?vendor] :where '[[?e :invoice/invoice-number ?invoice-number]
[?e :invoice/client ?client] [?e :invoice/vendor ?vendor]
[?e :invoice/outstanding-balance ?outstanding-balance] [?e :invoice/client ?client]
[?e :invoice/status ?status] [?e :invoice/outstanding-balance ?outstanding-balance]
[?e :invoice/import-status ?import-status] [?e :invoice/status ?status]
[?import-status :db/ident ?import-status2]]} [?e :invoice/import-status ?import-status]
:args [(d/db (d/connect uri)) invoice-number matching-vendor (:db/id matching-client)]})) [?import-status :db/ident ?import-status2]]}
first)] :args [(d/db (d/connect uri)) invoice-number matching-vendor (:db/id matching-client)]}))
first))]
(if (= :import-status/imported import-status) (cond
(not (and matching-location matching-client))
result result
(= :import-status/imported import-status)
result
:else
(conj result (remove-nils #:invoice {:invoice/client (:db/id matching-client) (conj result (remove-nils #:invoice {:invoice/client (:db/id matching-client)
:invoice/vendor matching-vendor :invoice/vendor matching-vendor
:invoice/invoice-number invoice-number :invoice/invoice-number invoice-number