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

Multiple clients=no show for non-admins

Browse Source
This commit is contained in:
Bryce Covert
2022-01-20 07:17:14 -08:00
parent 0f0d63179a
commit a50df489d8
3 changed files with 209 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/clj/auto_ap/datomic/migrate.clj
View File

@@ -483,6 +483,10 @@
:auto-ap/add-invoice-similarity {:txes [[{:db/ident :invoice/similarity
:db/doc "How close an invoice matches its import"
:db/valueType :db.type/double
:db/cardinality :db.cardinality/one}]]}
:auto-ap/add-source-url-admin-only {:txes [[{:db/ident :invoice/source-url-admin-only
:db/doc "Can only admins see this invoice?"
:db/valueType :db.type/boolean
:db/cardinality :db.cardinality/one}]]}}

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

@@ -6,12 +6,12 @@
[auto-ap.datomic.vendors :as d-vendors]
[auto-ap.graphql.checks :as gq-checks]
[auto-ap.graphql.utils
:refer [->graphql
<-graphql
:refer [<-graphql
assert-admin
assert-can-see-client
assert-power-user
enum->keyword]]
enum->keyword]
:as u]
[auto-ap.utils :refer [dollars=]]
[clj-time.coerce :as coerce]
[clj-time.core :as time]
@@ -20,6 +20,13 @@
[com.walmartlabs.lacinia.util :refer [attach-resolvers]]
[datomic.api :as d]))
(defn ->graphql [invoice user ]
(if (= "admin" (:user/role user))
(u/->graphql invoice)
(u/->graphql (if (:invoice/source-url-admin-only invoice)
(dissoc invoice :invoice/source-url)
invoice))))
(defn get-invoice-page [context args _]
(let [args (assoc args :id (:id context))
@@ -28,7 +35,7 @@
(<-graphql)
(update :status enum->keyword "invoice-status")
(d-invoices/get-graphql))]
[{:invoices (map ->graphql invoices)
[{:invoices (mapv #(->graphql % (:id context)) invoices)
:outstanding outstanding
:total invoice-count
:count (count invoices)
@@ -38,7 +45,7 @@
(defn get-all-invoices [context args _]
(assert-admin (:id context))
(map
->graphql
u/->graphql
(first (d-invoices/get-graphql (assoc (<-graphql args)
:count Integer/MAX_VALUE)))))
@@ -147,7 +154,7 @@
(let [transaction-result (audit-transact [(add-invoice-transaction in)] (:id context))]
(-> (d-invoices/get-by-id (get-in transaction-result [:tempids "invoice"]))
(->graphql))))
(->graphql (:id context)))))
(defn assert-bank-account-belongs [client-id bank-account-id]
(when-not ((set (map :db/id (:client/bank-accounts (d-clients/get-by-id client-id)))) bank-account-id)
@@ -166,7 +173,7 @@
bank-account-id
type
(:id context))
->graphql)))
u/->graphql)))
(defn edit-invoice [context {{:keys [id due invoice_number total date expense_accounts scheduled_payment] :as in} :invoice} _]
(let [invoice (d-invoices/get-by-id id)
@@ -196,7 +203,7 @@
(map (fn [d] [:db/retract id :invoice/expense-accounts d]) deleted))
(:id context))
(-> (d-invoices/get-by-id id)
(->graphql))))
(->graphql (:id context)))))
(defn void-invoice [context {id :invoice_id} _]
(let [invoice (d-invoices/get-by-id id)
@@ -210,7 +217,7 @@
(:invoice/expense-accounts invoice))}]
(:id context))
(-> (d-invoices/get-by-id id) (->graphql))))
(-> (d-invoices/get-by-id id) (->graphql (:id context)))))
(defn unvoid-invoice [context {id :invoice_id} _]
(let [invoice (d-invoices/get-by-id id)
@@ -239,7 +246,7 @@
(:id context))
(-> (d-invoices/get-by-id id)
(->graphql))))
(->graphql (:id context)))))
(defn unautopay-invoice [context {id :invoice_id} _]
(let [invoice (d/entity (d/db conn) id)
@@ -251,7 +258,7 @@
(:id context))
(-> (d-invoices/get-by-id id)
(->graphql))))
(->graphql (:id context)))))
(defn edit-expense-accounts [context args _]
(assert-can-see-client (:id context) (:db/id (:invoice/client (d-invoices/get-by-id (:invoice_id args)))))
@@ -268,7 +275,8 @@
(map (fn [d] [:db/retract invoice-id :invoice/expense-accounts d]) deleted))
(:id context))
(->graphql
(d-invoices/get-by-id (:invoice_id args)))))
(d-invoices/get-by-id (:invoice_id args))
(:id context))))
(def objects
{:invoice

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

@@ -43,8 +43,7 @@
(when (not ((set (:client/locations (or (clients client-code)
(clients client))))
default-location))
(throw (Exception. (str "Location '" default-location "' not found for client '" client-code "'.")))
)
(throw (Exception. (str "Location '" default-location "' not found for client '" client-code "'."))))
id)
(throw (Exception. (str "Client code '" client-code "' and client named '" client "' not found.")))))
@@ -92,12 +91,8 @@
(map (c/parse-or-error :total c/parse-amount))
(map (c/parse-or-error :date c/parse-date)))]
rows))
(defn match-vendor [vendor-code forced-vendor]
(when (and (not forced-vendor) (str/blank? vendor-code))
(throw (ex-info (str "No vendor found. Please supply an forced vendor.")
@@ -124,7 +119,6 @@
(throw (ex-info (str "No vendor with the name " vendor-code " was found.")
{:vendor-code vendor-code})))))
(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]} clients]
(let [[matching-client similarity] (cond
account-number (parse/best-match clients account-number 0.0)
@@ -150,11 +144,6 @@
:invoice/outstanding-balance (Double/parseDouble total)
:invoice/status :invoice-status/unpaid})))
(defn validate-invoice [invoice user]
(when-not (:invoice/client invoice)
(throw (ex-info (str "Searched clients for '" (:invoice/client-identifier invoice) "'. No client found in file. Select a client first.")
@@ -194,7 +183,7 @@
(defn invoice-rows->transaction [rows user]
(->> rows
(mapcat (fn [{:keys [vendor-id total client-id amount date invoice-number default-location account-id check vendor automatically-paid-when-due schedule-payment-dom]}]
(mapcat (fn [{:keys [vendor-id total client-id date invoice-number default-location check automatically-paid-when-due]}]
(let [invoice #:invoice {:db/id (.toString (java.util.UUID/randomUUID))
:vendor vendor-id
:client client-id
@@ -211,7 +200,7 @@
:invoice-status/unpaid)
:invoice-number invoice-number
:date (to-date date)}
payment (if (= :invoice-status/paid (:invoice/status invoice))
payment (when (= :invoice-status/paid (:invoice/status invoice))
#:invoice-payment {:invoice (:db/id invoice)
:amount (:invoice/total invoice)
:payment (remove-nils #:payment {:db/id (.toString (java.util.UUID/randomUUID))
@@ -220,13 +209,19 @@
:type :payment-type/cash
:amount (:invoice/total invoice)
:status :payment-status/cleared
:date (:invoice/date invoice)})}
)]
:date (:invoice/date invoice)})})]
[[:propose-invoice (d-invoices/code-invoice (validate-invoice (remove-nils invoice)
user))]
(some-> payment remove-nils)])))
(filter identity)))
(defn admin-only-if-multiple-clients [is]
(let [client-count (->> is
(map :invoice/client)
set
count)]
(map #(assoc % :invoice/source-url-admin-only (boolean (> client-count 1))) is)))
(defn import-uploaded-invoice [user imports]
(lc/with-context {:area "upload-invoice"}
(log/info "Number of invoices to import is" (count imports))
@@ -234,6 +229,7 @@
potential-invoices (->> imports
(mapv #(import->invoice % clients))
(mapv #(validate-invoice % user))
admin-only-if-multiple-clients
(filter #(not (extant-invoice? %)))
(mapv d-invoices/code-invoice)
(mapv (fn [i] [:propose-invoice i])))]
@@ -243,13 +239,11 @@
(log/info "creating invoice" potential-invoices)
@(d/transact (d/connect uri) potential-invoices))))
(defn validate-account-rows [rows code->existing-account]
(when-let [bad-types (seq (->> rows
(filter (fn [[account _ _ type :as row]]
(filter (fn [[account _ _ type]]
(and (not (code->existing-account (Integer/parseInt account)))
(not (#{"Asset" "Liability" "Revenue" "Expense" "Equity" "Dividend"} type)))
))))]
(not (#{"Asset" "Liability" "Revenue" "Expense" "Equity" "Dividend"} type)))))))]
(throw (ex-info (str "You are adding accounts without a valid type")
{:rows bad-types})))
(when-let [duplicate-rows (seq (->> rows
@@ -262,19 +256,17 @@
(filter (fn [duplicates]
(apply not= duplicates)))
#_(map (fn [[[_ account]]]
account))
))]
account))))]
(throw (ex-info (str "You have duplicated rows with different values.")
{:rows duplicate-rows}))))
(defn import-account-overrides [customer filename]
(let [conn (d/connect uri)
[header & rows] (-> filename (io/reader) csv/read-csv)
[_ & rows] (-> filename (io/reader) csv/read-csv)
[client-id] (first (d/query (-> {:query {:find ['?e]
:in ['$ '?z]
:where [['?e :client/code '?z]]}
:args [(d/db (d/connect uri)) customer]})))
headers (map read-string header)
code->existing-account (by :account/numeric-code (map first (d/query {:query {:find ['(pull ?e [:account/numeric-code
{:account/applicability [:db/ident]}
:db/id])]
@@ -286,8 +278,6 @@
:in ['$ '?client-id]
:where [['?e :account-client-override/client '?client-id]]}
:args [(d/db (d/connect uri)) client-id]}))
rows (transduce (comp
(map (fn [[_ account account-name override-name _ type]]
[account account-name override-name type]))
@@ -314,8 +304,7 @@
(:db/ident (:account/applicability existing)))
(and (not-empty override-name)
(not-empty account-name)
(not= override-name account-name)
)))
(not= override-name account-name))))
[{:db/id (:db/id existing)
:account/client-overrides [{:account-client-override/client client-id
:account-client-override/name (or (not-empty override-name)
@@ -346,13 +335,11 @@
@(d/transact conn txes)
txes))
(defn import-transactions-cleared-against [file]
(let [[header & rows] (-> file (io/reader) csv/read-csv)
(let [[_ & rows] (-> file (io/reader) csv/read-csv)
txes (transduce
(comp
(filter (fn [[transaction-id cleared-against]]
(filter (fn [[transaction-id _]]
(d/pull (d/db (d/connect uri)) '[:transaction/amount] (Long/parseLong transaction-id))))
(map (fn [[transaction-id cleared-against]]
{:db/id (Long/parseLong transaction-id)
@@ -362,9 +349,6 @@
rows)]
@(d/transact (d/connect uri) txes)))
(defroutes routes
(wrap-routes
(context "/" []
@@ -394,7 +378,7 @@
location :location
location-2 "location"
vendor :vendor
vendor-2 "vendor"} :params :as params
vendor-2 "vendor"} :params
user :identity}
(let [files (or files files-2)
client (or client client-2)
@@ -451,7 +435,7 @@
(not= "Cash" (:check %))))
(map :vendor-name)
set)
inserted-rows @(d/transact (d/connect uri) (invoice-rows->transaction (:new grouped-rows)
_ @(d/transact (d/connect uri) (invoice-rows->transaction (:new grouped-rows)
user))]
{:status 200
:body (pr-str {:imported (count (:new grouped-rows))
@@ -461,10 +445,10 @@
:headers {"Content-Type" "application/edn"}})))
(POST "/transactions/cleared-against"
{{files :file
files-2 "file"} :params :as params
files-2 "file"} :params
user :identity}
(let [files (or files files-2)
{:keys [filename tempfile]} files]
{:keys [tempfile]} files]
(assert-admin user)
(try
(import-transactions-cleared-against (.getPath tempfile))
@@ -482,11 +466,11 @@
{{files :file
files-2 "file"
client :client
client-2 "client"} :params :as params
client-2 "client"} :params
user :identity}
(let [files (or files files-2)
client (or client client-2)
{:keys [filename tempfile]} files]
{:keys [tempfile]} files]
(assert-admin user)
(try
{:status 200