gered/clj-hl7-fhir
Archived
1
0
Fork 0
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

update http request functions, adding basic support for POST/PUT/DELETE

Browse source
This commit is contained in:
Gered 2014-07-08 14:24:55 -04:00
parent 2dda8d9bbf
commit aa32c20ba7
2 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/clj_hl7_fhir/core.clj
View file

@ -8,9 +8,14 @@
(defn- ->fhir-resource-name [x] (defn- ->fhir-resource-name [x]
(name (->CamelCase x))) (name (->CamelCase x)))
(defn- fhir-get-request [base-url resource-url & [params]] (defn- fhir-request [type base-url resource-url & {:keys [params body]}]
(let [query (map->query-string params)] (let [query (map->query-string params)
(http-get-json (build-url base-url resource-url query)))) url (build-url base-url resource-url query)]
(case type
:get (http-get-json url)
:post (http-post-json url body)
:put (http-put-json url body)
:delete (http-delete-json url body))))
(defn- ->search-param-name [parameter & [modifier]] (defn- ->search-param-name [parameter & [modifier]]
(keyword (keyword
@ -174,7 +179,7 @@
relative url: http://hl7.org/implement/standards/fhir/references.html#atom-rel" relative url: http://hl7.org/implement/standards/fhir/references.html#atom-rel"
([base-url relative-resource-url] ([base-url relative-resource-url]
(try (try
(fhir-get-request (fhir-request :get
base-url base-url
relative-resource-url) relative-resource-url)
(catch ExceptionInfo ex (catch ExceptionInfo ex
@ -207,10 +212,10 @@
[base-url type id] [base-url type id]
(let [resource-name (->fhir-resource-name type) (let [resource-name (->fhir-resource-name type)
url-components ["/" resource-name]] url-components ["/" resource-name]]
(fhir-get-request (fhir-request :get
base-url base-url
(apply join-paths url-components) (apply join-paths url-components)
{:_id id}))) :params {:_id id})))
(defn search (defn search
"searches for resources on a FHIR server. multiple parameters are ANDed together. use of the search "searches for resources on a FHIR server. multiple parameters are ANDed together. use of the search
@ -223,15 +228,15 @@
[base-url type where & params] [base-url type where & params]
(let [resource-name (->fhir-resource-name type) (let [resource-name (->fhir-resource-name type)
url-components ["/" resource-name]] url-components ["/" resource-name]]
(fhir-get-request (fhir-request :get
base-url base-url
(apply join-paths url-components) (apply join-paths url-components)
(merge :params (merge
(search-params->query-map where) (search-params->query-map where)
(apply hash-map (if (and (seq? params) (apply hash-map (if (and (seq? params)
(= 1 (count params))) (= 1 (count params)))
(first params) (first params)
params)))))) params))))))
(defn search-and-fetch (defn search-and-fetch
"same as search, but automatically fetches all pages of resources returning a single bundle "same as search, but automatically fetches all pages of resources returning a single bundle

18
src/clj_hl7_fhir/util.clj
View file

@ -76,7 +76,19 @@
(assoc :query params) (assoc :query params)
(str))) (str)))
(defn http-get-json [url] (defn- http-request [f url & [params]]
(-> (http/get url {:accept "application/json+fhir"}) (-> (f url (merge {:accept "application/json+fhir"} params))
:body :body
(json/parse-string true))) (json/parse-string true)))
(defn http-get-json [url]
(http-request http/get url))
(defn http-post-json [url & [body]]
(http-request http/post url (if body {:body body})))
(defn http-put-json [url & [body]]
(http-request http/put url (if body {:body body})))
(defn http-delete-json [url & [body]]
(http-request http/delete url (if body {:body body})))