get lat/long orderby and fitler from request body

- using string replacement to build the query
- using wrap-json-body middleware to get requst params
- temporarily disabled csrf protection
This commit is contained in:
Bart Akeley 2017-10-21 22:01:56 -05:00
parent 54b79f4f5d
commit f30715d23a
3 changed files with 48 additions and 15 deletions

View file

@ -9,7 +9,8 @@
[org.postgresql/postgresql "42.1.4.jre6"]
[com.mchange/c3p0 "0.9.5.2"]
[ring-middleware-format "0.7.2"]
[org.clojure/data.json "0.2.6"]]
[org.clojure/data.json "0.2.6"]
[ring/ring-json "0.4.0"]]
:plugins [[lein-ring "0.9.7"]]
:ring {:handler aretherecookies.handler/app}
:profiles

8
sample-post.json Normal file
View file

@ -0,0 +1,8 @@
{
"lat": 30.3033267,
"lng": -97.7286718,
"orderby": "distance",
"filter": {
"radius": 10
}
}

View file

@ -3,7 +3,10 @@
[compojure.route :as route]
[ring.middleware.defaults :refer [wrap-defaults site-defaults]]
[clojure.java.jdbc :as jdbc]
[clojure.data.json :as json])
[clojure.data.json :as json]
[clojure.string :as str]
[ring.middleware.anti-forgery :refer :all]
[ring.middleware.json :refer [wrap-json-body]])
(:import com.mchange.v2.c3p0.ComboPooledDataSource))
(def db-spec {:dbtype "postgresql"
@ -38,25 +41,38 @@
ST_AsGeoJSON(loc) as location,
ST_Distance(
loc,
ST_GeogFromText('SRID=4326;POINT(-97.7286718 30.3033267)')
@LOCATION@
) / 1609 as distance
FROM food_items
WHERE
ST_DWithin(
loc,
ST_GeogFromText('SRID=4326;POINT(-97.7286718 30.3033267)'),
10 * 1609
@LOCATION@,
@DISTANCE@ * 1609
)
ORDER BY distance ASC;")
(jdbc/query @pooled-db
[location-query])
(defn point-text [lng lat]
(->
"ST_GeogFromText('SRID=4326;POINT(@LONGITUDE@ @LATITUDE@)')"
(str/replace "@LONGITUDE@" (str lng))
(str/replace "@LATITUDE@" (str lat))))
(defn build-fooditems-query [lng lat dist]
(->
location-query
(str/replace "@LOCATION@" (point-text (str lng) (str lat)))
(str/replace "@DISTANCE@" (str dist))))
(defn uuid-to-string [key value]
(if (instance? java.util.UUID value) (.toString value) value))
(defn get-coords [item]
(-> item (get :location) json/read-str (get "coordinates")))
(->
item
(get :location)
json/read-str
(get "coordinates")))
(defn build-lat-lng [[lng lat]]
(hash-map :longitude lng :latitude lat))
@ -66,22 +82,30 @@
(hash-map :longitude lng :latitude lat)))
(defn parse-location [item]
(-> item build-latlng (merge item) (dissoc :location)))
(->
item
build-latlng
(merge item)
(dissoc :location)))
(defn food-items-to-json [response]
(map parse-location response))
(defn food-items-to-json [query-result]
(map parse-location query-result))
(defn food-items-handler [location orderby filter]
(defn food-items-handler [{{lat "lat" lng "lng" filter "filter" orderby "orderby"} :body}]
(json/write-str
(hash-map
:orderby orderby
:filter filter
:fooditems (food-items-to-json (jdbc/query @pooled-db [location-query])))
:fooditems (food-items-to-json
(jdbc/query @pooled-db [(build-fooditems-query lng lat (get filter "radius"))])))
:value-fn uuid-to-string))
(defroutes app-routes
(GET "/fooditems" [location orderby filter] (food-items-handler location orderby filter))
(GET "/" [] (str {:csrf-token
*anti-forgery-token*}))
(POST "/test" req "ok")
(POST "/fooditems" req (wrap-json-body food-items-handler))
(GET "/echo" [location orderby filter] (str location orderby filter)))
(def app
(wrap-defaults app-routes site-defaults))
(wrap-defaults app-routes (assoc-in site-defaults [:security :anti-forgery] false)))