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

merged

Browse Source
This commit is contained in:
Bryce
2024-11-08 13:58:52 -08:00
parent 052e7c2d36 eda61593d8
commit eed9bfbd11
3 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
iol_ion/src/iol_ion/query.clj
View File

@@ -201,15 +201,40 @@
(defn account-snapshot [db client-id ^java.util.Date end] (defn account-snapshot [db client-id ^java.util.Date end]
(for [running-balance-set (account-sets db client-id) (for [running-balance-set (account-sets db client-id)
:let [{id :e [client-id account-id location date _ _ current-balance] :v} :let [z
(->> running-balance-set (->> running-balance-set
(take-while (fn until-date [^Line l] (take-while (fn until-date [^Line l]
(let [^java.util.Date d (.-date l)] (let [^java.util.Date d (.-date l)]
(<= (.compareTo ^java.util.Date d end) 0)))) (<= (.compareTo ^java.util.Date d end) 0))))
last)] last) ]
:when id] :when (and z (.-id z))]
[client-id account-id location date current-balance])) [(.-client-id z) (.-account-id z) (.-location z) (.-date z) (.-running-balance z)]))
#_(doseq [[ n] (dc/q '[:find ?cd :where [?c :client/code ?cd] [?c :client/groups "NTG"]] (dc/db auto-ap.datomic/conn))]
(println n)
(dc/q '[:find ?code ?name ?afc ?an ?l ?d2 ?balance
:in $ ?end ?group
:where
[(clj-time.coerce/to-date-time ?end) ?end2]
[(iol-ion.query/localize ?end2) ?end3]
[(clj-time.coerce/to-date ?end3) ?end4]
(or
[?c :client/groups ?group]
[?c :client/code ?group])
[?c :client/name ?name]
[?c :client/code ?code]
[?c :client/bank-accounts ?b]
[(iol-ion.query/account-snapshot $ ?c ?end4) [?x ...]]
[(untuple ?x) [_ ?a ?l ?date ?balance]]
[(not= nil ?a)]
[(iol-ion.query/excel-date ?date) ?d2]
(or-join [?a ?afc ?an]
(and [?a :account/name ?an]
[?a :account/numeric-code ?afc])
(and [?a :bank-account/name ?an]
[?a :bank-account/numeric-code ?afc]))]
(dc/db auto-ap.datomic/conn)
#inst "2024-10-10" n))
(defn detailed-account-snapshot [db client-id ^java.util.Date end] (defn detailed-account-snapshot [db client-id ^java.util.Date end]
(for [running-balance-set (account-sets db client-id) (for [running-balance-set (account-sets db client-id)

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

@@ -64,12 +64,13 @@
(defmulti parse-file (fn [_ filename] (.toLowerCase (last (str/split filename #"\." ))))) (defmulti parse-file (fn [_ filename] (.toLowerCase (last (str/split filename #"\." )))))
(defn invoke-glimpse2 [f] (defn invoke-glimpse2 [f]
(-> (lambda/invoke {:function-name "glimpse2" :payload (let [result (slurp (:payload (lambda/invoke {:function-name "glimpse2" :payload
(json/write-str (json/write-str
(alog/peek ::x {"url" (str "https://" "data.prod.app.integreatconsult.com" "/" f ) }))}) (alog/peek ::x {"url" (str "https://" "data.prod.app.integreatconsult.com" "/" f ) }))})))]
:payload
slurp (alog/info ::glimpse2-payload :payload result)
json/read-str)) (-> result
json/read-str)))
(defn glimpse2 [file] (defn glimpse2 [file]
(try (try

8
src/clj/auto_ap/parse/templates.clj
View File

@@ -170,10 +170,10 @@
;; GOLDEN BRANDS ;; GOLDEN BRANDS
{:vendor "Bigoli Fresh Pasta" {:vendor "Bigoli Fresh Pasta"
:keywords [#"bigolifreshpasta.com"] :keywords [#"bigolifreshpasta.com"]
:extract {:date #"INVOICE #.*?\n.*?([0-9]+/[0-9]+/[0-9]+)" ;; HOW TO GO TO SPCIFIC LINE :extract {:date #"Invoice Date.*?([0-9]+/[0-9]+/[0-9]+)" ;; HOW TO GO TO SPCIFIC LINE
:customer-identifier #"BILL TO.*\n\s+(.*?)\s{2,}" :customer-identifier #"BILL TO.*\n\s*(.*?)\s{2,}"
:invoice-number #"INVOICE #.*?\n(\d+)" :invoice-number #"Invoice #.*?(\d+)"
:total #" TOTAL\s+([0-9,]+\.[0-9]{2})"} :total #" BALANCE DUE\s+(?:\$)?([0-9,]+\.[0-9]{2})"}
:parser {:date [:clj-time "MM/dd/yyyy"] :parser {:date [:clj-time "MM/dd/yyyy"]
:total [:trim-commas nil]}} :total [:trim-commas nil]}}