added sortability

This commit is contained in:
Bryce Covert
2018-04-12 15:26:18 -07:00
parent f41c0fcba7
commit 38d9c1a1d3
4 changed files with 59 additions and 54 deletions

View File

@@ -48,31 +48,31 @@
(-> base-query
(helpers/merge-where [:= :imported false])))))
(defn add-sort-by [q sort-by]
(defn add-sort-by [q sort-by asc]
(let [sort-by-key (keyword sort-by)]
(cond (all-keys sort-by-key)
(helpers/merge-order-by q sort-by-key)
(helpers/merge-order-by q [sort-by-key (when-not asc :desc)])
(= :vendor sort-by-key)
(-> q
(helpers/merge-left-join [:vendors :v] [:= :v.id :invoices.vendor-id] )
(helpers/merge-order-by [:v.name]))
(helpers/merge-order-by [:v.name (when-not asc :desc)]))
(= :company sort-by-key)
(-> q
(helpers/merge-left-join [:companies :c] [:= :c.id :invoices.company-id] )
(helpers/merge-order-by [:c.name]))
(helpers/merge-order-by [:c.name (when-not asc :desc)]))
:else
q)))
(defn get-graphql [{:keys [imported company-id sort-by]}]
(defn get-graphql [{:keys [imported company-id sort-by asc]}]
(query
(cond-> base-query
(not (nil? imported)) (helpers/merge-where [:= :imported imported])
(not (nil? company-id)) (helpers/merge-where [:= :company-id company-id])
(not (nil? sort-by) ) (add-sort-by sort-by))))
(not (nil? sort-by) ) (add-sort-by sort-by asc))))
(defn import [parsed-invoices companies vendors]
(insert-multi!

View File

@@ -41,7 +41,8 @@
{:invoice {:type '(list :invoice)
:args {:imported {:type 'Boolean}
:company_id {:type 'Int}
:sort_by {:type 'String}}
:sort_by {:type 'String}
:asc {:type 'Boolean}}
:resolve :get-invoice}
:company {:type '(list :company)