(cloud) Makes POS page work again
This commit is contained in:
@@ -26,3 +26,6 @@ services:
|
||||
hard: 65536
|
||||
ports:
|
||||
- 4334:4334
|
||||
solr:
|
||||
volumes:
|
||||
- ./data/solr:/var/solr
|
||||
|
||||
@@ -36,6 +36,13 @@ services:
|
||||
POSTGRES_DB: autoap
|
||||
volumes:
|
||||
- ./data/var/lib/postgresql/data:/var/lib/postgresql/data
|
||||
solr:
|
||||
image: solr
|
||||
ports:
|
||||
- "8983:8983"
|
||||
command:
|
||||
- solr-precreate
|
||||
- gettingstarted
|
||||
datomic-transactor:
|
||||
depends_on:
|
||||
- database
|
||||
|
||||
@@ -36,19 +36,12 @@
|
||||
(defn sales-orders-in-range [db client start end]
|
||||
(let [end (or end #inst "2050-01-01")]
|
||||
(into #{}
|
||||
(comp
|
||||
(map (fn [i]
|
||||
(map (fn [datom]
|
||||
(:e datom)))
|
||||
(dc/index-range db
|
||||
{:attrid :sales-order/client+date
|
||||
:start [client start]
|
||||
:end [client end]
|
||||
:limit 10000
|
||||
:offset (* 10000 i)})))
|
||||
|
||||
(take-while seq)
|
||||
(mapcat identity)
|
||||
(map :e))
|
||||
(range))))
|
||||
:sales-order/client+date
|
||||
[client start]
|
||||
[client end]))))
|
||||
|
||||
|
||||
(defn can-see-client? [identity client]
|
||||
|
||||
@@ -111,10 +111,6 @@
|
||||
(merge-query {:query {:find ['?date '?e]
|
||||
:where ['[?e :sales-order/date ?date]]}}))]
|
||||
|
||||
(mu/log ::query-stats
|
||||
:stats (:query-stats (dc/q (assoc query :query-stats true)))
|
||||
:q (str query))
|
||||
|
||||
(cond->> (query2 query)
|
||||
true (apply-sort-3 (assoc args :default-asc? false))
|
||||
true (apply-pagination args))))
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
[amazonica.aws.s3 :as s3]
|
||||
[auto-ap.datomic :refer [conn pull-attr random-tempid]]
|
||||
[auto-ap.ledger :as l ]
|
||||
[clj-http.core :as http]
|
||||
[auto-ap.server]
|
||||
[auto-ap.square.core :as square]
|
||||
[auto-ap.square.core2 :as square2]
|
||||
@@ -551,3 +552,16 @@
|
||||
id (rand-int 100000)]]
|
||||
["posted" d (str "Random Description - " id) "Travel" nil nil (- amount) nil nil nil nil nil (rand-nth bank-accounts) client-code])
|
||||
:separator \tab))))
|
||||
|
||||
|
||||
(defn index-solr
|
||||
[]
|
||||
)
|
||||
|
||||
(defn setup-sales-orders []
|
||||
(doseq [n (->> (dc/qseq {:query '[:find ?s ?c :where [?s :sales-order/client ?c]] :args [(dc/db auto-ap.datomic/conn)]})
|
||||
(map (fn [[s c]]
|
||||
{:db/id s :sales-order/client c}))
|
||||
(partition-all 1000)
|
||||
(take 10))]
|
||||
@(dc/transact auto-ap.datomic/conn n)))
|
||||
|
||||
Reference in New Issue
Block a user