added suggestions

2022-07-26 07:01:18 -07:00
parent 96c80853ef
commit 84f7e734f0
65 changed files with 130 additions and 1140 deletions
--- a/src/clj/auto_ap/import/intuit.clj
+++ b/src/clj/auto_ap/import/intuit.clj
@@ -5,7 +5,7 @@
   [auto-ap.import.transactions :as t]
   [auto-ap.intuit.core :as i]
   [auto-ap.time :as atime]
-   [auto-ap.utils :refer [allow-once heartbeat]]
+   [auto-ap.utils :refer [heartbeat]]
   [clj-time.coerce :as coerce]
   [clj-time.core :as time]
   [clojure.string :as str]
@@ -76,8 +76,6 @@
                       :priority   :normal}
                      nil)))))

-(def upsert-transactions (allow-once upsert-transactions))
-
 (defn upsert-accounts []
  (let [token (i/get-fresh-access-token)
        bank-accounts (i/get-bank-accounts token)]
--- a/src/clj/auto_ap/import/manual/common.clj
+++ b/src/clj/auto_ap/import/manual/common.clj
@@ -20,13 +20,6 @@
    (catch Exception e
      (throw (Exception. (str "Could not parse expense account from value '" (:account-numeric-code i) "'") e)))))

-(defn parse-account-id [i]
-  (try
-    (Long/parseLong (second
-                     (re-matches #"[^0-9,\\-]*([0-9,\\-]+)[^0-9,]*" (:bank-account-id i))))
-    (catch Exception e
-      (throw (Exception. (str "Could not parse account from value '" (:bank-account-id i) "'") e)))))
-
 (defn parse-date [{:keys [raw-date]}]
  (when-not
      (re-find #"\d{1,2}/\d{1,2}/\d{4}" raw-date)
--- a/src/clj/auto_ap/import/transactions.clj
+++ b/src/clj/auto_ap/import/transactions.clj
@@ -222,6 +222,7 @@
                                   :location "A"
                                   :amount (Math/abs (double amount))}])))

+#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
 (defn maybe-autopay-invoices [{:transaction/keys [amount client bank-account] :as transaction}]
  (when-let [autopay-invoices-matches (seq (match-transaction-to-unfulfilled-autopayments amount client))]
    (add-new-payment transaction autopay-invoices-matches bank-account client)))
@@ -356,18 +357,3 @@
                      (range)
                      group)))))

-(defn add-single-transaction [bank-account-code tx]
-  (let [bank-account (d/pull (d/db conn)
-                             [:bank-account/code
-                              :db/id
-                              :bank-account/locations
-                              :bank-account/start-date
-                              {:client/_bank-accounts [:client/code :client/locations :db/id]} ]
-                             [:bank-account/code bank-account-code])]
-    
-    (transaction->txs (-> (merge {:transaction/amount 100.0 :transaction/description-original "boring" :transaction/approval-status :transaction-approval-status/approved :transaction/status "POSTED"}
-                                 tx)
-                          (assoc :transaction/bank-account (:db/id bank-account)))
-                      bank-account
-                      (rm/rule-applying-fn (tr/get-all)))))
-
--- a/src/clj/auto_ap/import/yodlee.clj
+++ b/src/clj/auto_ap/import/yodlee.clj
@@ -1,85 +0,0 @@
-(ns auto-ap.import.yodlee
-  (:require
-   [auto-ap.datomic :refer [conn]]
-   [auto-ap.import.transactions :as t]
-   [auto-ap.time :as atime]
-   [auto-ap.utils :refer [allow-once]]
-   [auto-ap.yodlee.core :as client]
-   [clj-time.coerce :as coerce]
-   [clojure.string :as str]
-   [clojure.tools.logging :as log]
-   [com.unbounce.dogstatsd.core :as statsd]
-   [datomic.api :as d]
-   [digest :as di]))
-
-(defn yodlee->transaction [transaction use-date-instead-of-post-date?]
-  (let [{post-date :postDate
-         account-id :accountId
-         date :date
-         id :id
-         {amount :amount} :amount
-         {description-original :original
-          description-simple :simple} :description
-         base-type :baseType
-         type :type
-         status :status} transaction
-        amount (if (= "DEBIT" base-type)
-                 (-  amount)
-                 amount)
-        date (atime/parse date "YYYY-MM-dd")]
-    #:transaction
-    {:post-date (coerce/to-date (atime/parse post-date "YYYY-MM-dd"))
-     :id #_{:clj-kondo/ignore [:unresolved-var]}
-         (di/sha-256 (str id))
-     :raw-id (str id)
-     :account-id account-id
-     :date (if use-date-instead-of-post-date?
-             (coerce/to-date (atime/parse post-date "YYYY-MM-dd"))
-             (coerce/to-date date))
-     :amount (double amount)
-     :description-original (some-> description-original (str/replace #"\s+" " "))
-     :description-simple (some-> description-simple (str/replace #"\s+" " "))
-     :type type
-     :status status}))
-
-(defn import-yodlee []
-  (statsd/event {:title    "Yodlee import started"
-                 :text     "Starting"
-                 :priority :low}
-                nil)
-  (let [import-batch (t/start-import-batch :import-source/yodlee "Automated yodlee user")]
-    (try
-      (let [account-lookup (d/q '[:find ?ya ?ba ?ud ?c
-                                  :in $
-                                  :where [?ba :bank-account/yodlee-account-id ?ya]
-                                  [(get-else $ ?ba :bank-account/use-date-instead-of-post-date? false) ?ud]
-                                  [?c :client/bank-accounts ?ba]]
-                                (d/db conn))]
-        (doseq [[yodlee-account bank-account use-date-instead-of-post-date? client-id] account-lookup
-                transaction                             (try
-                              (client/get-specific-transactions yodlee-account (client/get-auth-header))
-                              (catch Exception e
-                                (log/warn e)
-                                []))]
-          (t/import-transaction! import-batch (assoc (yodlee->transaction transaction use-date-instead-of-post-date?)
-                                                     :transaction/bank-account bank-account
-                                                     :transaction/client client-id)))
-
-        (t/finish! import-batch))
-      (statsd/event {:title    "Yodlee import Finished"
-                     :text     (pr-str (t/get-stats import-batch))
-                     :priority :low}
-                    nil)
-      (catch Exception e
-        (t/fail! import-batch e)
-        (statsd/event {:title      "Yodlee import failed"
-                       :text       (str e)
-                       :alert-type :warning
-                       :priority   :normal}
-                      nil)))))
-
-(def import-yodlee (allow-once import-yodlee))
-
-#_(mount/defstate import-worker
-  :start (scheduler/every (* 1000 60 60 8) (heartbeat import-yodlee "import-yodlee"))
-  :stop (scheduler/stop import-worker))
--- a/src/clj/auto_ap/import/yodlee2.clj
+++ b/src/clj/auto_ap/import/yodlee2.clj
@@ -3,15 +3,48 @@
   [auto-ap.datomic :refer [conn]]
   [auto-ap.import.common :refer [wrap-integration]]
   [auto-ap.import.transactions :as t]
-   [auto-ap.import.yodlee :as y]
   [auto-ap.utils :refer [allow-once heartbeat]]
   [auto-ap.yodlee.core2 :as client2]
+   [auto-ap.time :as atime ]
+   [clojure.string :as str]
+   [clj-time.coerce :as coerce]
+   [digest :as di]
   [com.unbounce.dogstatsd.core :as statsd]
   [datomic.api :as d]
   [mount.core :as mount]
   [unilog.context :as lc]
   [yang.scheduler :as scheduler]))

+(defn yodlee->transaction [transaction use-date-instead-of-post-date?]
+  (let [{post-date :postDate
+         account-id :accountId
+         date :date
+         id :id
+         {amount :amount} :amount
+         {description-original :original
+          description-simple :simple} :description
+         base-type :baseType
+         type :type
+         status :status} transaction
+        amount (if (= "DEBIT" base-type)
+                 (-  amount)
+                 amount)
+        date (atime/parse date "YYYY-MM-dd")]
+    #:transaction
+    {:post-date (coerce/to-date (atime/parse post-date "YYYY-MM-dd"))
+     :id #_{:clj-kondo/ignore [:unresolved-var]}
+         (di/sha-256 (str id))
+     :raw-id (str id)
+     :account-id account-id
+     :date (if use-date-instead-of-post-date?
+             (coerce/to-date (atime/parse post-date "YYYY-MM-dd"))
+             (coerce/to-date date))
+     :amount (double amount)
+     :description-original (some-> description-original (str/replace #"\s+" " "))
+     :description-simple (some-> description-simple (str/replace #"\s+" " "))
+     :type type
+     :status status}))
+
 (defn import-yodlee2-int []
  (lc/with-context {:source "Import yodlee2 transactions"}
    (statsd/event {:title "Yodlee2 import started"
@@ -33,7 +66,7 @@
          (doseq [[yodlee-account bank-account client-code use-date-instead-of-post-date?] account-lookup
                  transaction (wrap-integration #(client2/get-specific-transactions client-code yodlee-account)
                                                bank-account)]
-            (t/import-transaction! import-batch (assoc (y/yodlee->transaction transaction use-date-instead-of-post-date?)
+            (t/import-transaction! import-batch (assoc (yodlee->transaction transaction use-date-instead-of-post-date?)
                                                       :transaction/bank-account bank-account
                                                       :transaction/client [:client/code client-code])))