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

Most parts of staging ought to work

Browse Source
This commit is contained in:
Bryce Covert
2020-12-26 14:10:51 -08:00
parent a46b58fe00
commit 3b39a6fa0a
7 changed files with 340 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

282
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

115
project.clj
View File

@@ -5,79 +5,97 @@
:repositories {"my.datomic.com" {:url "https://my.datomic.com/repo" :repositories {"my.datomic.com" {:url "https://my.datomic.com/repo"
:username "datomic@brycecovertoperations.com" :username "datomic@brycecovertoperations.com"
:password "9a382afc-d119-44db-83c2-98d8057d7666"}} :password "9a382afc-d119-44db-83c2-98d8057d7666"}}
:dependencies [[org.clojure/clojure "1.9.0"] :dependencies [[org.clojure/clojure "1.10.1"]
[com.datomic/datomic-pro "0.9.5703" [com.datomic/datomic-pro "0.9.5783"
:exclusions [com.google.guava/guava :exclusions [com.google.guava/guava
org.apache.httpcomponents/httpclient org.apache.httpcomponents/httpclient
org.slf4j/jul-to-slf4j org.slf4j/jul-to-slf4j
org.slf4j/log4j-over-slf4j]] org.slf4j/log4j-over-slf4j]]
[compojure "1.6.1" :exclusions [ring]] [compojure "1.6.2" :exclusions [ring
[bidi "2.1.2"] ring/ring-core]]
[ring/ring-defaults "0.2.1"] [bidi "2.1.6"]
[ring/ring-defaults "0.3.2" :exclusions [ring ring/ring-core]]
[mount "0.1.16"] [mount "0.1.16"]
[tolitius/yang "0.1.10"] [tolitius/yang "0.1.23"]
[ring "1.6.3" :exclusions [commons-codec [ring "1.8.2" :exclusions [commons-codec
commons-io commons-io
clj-time clj-time
ring/ring-core ring/ring-core
ring/ring-codec ring/ring-codec
org.eclipse.jetty/jetty-http #_org.eclipse.jetty/jetty-http
org.eclipse.jetty/jetty-util #_org.eclipse.jetty/jetty-util
org.eclipse.jetty/jetty-server]] #_org.eclipse.jetty/jetty-server]]
[yogthos/config "0.8"]
[dk.ative/docjure "1.12.0"] [ring/ring-jetty-adapter "1.8.2" :exclusions
[org.eclipse.jetty/jetty-server]]
[yogthos/config "1.1.7"]
[dk.ative/docjure "1.14.0"]
[clj-fuzzy "0.4.1"] [clj-fuzzy "0.4.1"]
[com.walmartlabs/lacinia "0.25.0"] [com.walmartlabs/lacinia "0.37.0"]
[vincit/venia "0.2.5"] [vincit/venia "0.2.5"]
[digest "1.4.8"] [digest "1.4.10"]
[clj-http "3.7.0" :exclusions [org.apache.httpcomponents/httpclient org.apache.httpcomponents/httpcore]] [clj-http "3.11.0" :exclusions [org.apache.httpcomponents/httpclient org.apache.httpcomponents/httpcore]]
[clj-pdf "2.2.33"] [clj-pdf "2.5.5"]
[org.clojure/core.async "0.3.465"] [org.clojure/core.async "1.3.610"]
[fogus/ring-edn "0.3.0"] [fogus/ring-edn "0.3.0"]
[buddy/buddy-auth "2.1.0" [buddy/buddy-auth "2.2.0"
:exclusions [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor :exclusions [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor
com.fasterxml.jackson.core/jackson-core]] com.fasterxml.jackson.core/jackson-core]]
[nrepl "0.6.0" :exclusions [org.clojure/tools.logging]] [nrepl "0.8.3" :exclusions [org.clojure/tools.logging]]
[org.clojure/tools.logging "1.1.0"] [org.clojure/tools.logging "1.1.0"]
[ch.qos.logback/logback-classic "1.2.3"] [ch.qos.logback/logback-classic "1.2.3" ]
[ch.qos.logback/logback-core "1.2.3" ]
[ch.qos.logback.contrib/logback-jackson "0.1.5"] [ch.qos.logback.contrib/logback-jackson "0.1.5"]
[ch.qos.logback.contrib/logback-json-classic "0.1.5"] [ch.qos.logback.contrib/logback-json-classic "0.1.5"]
[spootnik/unilog "0.7.24" [spootnik/unilog "0.7.27"
:exclusions [com.fasterxml.jackson.core/jackson-core :exclusions [com.fasterxml.jackson.core/jackson-core
com.fasterxml.jackson.core/jackson-databind]] com.fasterxml.jackson.core/jackson-databind]]
[clj-time "0.14.3"] [clj-time "0.15.2"]
[ring/ring-json "0.4.0" :exclusions [cheshire]] [ring/ring-json "0.5.0" :exclusions [cheshire]]
[com.cemerick/url "0.1.1"] [com.cemerick/url "0.1.1"]
[bk/ring-gzip "0.3.0"] [bk/ring-gzip "0.3.0"]
[amazonica "0.3.121" [amazonica "0.3.153"
:exclusions [com.amazonaws/aws-java-sdk :exclusions [com.amazonaws/aws-java-sdk
com.amazonaws/amazon-kinesis-client]] com.amazonaws/amazon-kinesis-client]]
[com.amazonaws/aws-java-sdk-core "1.11.600" [com.amazonaws/aws-java-sdk-core "1.11.926"
:exclusions [commons-codec :exclusions [commons-codec
commons-logging]] commons-logging]]
[com.amazonaws/aws-java-sdk-ses "1.11.600" [com.amazonaws/aws-java-sdk-ses "1.11.926"
:exclusions [commons-codec :exclusions [commons-codec
org.apache.httpcomponents/httpclient]] org.apache.httpcomponents/httpclient]]
[com.amazonaws/aws-java-sdk-s3 "1.11.600" [com.amazonaws/aws-java-sdk-s3 "1.11.926"
:exclusions [commons-codec :exclusions [commons-codec
org.apache.httpcomponents/httpclient]] org.apache.httpcomponents/httpclient]]
[com.amazonaws/aws-java-sdk-dynamodb "1.11.600" [com.amazonaws/aws-java-sdk-dynamodb "1.11.926"
:exclusions [commons-codec :exclusions [commons-codec
org.apache.httpcomponents/httpclient]] org.apache.httpcomponents/httpclient]]
[org.eclipse.jetty/jetty-http "9.4.17.v20190418"] #_[org.eclipse.jetty/jetty-http "11.0.0"]
[org.eclipse.jetty/jetty-util "9.4.17.v20190418"] #_[org.eclipse.jetty/jetty-util "11.0.0"]
[org.eclipse.jetty/jetty-server "9.4.17.v20190418"] #_[org.eclipse.jetty/jetty-server "11.0.0"]
[org.eclipse.jetty.websocket/websocket-server "9.4.17.v20190418"] [org.eclipse.jetty.websocket/websocket-servlet "9.4.35.v20201120"]
[org.eclipse.jetty.websocket/websocket-servlet "9.4.17.v20190418"] [org.eclipse.jetty.websocket/websocket-server "9.4.35.v20201120"]
[org.clojure/data.json "0.2.6"] #_[org.eclipse.jetty.websocket/websocket-servlet "11.0.0"]
[org.clojure/data.csv "0.1.4"] [org.clojure/data.json "1.0.0"]
[io.rkn/conformity "0.5.1"] [org.clojure/data.csv "1.0.0"]
[io.rkn/conformity "0.5.4"]
[hiccup "1.0.5"]] [hiccup "1.0.5"]
;; needed for java 11
[javax.xml.bind/jaxb-api "2.4.0-b180830.0359"]]
:managed-dependencies [;; explicit dependencies to get to latest versions for above
[com.fasterxml.jackson.core/jackson-core "2.12.0"]
[com.fasterxml.jackson.core/jackson-databind "2.12.0"]
[com.fasterxml.jackson.core/jackson-annotations "2.12.0"]
[com.fasterxml.jackson.dataformat/jackson-dataformat-cbor "2.12.0"]
[commons-codec "1.12"]]
:plugins [[lein-ring "0.9.7"] :plugins [[lein-ring "0.9.7"]
[lein-cljsbuild "1.1.5"]] [lein-cljsbuild "1.1.5"]
[lein-ancient "0.6.15"]]
:clean-targets ^{:protect false} ["resources/public/js/compiled" "target"] :clean-targets ^{:protect false} ["resources/public/js/compiled" "target"]
:ring {:handler auto-ap.handler/app} :ring {:handler auto-ap.handler/app}
:source-paths ["src/clj" "src/cljc" "src/cljs"] :source-paths ["src/clj" "src/cljc" "src/cljs"]
@@ -86,12 +104,13 @@
"fig:dev" ["run" "-m" "figwheel.main" "-b" "dev" "-r"] "fig:dev" ["run" "-m" "figwheel.main" "-b" "dev" "-r"]
"fig:min" ["run" "-m" "figwheel.main" "-O" "advanced" "-bo" "min"]} "fig:min" ["run" "-m" "figwheel.main" "-O" "advanced" "-bo" "min"]}
:profiles :profiles
{:dev {:dev
{:resource-paths ["resources" "target"] {:resource-paths ["resources" "target"]
:dependencies [[binaryage/devtools "0.9.4"] :dependencies [[binaryage/devtools "1.0.2"]
[postgresql/postgresql "9.3-1102.jdbc41"] [postgresql/postgresql "9.3-1102.jdbc41"]
[org.clojure/java.jdbc "0.7.3"] [org.clojure/java.jdbc "0.7.11"]
[com.bhauman/figwheel-main "0.2.12" :exclusions [org.clojure/clojurescript [com.bhauman/figwheel-main "0.2.12" :exclusions [org.clojure/clojurescript
ring ring
ring/ring-core ring/ring-core
@@ -99,7 +118,6 @@
ring/ring-defaults ring/ring-defaults
ring/ring-devel ring/ring-devel
org.clojure/tools.cli org.clojure/tools.cli
ring.adapter.jetty
binaryage/devtools binaryage/devtools
commons-io commons-io
commons-codec commons-codec
@@ -110,9 +128,10 @@
args4j]] args4j]]
[com.bhauman/rebel-readline-cljs "0.1.4" :exclusions [org.clojure/clojurescript]] [com.bhauman/rebel-readline-cljs "0.1.4" :exclusions [org.clojure/clojurescript]]
[javax.servlet/servlet-api "2.5"]] [javax.servlet/servlet-api "2.5"]]
:plugins [ :plugins [[lein-pdo "0.1.1"]]
[lein-pdo "0.1.1"]] :jvm-opts ["-Dconfig=config/dev.edn" "-Dlogback.configurationFile=logback.xml"]}
:jvm-opts ["-Dconfig=config/dev.edn" "--add-modules" "java.xml.bind"]}
:uberjar {:prep-tasks ["fig:min" ] :uberjar {:prep-tasks ["fig:min" ]
:dependencies [[com.bhauman/figwheel-main "0.2.12" :exclusions [org.clojure/clojurescript :dependencies [[com.bhauman/figwheel-main "0.2.12" :exclusions [org.clojure/clojurescript
ring ring
@@ -130,17 +149,17 @@
org.eclipse.jetty.websocket/websocket-server org.eclipse.jetty.websocket/websocket-server
org.eclipse.jetty.websocket/websocket-servlet org.eclipse.jetty.websocket/websocket-servlet
args4j]]]} args4j]]]}
:provided {:dependencies [[org.clojure/clojurescript "1.10.764" :provided {:dependencies [[org.clojure/clojurescript "1.10.773"
:exclusions [com.google.code.findbugs/jsr305 :exclusions [com.google.code.findbugs/jsr305
com.fasterxml.jackson.core/jackson-core]] com.fasterxml.jackson.core/jackson-core]]
[reagent "1.0.0-alpha2" :exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server] ] [reagent "1.0.0" :exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server] ]
[re-frame "0.10.2" [re-frame "1.1.2"
:exclusions :exclusions
[reagent [reagent
org.clojure/clojurescript]] org.clojure/clojurescript]]
[re-frame-utils "0.1.0"] [re-frame-utils "0.1.0"]
[com.andrewmcveigh/cljs-time "0.5.2"] [com.andrewmcveigh/cljs-time "0.5.2"]
[cljs-http "0.1.44"] [cljs-http "0.1.46"]
[kibu/pushy "0.3.8"]]}} [kibu/pushy "0.3.8"]]}}
:main auto-ap.server :main auto-ap.server

84
src/clj/auto_ap/graphql.clj
View File

@@ -34,27 +34,44 @@
(def integreat-schema (def integreat-schema
{ {
:scalars {:id {:parse (schema/as-conformer #(when % (Long/parseLong %))) :scalars {:id {:parse #(when % (Long/parseLong %))
:serialize (schema/as-conformer #(.toString %))} :serialize #(.toString %)}
:ident {:parse (schema/as-conformer (fn [x] {:db/ident x})) :ident {:parse (fn [x] {:db/ident x})
:serialize (schema/as-conformer #(or (:ident %) (:db/ident %) %))} :serialize #(or (:ident %) (:db/ident %) %)}
:iso_date {:parse (schema/as-conformer #(time/parse % time/iso-date)) :iso_date {:parse #(time/parse % time/iso-date)
:serialize (schema/as-conformer #(time/unparse % time/iso-date))} :serialize #(time/unparse % time/iso-date)}
:money {:parse (schema/as-conformer #(if (and (string? %) :money {:parse #(do
(not (str/blank? %))) (log/info "parsing money...")
(Double/parseDouble %) (cond (and (string? %)
%)) (not (str/blank? %)))
:serialize (schema/as-conformer #(if (double? %) (Double/parseDouble %)
(str %)
%)) (int? %)
(double %)
:else
%))
:serialize #(cond (double? %)
(str %)
(int? %)
(str %)
:else
%)
} }
:percentage {:parse (schema/as-conformer #(if (and (string? %) :percentage {:parse #(cond (and (string? %)
(not (str/blank? %))) (not (str/blank? %)))
(Double/parseDouble %) (Double/parseDouble %)
%))
:serialize (schema/as-conformer #(if (double? %) (int? %)
(str %) (str %)
%))}}
:else
%)
:serialize #(if (double? %)
(str %)
%)}}
:objects :objects
{ {
:message :message
@@ -648,7 +665,7 @@
:external_id_like {:type 'String} :external_id_like {:type 'String}
:sort {:type '(list :sort_item)}}} :sort {:type '(list :sort_item)}}}
:invoice_payment_amount {:fields {:invoice_id {:type :id} :invoice_payment_amount {:fields {:invoice_id {:type :id}
:amount {:type 'Float}}} :amount {:type :money}}}
:edit_location_match {:fields {:location {:type 'String} :edit_location_match {:fields {:location {:type 'String}
:match {:type 'String} :match {:type 'String}
:id {:type :id}}} :id {:type :id}}}
@@ -766,20 +783,20 @@
{:fields {:id {:type :id} {:fields {:id {:type :id}
:account_id {:type :id} :account_id {:type :id}
:location {:type 'String} :location {:type 'String}
:amount {:type 'String}}} :amount {:type :money}}}
:add_invoice :add_invoice
{:fields {:id {:type :id} {:fields {:id {:type :id}
:invoice_number {:type 'String} :invoice_number {:type 'String}
:expense_accounts {:type '(list :edit_expense_account)} :expense_accounts {:type '(list :edit_expense_account)}
:location {:type :iso_date} :location {:type 'String}
:scheduled_payment {:type :iso_date} :scheduled_payment {:type :iso_date}
:date {:type :iso_date} :date {:type :iso_date}
:due {:type :iso_date} :due {:type :iso_date}
:client_id {:type :id} :client_id {:type :id}
:vendor_id {:type :id} :vendor_id {:type :id}
:vendor_name {:type 'String} :vendor_name {:type 'String}
:total {:type 'Float}}} :total {:type :money}}}
:edit_invoice :edit_invoice
{:fields {:id {:type :id} {:fields {:id {:type :id}
@@ -788,7 +805,7 @@
:date {:type :iso_date} :date {:type :iso_date}
:scheduled_payment {:type :iso_date} :scheduled_payment {:type :iso_date}
:due {:type :iso_date} :due {:type :iso_date}
:total {:type 'Float}}} :total {:type :money}}}
:edit_transaction :edit_transaction
{:fields {:id {:type :id} {:fields {:id {:type :id}
:vendor_id {:type :id} :vendor_id {:type :id}
@@ -1285,9 +1302,16 @@
result) result)
(catch Exception e (catch Exception e
(if-let [v (:validation-error (ex-data e))]
(warn-event "validation error" {:validation-error v
:data (ex-data e)})
(error-event "query error" {:error e}))
(throw e)))))) (if-let [v (or (:validation-error (ex-data e))
(:validation-error (ex-data (.getCause e)))
)]
(do
(warn-event "validation error" {:validation-error v
:data (ex-data e)})
(throw (Exception. v))
#_{:errors [{:message v}]})
(do
(error-event "query error" {:error e})
(throw e))))))))

4
src/clj/auto_ap/graphql/invoices.clj
View File

@@ -54,7 +54,7 @@
(defn expense-account->entity [{:keys [id account_id amount location]}] (defn expense-account->entity [{:keys [id account_id amount location]}]
(remove-nils #:invoice-expense-account {:amount (Double/parseDouble amount) (remove-nils #:invoice-expense-account {:amount amount
:db/id id :db/id id
:account account_id :account account_id
:location location})) :location location}))
@@ -160,7 +160,7 @@
:invoice/client (:db/id (:invoice/client invoice))})) :invoice/client (:db/id (:invoice/client invoice))}))
(throw (ex-info (str "Invoice '" invoice_number "' already exists.") {:invoice-number invoice_number}))) (throw (ex-info (str "Invoice '" invoice_number "' already exists.") {:invoice-number invoice_number})))
expense-account-total (reduce + 0 (map (fn [x] (Double/parseDouble (:amount x))) expense_accounts)) expense-account-total (reduce + 0 (map (fn [x] (:amount x)) expense_accounts))
_ (when-not (dollars= total expense-account-total) _ (when-not (dollars= total expense-account-total)
(let [error (str "Expense account total (" expense-account-total ") does not equal invoice total (" total ")")] (let [error (str "Expense account total (" expense-account-total ") does not equal invoice total (" total ")")]
(throw (ex-info error {:validation-error error})))) (throw (ex-info error {:validation-error error}))))

4
src/clj/auto_ap/graphql/transactions.clj
View File

@@ -119,7 +119,7 @@
(defn transaction-account->entity [{:keys [id account_id amount location]}] (defn transaction-account->entity [{:keys [id account_id amount location]}]
(remove-nils #:transaction-account {:amount (Double/parseDouble amount) (remove-nils #:transaction-account {:amount amount
:db/id id :db/id id
:account account_id :account account_id
:location location})) :location location}))
@@ -163,7 +163,7 @@
_ (assert-can-see-client (:id context) (:transaction/client existing-transaction) ) _ (assert-can-see-client (:id context) (:transaction/client existing-transaction) )
_ (assert-valid-expense-accounts accounts) _ (assert-valid-expense-accounts accounts)
deleted (deleted-accounts existing-transaction accounts) deleted (deleted-accounts existing-transaction accounts)
account-total (reduce + 0 (map (fn [x] (Double/parseDouble (:amount x))) accounts)) account-total (reduce + 0 (map (fn [x] (:amount x)) accounts))
missing-locations (seq (set/difference missing-locations (seq (set/difference
(->> accounts (->> accounts
(map :location) (map :location)

2
src/clj/auto_ap/routes/graphql.clj
View File

@@ -34,7 +34,7 @@
:headers {"Content-Type" "application/edn"}}) :headers {"Content-Type" "application/edn"}})
(do (log/error "GraphQL error" e) (do (log/error "GraphQL error" e)
{:status 500 {:status 500
:body (pr-str {:errors [(merge {:message (str "Unhandled error:" (str e))} (ex-data e))]}) :body (pr-str {:errors [(merge {:message (str "Unhandled error:" (str e))} #_(ex-data e))]})
:headers {"Content-Type" "application/edn"}})))))) :headers {"Content-Type" "application/edn"}}))))))

7
src/cljs/auto_ap/views/pages/admin/clients/form.cljs
View File

@@ -101,7 +101,7 @@
:signature-data (:signature-data new-client-data) :signature-data (:signature-data new-client-data)
:forecasted-transactions (map (fn [{:keys [id day-of-month identifier amount]}] :forecasted-transactions (map (fn [{:keys [id day-of-month identifier amount]}]
{:id id {:id id
:day-of-month day-of-month :day-of-month (js/parseInt day-of-month)
:identifier identifier :identifier identifier
:amount amount}) :amount amount})
(:forecasted-transactions new-client-data)) (:forecasted-transactions new-client-data))
@@ -159,11 +159,10 @@
(let [new-client-req @(re-frame/subscribe [::new-client-request]) (let [new-client-req @(re-frame/subscribe [::new-client-request])
user @(re-frame/subscribe [::subs/token])] user @(re-frame/subscribe [::subs/token])]
{:db (-> new-client-form {:db (-> new-client-form)
(assoc :status :loading)
(assoc :error nil))
:graphql :graphql
{:token user {:token user
:owns-state {:single ::form}
:query-obj {:venia/operation {:operation/type :mutation :query-obj {:venia/operation {:operation/type :mutation
:operation/name "EditClient"} :operation/name "EditClient"}
:venia/queries [{:query/data [:edit-client :venia/queries [{:query/data [:edit-client