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

added suggestions

Browse Source
This commit is contained in:
Bryce Covert
2022-07-26 07:01:18 -07:00
parent 96c80853ef
commit 84f7e734f0
65 changed files with 130 additions and 1140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,12 +85,3 @@
:args [(d/db (d/connect uri)) code]}))
(first)
(first)))
(defn assoc-image [code image]
@(d/transact (d/connect uri)
[{ :client/code code
:client/signature-file (str "https://s3.amazonaws.com/integreat-signature-images/" image)}]))
#_(d/pull (d/db (d/connect uri)) '[*] [:client/code "FTLO"])
#_(assoc-image "FTLO" "Fratello.jpg" )

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

@@ -124,8 +124,3 @@
[(->> (graphql-results ids-to-retrieve db args))
matching-count]))
(defn get-by-id [id]
(->>
(d/pull (d/db conn) default-read id)
(<-datomic)))

35
src/clj/auto_ap/datomic/ledger.clj
View File

@@ -5,52 +5,17 @@
[clj-time.coerce :as c]
[auto-ap.datomic.accounts :as d-accounts]))
(def export-read
[:journal-entry/external-id
:journal-entry/cleared
:journal-entry/alternate-description
:journal-entry/date
:journal-entry/note
:journal-entry/amount
:journal-entry/source
:journal-entry/cleared-against
:journal-entry/original-entity
{:journal-entry/client [:client/name :client/code :db/id]
:journal-entry/vendor [:vendor/name :db/id]
:journal-entry/line-items [:journal-entry-line/location
:journal-entry-line/debit
:journal-entry-line/credit
{:journal-entry-line/account [:bank-account/include-in-reports
:bank-account/bank-name
:bank-account/code
:bank-account/visible
:bank-account/name
:bank-account/number
:account/code
:account/name
:account/numeric-code
:account/location
{:account/client-overrides [:account-client-override/name
{:account-client-override/client [:db/id]}]}
{:account/type [:db/ident :db/id]}
{:bank-account/type [:db/ident :db/id]}]}]}])
(defn raw-graphql-ids [db args]
(let [query (cond-> {:query {:find []
:in ['$ ]
:where []}
:args [db]}
(:client-id args)
(merge-query {:query {:in ['?client-id]
:where ['[?e :journal-entry/client ?client-id]]}
:args [(:client-id args)]})
(:only-external args)
(merge-query {:query {:where ['(not [?e :journal-entry/original-entity ])]}})

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

@@ -23,12 +23,14 @@
(:import
(datomic Util)))
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn read-dtm
"Reads a dtm file (i.e., an edn file with datomic tags in it) from the classpath
and returns a vector of all forms contained within."
[filename]
(-> (io/resource filename) (io/reader) (Util/readAll)))
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn functions [_]
[[{:db/ident :pay
:db/doc "Data function that increments value of attribute a by amount."
@@ -47,6 +49,7 @@
:code [[:db/add e a
(-> (d/entity db e) a (+ amount))]] })}]] )
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn fix-pay-function [_]
[[{:db/ident :pay
:db/doc "Data function that increments value of attribute a by amount."

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

@@ -2,6 +2,7 @@
(:require [datomic.api :as d]))
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn add-account-visibility-fields [_]
[[
{:db/ident :bank-account/visible
@@ -13,6 +14,7 @@
:db/cardinality :db.cardinality/one
:db/doc "The sort order of the bank account"}]])
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn make-every-account-visible [conn]
(let [all-account-ids (d/query
{:query {:find ['?e]

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

@@ -3,6 +3,7 @@
[clojure.string :as str]
[datomic.api :as d]))
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn add-bank-account-codes-schema [_]
[[{:db/ident :bank-account/code
:db/valueType :db.type/string
@@ -11,6 +12,7 @@
:db/doc "A bank account's computer-friendly name"}]])
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn add-bank-account-codes [conn]
(let [db (d/db conn)
all-bank-accounts (d/query {:query {:find ['?b '?original-id '?client-code]

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

@@ -33,6 +33,7 @@
["Iguanas Burritozilla" "IBC"]]
(into {}))
)
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn add-client-codes [a]
[(->> (d/query {:query {:find '[?name ?e]
:in ['$]

68
src/clj/auto_ap/datomic/migrate/add_general_ledger.clj
View File

@@ -1,25 +1,10 @@
(ns auto-ap.datomic.migrate.add-general-ledger
(:require [datomic.api :as d]
[auto-ap.datomic :refer [remove-nils]]
[auto-ap.datomic.accounts :as accounts]
[auto-ap.expense-accounts :as expense-accounts]
[auto-ap.ledger :as ledger]
[auto-ap.utils :refer [by]]
[clojure.java.io :as io]
[clojure.string :as str])
(:import [org.apache.commons.io.input BOMInputStream]))
(defn test-run [txs-set]
#_(println "processing " (count txs-set))
(doseq [[i tx] (map vector (range) txs-set)]
@(d/transact (d/connect auto-ap.datomic/uri)
tx)
(when (= 0 (mod i 100))
(println "processed " i)
(println "sample: " (first tx))
)))
(:require
[auto-ap.datomic :refer [remove-nils]]
[auto-ap.datomic.accounts :as accounts]
[auto-ap.expense-accounts :as expense-accounts]
[auto-ap.ledger :as ledger]
[datomic.api :as d]))
(def add-general-ledger
[[{:db/ident :journal-entry/source
@@ -195,7 +180,8 @@
:account/location location
:account/account-set "default"}))))])
(defn add-general-ledger-fns [conn]
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn add-general-ledger-fns [_]
[[{:db/ident :replace-general-ledger
:db/doc "Deletes the general ledger entries for an entity"
:db/fn (d/function '{:lang "clojure"
@@ -208,6 +194,7 @@
(into []
(map (fn [i] [:db/retractEntity i ]) ids)))})}]] )
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn bulk-load-invoice-ledger [conn]
(let [invoice-ids (map first (d/query {:query {:find '[?e]
:in '[$]
@@ -219,6 +206,7 @@
z))
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn bulk-load-transaction-ledger [conn]
(let [transaction-ids (map first (d/query {:query {:find '[?e]
:in '[$]
@@ -258,6 +246,7 @@
:db/cardinality :db.cardinality/one
:db/doc "The account will be used when a bill is created."}]])
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn convert-vendors [conn]
(let [vendors (d/query {:query {:find '[?v ?expense-account-id]
:in '[$]
@@ -269,6 +258,7 @@
:vendor/default-account (accounts/get-account-by-numeric-code-and-sets expense-account-id ["default"])}))
vendors)]))
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn convert-invoices [conn]
(let [invoice-expense-accounts (d/query {:query {:find '[?iea ?expense-account-id]
:in '[$]
@@ -280,7 +270,8 @@
:invoice-expense-account/account (accounts/get-account-by-numeric-code-and-sets expense-account-id ["default"])}))
invoice-expense-accounts)]))
(defn convert-transactions [conn]
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn convert-transactions [_]
(println "here")
(let [matched-transactions (d/query {:query {:find '[?transaction ?v ?amount]
:in '[$]
@@ -442,34 +433,3 @@
{:db/id v
:vendor/hidden false})
vendors))])
(defn reset-ledger [conn]
(let [results (->> (d/query {:query {:find '[?e]
:in '[$]
:where ['[?e :journal-entry/original-entity ]]}
:args [(d/db conn)]})
(map (fn [[id]]
[:db/retractEntity id]))
(partition-all 100))]
results))
(defn reset-manual-ledger [conn]
(let [results (->> (d/query {:query {:find '[?e]
:in '[$]
:where ['[?e :journal-entry/external-id ]]}
:args [(d/db conn)]})
(mapv (fn [[id]]
[:db/retractEntity id]))
(partition-all 100))]
results))
#_(convert-accounts (d/connect auto-ap.datomic/uri))
#_(do (doseq [tran (convert-transactions (d/connect auto-ap.datomic/uri))]
@(d/transact (d/connect auto-ap.datomic/uri) tran))
(println "done."))

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

@@ -1,6 +1,7 @@
(ns auto-ap.datomic.migrate.check-numbers
(:require [datomic.api :as d]))
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(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 _] max-check-numbers

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

@@ -23,6 +23,7 @@
:db/doc "The location of the location match"}
]])
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn add-starter [conn]
(if (seq (d/query {:query {:find '[?e]
:in ['$]
@@ -34,12 +35,14 @@
:location-match/matches ["campbell brewing company"]}]}]]
[[]]))
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn add-default-location [_]
[[{:db/ident :client/default-location
:db/valueType :db.type/string
:db/cardinality :db.cardinality/one
:db/doc "The default location if one can't be found"}]])
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn add-default-location-2 [conn]
(if (seq (d/query {:query {:find '[?e]
:in ['$]
@@ -58,6 +61,7 @@
{:db/ident :import-status/pending}
{:db/ident :import-status/imported}]])
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn add-import-status-existing-invoices [conn]
(let [existing-invoices (->> (d/query {:query {:find ['?e]
:in ['$]

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

@@ -26,6 +26,7 @@
)
)
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn rename-codes-1 [_]
(let [result (apply concat [(rename "WE" "WME" (d/connect uri))
(rename "HM" "HIM" (d/connect uri))

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

@@ -127,7 +127,3 @@
matching-count
(summarize-orders ids-to-retrieve)]))
(defn get-by-id [id]
(->>
(d/pull (d/db (d/connect uri)) default-read id)
(<-datomic)))

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

@@ -76,7 +76,3 @@
true (drop (:start args 0))
true (take (:count args 500)))))
(defn count-graphql [args]
(->> (raw-graphql args)
(count)))

25
src/clj/auto_ap/datomic/vendors.clj
View File

@@ -42,31 +42,6 @@
:vendor/default-account [:db/id :account/numeric-code :account/name]
:vendor-usage/_vendor [:vendor-usage/client :vendor-usage/count]}])
(defn get-usages [args]
(->> (cond-> {:query {:find ['?v '?c '(count ?e)]
:in ['$]
:where ['[?v :vendor/name]
'(or-join [?v ?c ?e]
(and
[?e :invoice/vendor ?v]
[?e :invoice/client ?c])
(and
[?e :transaction/vendor ?v]
[?e :transaction/client ?c])
(and
[?e :journal-entry/vendor ?v]
[?e :journal-entry/client ?c]))]}
:args [(d/db conn)]}
(limited-clients (:id args))
(merge-query {:query {:in ['?xx]
:where [['(get ?xx ?c)]]}
:args [(set (map :db/id (limited-clients (:id args))))]}))
(d/query)
(reduce
(fn [usages [v c cnt]]
(update usages v (fnil conj []) {:client-id c :count cnt}))
{})))
(defn raw-graphql-ids [db args]
(let [query (cond-> {:query {:find []

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

@@ -59,8 +59,3 @@
[(->> (graphql-results ids-to-retrieve db args))
matching-count]))
(defn get-by-id [id]
(-> (d/db (d/connect uri))
(d/pull default-read id)
(<-datomic)))