From 6f4b91b654236bed08f9977bd0f3d253fceb1b92 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 11 Jul 2022 09:24:01 -0700 Subject: [PATCH] making use of index better. --- src/clj/auto_ap/datomic/sales_orders.clj | 25 ++++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/clj/auto_ap/datomic/sales_orders.clj b/src/clj/auto_ap/datomic/sales_orders.clj index d975a2cb..6e30c9bf 100644 --- a/src/clj/auto_ap/datomic/sales_orders.clj +++ b/src/clj/auto_ap/datomic/sales_orders.clj @@ -36,6 +36,18 @@ "tip" ['[?e :sales-order/tip ?sort-tip]]} args) + (:start (:date-range args)) + (merge-query {:query {:in '[?start-date] + :where ['[?e :sales-order/date ?date] + '[(>= ?date ?start-date)]]} + :args [(c/to-date (:start (:date-range args)))]}) + + (:end (:date-range args)) + (merge-query {:query {:in '[?end-date] + :where ['[?e :sales-order/date ?date] + '[(<= ?date ?end-date)]]} + :args [(c/to-date (:end (:date-range args)))]}) + (limited-clients (:id args)) (merge-query {:query {:in ['[?xx ...]] :where ['[?e :sales-order/client ?xx]]} @@ -76,19 +88,6 @@ '[(auto-ap.utils/dollars= ?sales-order-total ?total)]]} :args [(:total args)]}) - - (:start (:date-range args)) - (merge-query {:query {:in '[?start-date] - :where ['[?e :sales-order/date ?date] - '[(>= ?date ?start-date)]]} - :args [(c/to-date (:start (:date-range args)))]}) - - (:end (:date-range args)) - (merge-query {:query {:in '[?end-date] - :where ['[?e :sales-order/date ?date] - '[(<= ?date ?end-date)]]} - :args [(c/to-date (:end (:date-range args)))]}) - true (merge-query {:query {:find ['?sort-default '?e] :where ['[?e :sales-order/date ?sort-default]]}}))]