fixes null reference exception.

This commit is contained in:
2023-01-21 22:49:15 -08:00
parent d26f1514d0
commit 6636117cf9

View File

@@ -18,13 +18,16 @@
(defn get-1099-companies [user session] (defn get-1099-companies [user session]
(let [clients (->> (d/q '[:find ?c (let [clients (->> (d/q '[:find ?c
:in $ ?user ?c :in $ ?user
:where [?c :client/code] :where [?c :client/code]
[(auto-ap.graphql.utils/can-see-client? ?user ?c)]] [(auto-ap.graphql.utils/can-see-client? ?user ?c)]]
(d/db conn) user (some-> session :client :db/id)) (d/db conn) user)
(map first) (map first)
set)] set)]
(->> (if (is-admin? user) (cond
(and (some-> session :client :db/id)
(can-see-client? user
(some-> session :client :db/id)))
(d/q '[:find (d/q '[:find
(pull ?c [:client/code :db/id]) (pull ?c [:client/code :db/id])
(pull ?v [:db/id (pull ?v [:db/id
@@ -44,6 +47,37 @@
:with ?d :with ?d
:in $ ?c :in $ ?c
:where :where
[?p :payment/client ?c]
[?p :payment/date ?d ]
[(>= ?d #inst "2022-01-01T08:00")]
[(< ?d #inst "2023-01-01T08:00")]
[?p :payment/type :payment-type/check]
[?p :payment/amount ?a]
[?p :payment/vendor ?v]]
(d/db conn)
(some-> session :client :db/id))
(is-admin? user)
(d/q '[:find
(pull ?c [:client/code :db/id])
(pull ?v [:db/id
:vendor/name
{:vendor/legal-entity-1099-type [:db/ident]}
{:vendor/legal-entity-tin-type [:db/ident]}
{:vendor/address [:address/street1
:address/city
:address/state
:address/zip]}
:vendor/legal-entity-tin
:vendor/legal-entity-name
:vendor/legal-entity-first-name
:vendor/legal-entity-middle-name
:vendor/legal-entity-last-name])
(sum ?a)
:with ?d
:in $
:where
[?p :payment/date ?d ] [?p :payment/date ?d ]
[(>= ?d #inst "2022-01-01T08:00")] [(>= ?d #inst "2022-01-01T08:00")]
[(< ?d #inst "2023-01-01T08:00")] [(< ?d #inst "2023-01-01T08:00")]
@@ -51,8 +85,8 @@
[?p :payment/client ?c] [?p :payment/client ?c]
[?p :payment/amount ?a] [?p :payment/amount ?a]
[?p :payment/vendor ?v]] [?p :payment/vendor ?v]]
(d/db conn) (d/db conn))
(some-> session :client :db/id))
(d/q '[:find (d/q '[:find
(pull ?c [:client/code :db/id]) (pull ?c [:client/code :db/id])
(pull ?v [:db/id (pull ?v [:db/id
@@ -81,7 +115,7 @@
[?p :payment/amount ?a] [?p :payment/amount ?a]
[?p :payment/vendor ?v]] [?p :payment/vendor ?v]]
(d/db conn) (d/db conn)
clients)) clients)
(filter (fn [[_ _ a]] (filter (fn [[_ _ a]]
(>= (or a 0.0) 600.0))) (>= (or a 0.0) 600.0)))
(take 200) (take 200)