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

fixed warnings.

Browse Source
This commit is contained in:
Bryce Covert
2022-07-26 05:56:41 -07:00
parent f6f73a6110
commit 96c80853ef
133 changed files with 670 additions and 1640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@
(d/db conn )
vendor-id)))
(defn get-account-by-numeric-code-and-sets [numeric-code sets]
(defn get-account-by-numeric-code-and-sets [numeric-code _]
(let [query (cond-> {:query {:find ['(pull ?e [* {:account/type [:db/ident :db/id]}])]
:in ['$ '?numeric-code]
:where ['[?e :account/numeric-code ?numeric-code]]}
@@ -122,7 +122,7 @@
true (apply-pagination args))))
(defn graphql-results [ids db args]
(defn graphql-results [ids db _]
(let [results (->> (d/pull-many db default-read ids)
(group-by :db/id))
accounts (->> ids

7
src/clj/auto_ap/datomic/bank_accounts.clj
View File

@@ -1,8 +1,7 @@
(ns auto-ap.datomic.bank-accounts
(:require [datomic.api :as d]
[auto-ap.datomic :refer [uri]]
[clj-time.coerce :as c]
[clojure.set :refer [rename-keys]]))
(:require
[auto-ap.datomic :refer [uri]]
[datomic.api :as d]))
(defn add-arg [query name value where & rest]
(let [query (-> query

8
src/clj/auto_ap/datomic/clients.clj
View File

@@ -1,8 +1,8 @@
(ns auto-ap.datomic.clients
(:require [auto-ap.datomic :refer [conn uri]]
[clj-time.coerce :as coerce]
[clojure.tools.logging :as log]
[datomic.api :as d]))
(:require
[auto-ap.datomic :refer [conn uri]]
[clj-time.coerce :as coerce]
[datomic.api :as d]))
(defn cleanse [e]
(-> e

12
src/clj/auto_ap/datomic/expected_deposit.clj
View File

@@ -1,10 +1,10 @@
(ns auto-ap.datomic.expected-deposit
(:require [auto-ap.datomic :refer [add-sorter-fields apply-pagination apply-sort-3 merge-query conn]]
[auto-ap.graphql.utils :refer [limited-clients]]
[clj-time.coerce :as c]
[datomic.api :as d]
[clj-time.core :as t]))
(:require
[auto-ap.datomic
:refer [add-sorter-fields apply-pagination apply-sort-3 conn merge-query]]
[auto-ap.graphql.utils :refer [limited-clients]]
[clj-time.coerce :as c]
[datomic.api :as d]))
(defn <-datomic [result]
(let [transaction (first (:transaction/_expected-deposit result))

29
src/clj/auto_ap/datomic/invoices.clj
View File

@@ -1,14 +1,15 @@
(ns auto-ap.datomic.invoices
(:require [datomic.api :as d]
[auto-ap.datomic :refer [uri merge-query apply-pagination apply-sort-3 add-sorter-fields conn]]
[auto-ap.graphql.utils :refer [limited-clients]]
[clojure.set :refer [rename-keys]]
[clj-time.coerce :as coerce]
[auto-ap.time-utils :refer [next-dom]]
[clj-time.core :as time]
[auto-ap.datomic.vendors :as d-vendors]
[clojure.tools.logging :as log]
[auto-ap.datomic.accounts :as d-accounts]))
(:require
[auto-ap.datomic
:refer [add-sorter-fields apply-pagination apply-sort-3 conn merge-query uri]]
[auto-ap.datomic.accounts :as d-accounts]
[auto-ap.datomic.vendors :as d-vendors]
[auto-ap.graphql.utils :refer [limited-clients]]
[auto-ap.time-utils :refer [next-dom]]
[clj-time.coerce :as coerce]
[clj-time.core :as time]
[clojure.set :refer [rename-keys]]
[datomic.api :as d]))
(def default-read '[*
{:invoice/client [:client/name :db/id :client/locations :client/code]}
@@ -41,7 +42,7 @@
(->> (cond-> {:query {:find []
:in ['$]
:where ['[?e :invoice/client]]}
:args [(d/db (d/connect uri))]}
:args [db]}
(:exact-match-id args)
(merge-query {:query {:in ['?e]
@@ -162,7 +163,7 @@
(apply-pagination args))))
(defn graphql-results [ids db args]
(defn graphql-results [ids db _]
(let [results (->> (d/pull-many db default-read ids)
(group-by :db/id))
@@ -218,10 +219,6 @@
(d/pull default-read id)
(<-datomic)))
(defn update [update]
@(d/transact (d/connect uri) [update])
(get-by-id (:db/id update) ))
(defn get-multi [ids]
(map <-datomic
(-> (d/db (d/connect uri))

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

@@ -29,7 +29,7 @@
[filename]
(-> (io/resource filename) (io/reader) (Util/readAll)))
(defn functions [conn]
(defn functions [_]
[[{:db/ident :pay
:db/doc "Data function that increments value of attribute a by amount."
:db/fn (d/function '{:lang "clojure"
@@ -47,7 +47,7 @@
:code [[:db/add e a
(-> (d/entity db e) a (+ amount))]] })}]] )
(defn fix-pay-function [conn]
(defn fix-pay-function [_]
[[{:db/ident :pay
:db/doc "Data function that increments value of attribute a by amount."
:db/fn (d/function '{:lang "clojure"
@@ -65,7 +65,7 @@
:db/valueType :db.type/string
:db/cardinality :db.cardinality/one}]])
(defn reset-function [conn]
(defn reset-function [_]
[[{:db/ident :reset
:db/doc "Resets a relationship to the values specified "
:db/fn (d/function '{:lang "clojure"
@@ -84,7 +84,7 @@
a vs})))})}]])
(defn propose-invoice-fn [conn]
(defn propose-invoice-fn [_]
[[{:db/ident :propose-invoice
:db/doc "Adds an invoice if it's not found"
:db/fn (d/function '{:lang "clojure"
@@ -204,10 +204,8 @@
:requires [:auto-ap/add-import-status]}
:auto-ap/fix-check-numbers {:txes-fn 'auto-ap.datomic.migrate.check-numbers/fix-check-numbers
:requires [:auto-ap/add-import-status-existing-invoices]}
:auto-ap/add-new-vendors {:txes-fn 'auto-ap.datomic.migrate.add-new-vendors/add-new-vendors
:requires [:auto-ap/fix-check-numbers]}
:auto-ap/add-account-visibility-fields {:txes-fn 'auto-ap.datomic.migrate.account-sorting/add-account-visibility-fields
:requires [:auto-ap/add-new-vendors]}
:requires [:auto-ap/fix-check-numbers]}
:auto-ap/make-every-account-visible {:txes-fn 'auto-ap.datomic.migrate.account-sorting/make-every-account-visible
:requires [:auto-ap/add-account-visibility-fields]}
:auto-ap/add-general-ledger6 {:txes add-general-ledger/add-general-ledger
@@ -542,7 +540,7 @@
(d/release conn))
(println "Done")))
(defn -main [& args]
(defn -main [& _]
(mount/start (mount/only #{#'conn}))
(migrate conn)
(mount/stop))

2
src/clj/auto_ap/datomic/migrate/account_sorting.clj
View File

@@ -2,7 +2,7 @@
(:require [datomic.api :as d]))
(defn add-account-visibility-fields [conn]
(defn add-account-visibility-fields [_]
[[
{:db/ident :bank-account/visible
:db/valueType :db.type/boolean

8
src/clj/auto_ap/datomic/migrate/add_bank_account_codes.clj
View File

@@ -1,9 +1,9 @@
(ns auto-ap.datomic.migrate.add-bank-account-codes
(:require [datomic.api :as d]
[auto-ap.datomic :refer [uri]]
[clojure.string :as str]))
(:require
[clojure.string :as str]
[datomic.api :as d]))
(defn add-bank-account-codes-schema [conn]
(defn add-bank-account-codes-schema [_]
[[{:db/ident :bank-account/code
:db/valueType :db.type/string
:db/unique :db.unique/identity

5
src/clj/auto_ap/datomic/migrate/add_client_codes.clj
View File

@@ -1,6 +1,7 @@
(ns auto-ap.datomic.migrate.add-client-codes
(:require [auto-ap.datomic :refer [uri]]
[datomic.api :as d]))
(:require
[datomic.api :as d]))
(def name->code
(->>
[["Moscini Pizza Inc" "MPI"]

29
src/clj/auto_ap/datomic/migrate/add_new_vendors.clj
View File

@@ -1,28 +1,3 @@
(ns auto-ap.datomic.migrate.add-new-vendors
(:require [datomic.api :as d]
[auto-ap.datomic :refer [uri]]
[clojure.data.csv :as csv]
[clojure.java.io :as io]
[clojure.string :as str])
(:import [org.apache.commons.io.input BOMInputStream]))
(ns auto-ap.datomic.migrate.add-new-vendors)
(defn add-new-vendors [conn]
[[]]
#_(let [[header & rows] (-> "vendor-list.csv" (io/resource) io/input-stream (BOMInputStream.) (io/reader) csv/read-csv)
headers (map read-string header)
new-vendors [(reduce
(fn [rows r]
(conj rows (reduce
(fn [r [header value]]
(condp = header
[:vendor/address] r
[:vendor/default-expense-account] (assoc-in r header (Integer/parseInt (str/replace value #"A" "")))
[:vendor/invoice-reminder-schedule] r
(assoc-in r header value)))
{}
(map vector headers r))))
[]
rows)]]
(println (ffirst new-vendors))
new-vendors
))

2
src/clj/auto_ap/datomic/migrate/check_numbers.clj
View File

@@ -3,6 +3,6 @@
(defn fix-check-numbers [conn]
(let [max-check-numbers (d/query {:query {:find '[?e ?check-number (max ?d)] :in ['$] :where ['[?e :bank-account/check-number ?check-number] '[?c :payment/bank-account ?e] '[?c :payment/check-number ?d]]} :args [(d/db conn)]})]
[(for [[bank-account check-number max-check client] max-check-numbers
[(for [[bank-account check-number max-check _] max-check-numbers
:when (>= max-check check-number)]
{:db/id bank-account :payment/check-number (inc max-check)})]))

2
src/clj/auto_ap/datomic/migrate/invoice_converter.clj
View File

@@ -34,7 +34,7 @@
:location-match/matches ["campbell brewing company"]}]}]]
[[]]))
(defn add-default-location [conn]
(defn add-default-location [_]
[[{:db/ident :client/default-location
:db/valueType :db.type/string
:db/cardinality :db.cardinality/one

2
src/clj/auto_ap/datomic/migrate/rename_codes.clj
View File

@@ -26,7 +26,7 @@
)
)
(defn rename-codes-1 [conn]
(defn rename-codes-1 [_]
(let [result (apply concat [(rename "WE" "WME" (d/connect uri))
(rename "HM" "HIM" (d/connect uri))
(rename "BES" "SBE" (d/connect uri))

3
src/clj/auto_ap/datomic/sales_orders.clj
View File

@@ -1,7 +1,6 @@
(ns auto-ap.datomic.sales-orders
(:require [auto-ap.datomic :refer [add-sorter-fields apply-pagination apply-sort-3 merge-query uri]]
[auto-ap.graphql.utils :refer [limited-clients]]
[auto-ap.utils :refer [dollars=]]
[clj-time.coerce :as c]
[datomic.api :as d]
[clojure.tools.logging :as log]
@@ -98,7 +97,7 @@
true (apply-sort-3 (assoc args :default-asc? false))
true (apply-pagination args))))
(defn graphql-results [ids db args]
(defn graphql-results [ids db _]
(let [results (->> (d/pull-many db default-read ids)
(group-by :db/id))
payments (->> ids

14
src/clj/auto_ap/datomic/transaction_rules.clj
View File

@@ -1,10 +1,10 @@
(ns auto-ap.datomic.transaction-rules
(:require [datomic.api :as d]
[auto-ap.datomic :refer [uri merge-query apply-sort-3 apply-pagination add-sorter-fields]]
[auto-ap.graphql.utils :refer [limited-clients]]
[clojure.set :refer [rename-keys]]
[clj-time.coerce :as c]
[clojure.string :as str]))
(:require
[auto-ap.datomic
:refer [add-sorter-fields apply-pagination apply-sort-3 merge-query uri]]
[auto-ap.graphql.utils :refer [limited-clients]]
[clojure.string :as str]
[datomic.api :as d]))
(defn <-datomic [result]
result)
@@ -76,7 +76,7 @@
true (apply-sort-3 args)
true (apply-pagination args))))
(defn graphql-results [ids db args]
(defn graphql-results [ids db _]
(let [results (->> (d/pull-many db default-read ids)
(group-by :db/id))
transaction-rules (->> ids

48
src/clj/auto_ap/datomic/transactions.clj
View File

@@ -1,26 +1,16 @@
(ns auto-ap.datomic.transactions
(:require [datomic.api :as d]
[auto-ap.datomic :refer [uri merge-query apply-sort-3 apply-pagination add-sorter-fields conn]]
[auto-ap.graphql.utils :refer [limited-clients]]
[clj-time.coerce :as c]
[clj-time.coerce :as coerce]
[clojure.tools.logging :as log]
[clojure.string :as str]
[auto-ap.datomic.accounts :as d-accounts]))
(defn sort-fn [sort-by]
(cond
(= "client" sort-by)
#(-> % :transaction/client :client/name)
(= "account" sort-by)
#(vector (-> % :transaction/account :account/name) (-> % :db/id))
:else
(keyword "transaction" sort-by)))
(:require
[auto-ap.datomic
:refer [add-sorter-fields apply-pagination apply-sort-3 conn merge-query uri]]
[auto-ap.datomic.accounts :as d-accounts]
[auto-ap.graphql.utils :refer [limited-clients]]
[clj-time.coerce :as coerce]
[clojure.string :as str]
[clojure.tools.logging :as log]
[datomic.api :as d]))
(defn potential-duplicate-ids [db args]
(if (and (:potential-duplicates args)
(when (and (:potential-duplicates args)
(:bank-account-id args))
(->> (d/q '[:find ?tx ?amount ?date
:in $ ?ba
@@ -31,9 +21,9 @@
(not [?tx :transaction/approval-status :transaction-approval-status/suppressed])]
db
(:bank-account-id args))
(group-by (fn [[tx amount date]]
(group-by (fn [[_ amount date]]
[amount date]))
(filter (fn [[g txes]]
(filter (fn [[_ txes]]
(> (count txes) 1)))
(vals)
@@ -183,7 +173,7 @@
true (apply-sort-3 (assoc args :default-asc? false))
true (apply-pagination args)))))
(defn graphql-results [ids db args]
(defn graphql-results [ids db _]
(let [results (->> (d/pull-many db '[* {:transaction/client [:client/name :db/id :client/code]
:transaction/approval-status [:db/ident :db/id]
:transaction/bank-account [:bank-account/name :bank-account/code :bank-account/yodlee-account-id :db/id :bank-account/locations :bank-account/current-balance]
@@ -201,8 +191,8 @@
{:account-client-override/client [:db/id]}]}]}]
:transaction/yodlee-merchant [:db/id :yodlee-merchant/yodlee-id :yodlee-merchant/name]}]
ids)
(map #(update % :transaction/date c/from-date))
(map #(update % :transaction/post-date c/from-date))
(map #(update % :transaction/date coerce/from-date))
(map #(update % :transaction/post-date coerce/from-date))
(map #(update % :transaction/accounts
(fn [tas]
(map
@@ -211,8 +201,8 @@
tas))))
(map (fn [transaction]
(cond-> transaction
(:transaction/payment transaction) (update-in [:transaction/payment :payment/date] c/from-date)
(:transaction/expected-deposit transaction) (update-in [:transaction/expected-deposit :expected-deposit/date] c/from-date))
(:transaction/payment transaction) (update-in [:transaction/payment :payment/date] coerce/from-date)
(:transaction/expected-deposit transaction) (update-in [:transaction/expected-deposit :expected-deposit/date] coerce/from-date))
))
(map #(dissoc % :transaction/id))
(group-by :db/id))]
@@ -257,7 +247,7 @@
{:account-client-override/client [:db/id]}]}]}]
:transaction/yodlee-merchant [:db/id :yodlee-merchant/yodlee-id :yodlee-merchant/name]}]
id)
(update :transaction/date c/from-date)
(update :transaction/post-date c/from-date)
(update :transaction/date coerce/from-date)
(update :transaction/post-date coerce/from-date)
(dissoc :transaction/id)))

9
src/clj/auto_ap/datomic/users.clj
View File

@@ -1,8 +1,7 @@
(ns auto-ap.datomic.users
(:require [datomic.api :as d]
[auto-ap.datomic :refer [uri]]
[clojure.set :refer [rename-keys]]
[clj-time.coerce :as c]))
(:require
[auto-ap.datomic :refer [uri]]
[datomic.api :as d]))
(defn add-arg [query name value where & rest]
(let [query (-> query
@@ -48,7 +47,7 @@
is-first-user? (assoc :user/role :user-role/admin))])]
(get-by-id (-> new-user-trans :tempids (get "user")))))))
(defn raw-graphql [args]
(defn raw-graphql [_]
(let [query (cond-> {:query {:find ['(pull ?e [*
{:user/clients [*]}
{:user/role [:db/ident]}])]

21
src/clj/auto_ap/datomic/yodlee2.clj
View File

@@ -1,12 +1,10 @@
(ns auto-ap.datomic.yodlee2
(:require [datomic.api :as d]
[auto-ap.datomic :refer [uri remove-nils merge-query apply-pagination apply-sort-3 add-sorter-fields conn]]
[auto-ap.graphql.utils :refer [limited-clients]]
[auto-ap.parse :as parse]
[clj-time.coerce :as c]
[clojure.set :refer [rename-keys]]
[clojure.string :as str]
[clojure.tools.logging :as log]))
(:require
[auto-ap.datomic
:refer [add-sorter-fields apply-pagination apply-sort-3 merge-query uri]]
[auto-ap.graphql.utils :refer [limited-clients]]
[clj-time.coerce :as c]
[datomic.api :as d]))
(def default-read '[*])
@@ -17,8 +15,8 @@
(->> (cond-> {:query {:find []
:in ['$]
:where ['[?e :yodlee-provider-account/id]]}
:args [(d/db (d/connect uri))]}
:args [db]}
(limited-clients (:id args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :yodlee-provider-account/client ?xx]]}
@@ -40,14 +38,13 @@
true
(merge-query {:query {:find ['?e ]
:where ['[?e :yodlee-provider-account/id]]}}) )
(d/query)
(apply-sort-3 args)
(apply-pagination args)))
(defn graphql-results [ids db args]
(defn graphql-results [ids db _]
(let [results (->> (d/pull-many db default-read ids)
(group-by :db/id))]
(->> ids

8
src/clj/auto_ap/datomic/yodlee_merchants.clj
View File

@@ -1,9 +1,9 @@
(ns auto-ap.datomic.yodlee-merchants
(:require [datomic.api :as d]
[auto-ap.graphql.utils :refer [->graphql]]
[auto-ap.datomic :refer [uri merge-query]]))
(:require
[auto-ap.datomic :refer [uri]]
[datomic.api :as d]))
(defn get-merchants [args]
(defn get-merchants [_]
;; TODO admin?
(let [query {:query {:find ['(pull ?e [:yodlee-merchant/name :yodlee-merchant/yodlee-id :db/id])]
:in ['$]