undoing commit.

This commit is contained in:
2022-04-01 10:23:44 -07:00
parent e06861158e
commit 442e9799c7
6 changed files with 48 additions and 170 deletions

View File

@@ -10,8 +10,7 @@
[clojure.java.io :as io]
[clojure.string :as str]
[config.core :refer [env]]
[datomic.api :as d]
[clojure.tools.logging :as log])
[datomic.api :as d])
(:import
(java.io ByteArrayOutputStream)
(java.text DecimalFormat)
@@ -142,40 +141,6 @@
9))]
table))
(defn make-balance-sheet [args data]
(let [data (<-graphql data)
args (<-graphql args)
args (assoc args
:periods (filter identity (cond-> [(:date args)]
(:include-comparison args) (conj (:comparison-date args)))))
clients (d/pull-many (d/db conn) '[:client/name :db/id] [(:client-id args)])
data (concat (->> (:balance-sheet-accounts data)
(map (fn [b]
(assoc b
:period (:date args)))))
(->> (:comparable-balance-sheet-accounts data)
(map (fn [b]
(assoc b
:period (:comparison-date args))))))
pnl-data (l-reports/->PNLData args data (by :db/id clients))
report (l-reports/summarize-balance-sheet pnl-data)
output-stream (ByteArrayOutputStream.)]
(log/info report)
(pdf/pdf
(-> [{:left-margin 10 :right-margin 10 :top-margin 15 :bottom-margin 15
:size :letter
:font {:size 6
:ttf-name "fonts/calibri-light.ttf"}}
[:heading (str "Balance Sheet - " (str/join ", " (map :client/name clients)))]]
(conj [:paragraph {:color [128 0 0] :size 9} (:warning report)])
(conj
(table->pdf report
(cond-> [30 13]
(:include-comparison args) (into [13 13])))))
output-stream)
(.toByteArray output-stream)))
(defn make-pnl [args data]
(let [data (<-graphql data)
@@ -223,7 +188,7 @@
output-stream)
(.toByteArray output-stream)))
(defn pnl-args->name [args]
(defn args->name [args]
(let [min-date (atime/unparse-local
(->> args :periods (map :start) first)
atime/iso-date)
@@ -233,17 +198,10 @@
names (str/replace (->> args :client_ids (d/pull-many (d/db conn) [:client/name]) (map :client/name) (str/join "-")) #" " "_" )]
(format "Profit-and-loss-%s-to-%s-for-%s" min-date max-date names)))
(defn balance-sheet-args->name [args]
(let [date (atime/unparse-local
(:date args)
atime/iso-date)
name (str/replace (->> args :client_id (d/pull (d/db conn) [:client/name]) :client/name ) #" " "_" )]
(format "Balance-sheet-%s-for-%s" date name)))
(defn print-pnl [user args data]
(let [uuid (str (UUID/randomUUID))
pdf-data (make-pnl args data)
name (pnl-args->name args)
name (args->name args)
key (str "reports/pnl/" uuid "/" name ".pdf")
url (str "http://" (:data-bucket env) ".s3-website-us-east-1.amazonaws.com/" key)]
(s3/put-object :bucket-name (:data-bucket env)
@@ -260,24 +218,3 @@
:report/created (java.util.Date.)}])
{:report/name name
:report/url url }))
(defn print-balance-sheet [user args data]
(let [uuid (str (UUID/randomUUID))
pdf-data (make-balance-sheet args data)
name (balance-sheet-args->name args)
key (str "reports/balance-sheet/" uuid "/" name ".pdf")
url (str "http://" (:data-bucket env) ".s3-website-us-east-1.amazonaws.com/" key)]
(s3/put-object :bucket-name (:data-bucket env)
:key key
:input-stream (io/make-input-stream pdf-data {})
:metadata {:content-length (count pdf-data)
:content-type "application/pdf"})
@(d/transact conn
[{:report/name name
:report/client [(:client_id args)]
:report/key key
:report/url url
:report/creator (:user user)
:report/created (java.util.Date.)}])
{:report/name name
:report/url url }))