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

should prevent bad error message from uploaded invoices.

Browse Source
This commit is contained in:
Bryce
2024-04-14 22:35:39 -07:00
parent 71b5b9864c
commit 38030637ba
5 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/clj/auto_ap/jobs/import_uploaded_invoices.clj
View File

@@ -20,9 +20,7 @@
(defn send-email-about-failed-message [mail-bucket mail-key message] (defn send-email-about-failed-message [mail-bucket mail-key message]
(let [target-key (str "failed-emails/" mail-key ".eml") (let [target-key (str "failed-emails/" mail-key ".eml")
target-url (str "http://" (:data-bucket env) target-url (str "https://" (:data-bucket env) "/" target-key)]
".s3-website-us-east-1.amazonaws.com/"
target-key)]
(alog/info ::sending-failure-email :who (:import-failure-destination-emails env)) (alog/info ::sending-failure-email :who (:import-failure-destination-emails env))
(s3/copy-object mail-bucket mail-key (:data-bucket env) target-key) (s3/copy-object mail-bucket mail-key (:data-bucket env) target-key)
(ses/send-email {:destination {:to-addresses (:import-failure-destination-emails env)} (ses/send-email {:destination {:to-addresses (:import-failure-destination-emails env)}
@@ -66,8 +64,8 @@
:content-length (.length (io/file filename))}) :content-length (.length (io/file filename))})
(let [imports (->> (parse/parse-file filename filename) (let [imports (->> (parse/parse-file filename filename)
(map #(assoc % (map #(assoc %
:source-url (str "http://" (:data-bucket env) :source-url (str "https://" (:data-bucket env)
".s3-website-us-east-1.amazonaws.com/" "/"
s3-location) s3-location)
:import-status :import-status/imported)))] :import-status :import-status/imported)))]
(alog/info ::found-imports :imports imports) (alog/info ::found-imports :imports imports)

2
src/clj/auto_ap/jobs/ntg.clj
View File

@@ -273,7 +273,7 @@
(mapcat (fn [k] (mapcat (fn [k]
(try (try
(let [invoice-key (copy-readable-version k) (let [invoice-key (copy-readable-version k)
invoice-url (str "http://" bucket-name ".s3-website-us-east-1.amazonaws.com/" invoice-key)] invoice-url (str "https://" bucket-name "/" invoice-key)]
(with-open [is (-> (s3/get-object {:bucket-name bucket-name (with-open [is (-> (s3/get-object {:bucket-name bucket-name
:key k}) :key k})
:input-stream)] :input-stream)]

2
src/clj/auto_ap/jobs/sysco.clj
View File

@@ -134,7 +134,7 @@
(mapcat (fn [k] (mapcat (fn [k]
(try (try
(let [invoice-key (str "invoice-files/" (UUID/randomUUID) ".csv") ; (let [invoice-key (str "invoice-files/" (UUID/randomUUID) ".csv") ;
invoice-url (str "http://" (:data-bucket env) ".s3-website-us-east-1.amazonaws.com/" invoice-key)] invoice-url (str "https://" (:data-bucket env) "/" invoice-key)]
(s3/copy-object {:source-bucket-name (:data-bucket env) (s3/copy-object {:source-bucket-name (:data-bucket env)
:destination-bucket-name (:data-bucket env) :destination-bucket-name (:data-bucket env)
:source-key k :source-key k

8
src/clj/auto_ap/pdf/ledger.clj
View File

@@ -338,7 +338,7 @@
pdf-data (make-pnl args data) pdf-data (make-pnl args data)
name (pnl-args->name args) name (pnl-args->name args)
key (str "reports/pnl/" uuid "/" name ".pdf") key (str "reports/pnl/" uuid "/" name ".pdf")
url (str "http://" (:data-bucket env) ".s3-website-us-east-1.amazonaws.com/" key)] url (str "https://" (:data-bucket env) "/" key)]
(s3/put-object :bucket-name (:data-bucket env) (s3/put-object :bucket-name (:data-bucket env)
:key key :key key
:input-stream (io/make-input-stream pdf-data {}) :input-stream (io/make-input-stream pdf-data {})
@@ -359,7 +359,7 @@
pdf-data (make-cash-flows args data) pdf-data (make-cash-flows args data)
name (cash-flows-args->name args) name (cash-flows-args->name args)
key (str "reports/cash-flows/" uuid "/" name ".pdf") key (str "reports/cash-flows/" uuid "/" name ".pdf")
url (str "http://" (:data-bucket env) ".s3-website-us-east-1.amazonaws.com/" key)] url (str "https://" (:data-bucket env) "/" key)]
(s3/put-object :bucket-name (:data-bucket env) (s3/put-object :bucket-name (:data-bucket env)
:key key :key key
:input-stream (io/make-input-stream pdf-data {}) :input-stream (io/make-input-stream pdf-data {})
@@ -380,7 +380,7 @@
pdf-data (make-balance-sheet args data) pdf-data (make-balance-sheet args data)
name (balance-sheet-args->name args) name (balance-sheet-args->name args)
key (str "reports/balance-sheet/" uuid "/" name ".pdf") key (str "reports/balance-sheet/" uuid "/" name ".pdf")
url (str "http://" (:data-bucket env) ".s3-website-us-east-1.amazonaws.com/" key)] url (str "https://" (:data-bucket env) "/" key)]
(s3/put-object :bucket-name (:data-bucket env) (s3/put-object :bucket-name (:data-bucket env)
:key key :key key
:input-stream (io/make-input-stream pdf-data {}) :input-stream (io/make-input-stream pdf-data {})
@@ -401,7 +401,7 @@
pdf-data (make-journal-detail-report args data) pdf-data (make-journal-detail-report args data)
name (journal-detail-args->name args) name (journal-detail-args->name args)
key (str "reports/journal-detail/" uuid "/" name ".pdf") key (str "reports/journal-detail/" uuid "/" name ".pdf")
url (str "http://" (:data-bucket env) ".s3-website-us-east-1.amazonaws.com/" key)] url (str "https://" (:data-bucket env) "/" key)]
(s3/put-object :bucket-name (:data-bucket env) (s3/put-object :bucket-name (:data-bucket env)
:key key :key key
:input-stream (io/make-input-stream pdf-data {}) :input-stream (io/make-input-stream pdf-data {})

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

@@ -277,8 +277,8 @@
:client-override client :client-override client
:location-override location :location-override location
:vendor-override vendor :vendor-override vendor
:source-url (str "http://" (:data-bucket env) :source-url (str "https://" (:data-bucket env)
".s3-website-us-east-1.amazonaws.com/" "/"
s3-location))))] s3-location))))]
(import-uploaded-invoice user imports)) (import-uploaded-invoice user imports))
{:status 200 {:status 200