Skip to content

Commit

Permalink
filter fixed with same name
Browse files Browse the repository at this point in the history
fixed #2

Signed-off-by: Avelino <t@avelino.xxx>
  • Loading branch information
avelino committed Apr 19, 2020
1 parent 4a39e05 commit e9c75eb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ lein deps
;; get records -- apply filters
(-> (datastore/query ds
"KEY-NAME"
{:created [">" (.toJSON (new js/Date "2020-04-03T00:00:00z"))]}
{:created [[">" (.toJSON (new js/Date "2020-04-03T00:00:00z"))]
["<" (.toJSON (new js/Date "2020-04-09T00:00:00z"))]]
:active true}
:group ["created"]
:order {:created {:descending false}}
:limit 10)
Expand Down
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject cljs-google-datastore "1.0.8"
(defproject cljs-google-datastore "1.0.9"
:description "Google Cloud Datastore client to ClojureScript"
:url "https://github.com/avelino/cljs-google-datastore"
:license {:name "The MIT License"
Expand Down
11 changes: 8 additions & 3 deletions src/cljs_google_datastore/maker.cljs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
(ns cljs-google-datastore.maker
(:require ["@google-cloud/datastore" :refer [Datastore]]))
(:require [cljs.core :refer [PersistentVector]]
["@google-cloud/datastore" :refer [Datastore]]))

(defn- ds-key
[ds, kind, & {:keys [key]}]
Expand All @@ -10,8 +11,12 @@
(let [query (.createQuery ds kind)]
;; filter loop
(doseq [[k v] filter]
(some-> query
(.filter (name k), (get v 0), (get v 1))))
(if-not (instance? PersistentVector v)
(some-> query
(.filter (name k), (get v 0), (get v 1)))
(doseq [[sub-v] v]
(some-> query
(.filter (name k), (get sub-v 0), (get sub-v 1))))))
;; order loop
(doseq [[k v] order]
(some-> query (.order (name k) v)))
Expand Down

0 comments on commit e9c75eb

Please sign in to comment.