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

clean up response error handling

Browse source
This commit is contained in:
Gered 2014-07-14 11:03:51 -04:00
parent 04c8a56390
commit d3f52d6643
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/clj_hl7_fhir/core.clj
View file

@ -9,12 +9,6 @@
(defn- ->fhir-resource-name [x] (defn- ->fhir-resource-name [x]
(name (->CamelCase x))) (name (->CamelCase x)))
(defn- get-exception-fhir-body [ex]
(let [resp-content-type (get-in (ex-data ex) [:object :headers "Content-Type"])
fhir-response? (.contains resp-content-type "application/json+fhir")]
(if fhir-response?
(json/parse-string (get-in (ex-data ex) [:object :body]) true))))
(defn- fhir-request [type base-url resource-url & {:keys [params body]}] (defn- fhir-request [type base-url resource-url & {:keys [params body]}]
(let [query (map->query-string params) (let [query (map->query-string params)
url (build-url base-url resource-url query)] url (build-url base-url resource-url query)]
@ -25,9 +19,15 @@
:put (http-put-json url body) :put (http-put-json url body)
:delete (http-delete-json url body)) :delete (http-delete-json url body))
(catch ExceptionInfo ex (catch ExceptionInfo ex
(if-let [fhir-response (get-exception-fhir-body ex)] (let [{:keys [status body headers]} (:object (ex-data ex))
fhir-response fhir-resource-response? (.contains (get headers "Content-Type") "application/json+fhir")]
(throw ex)))))) (throw (ex-info (str "FHIR request failed: HTTP " status)
{:status status
:fhir-resource? fhir-resource-response?
:response
(if fhir-resource-response?
(json/parse-string body true)
body)})))))))
(defn- ->search-param-name [parameter & [modifier]] (defn- ->search-param-name [parameter & [modifier]]
(keyword (keyword
@ -195,7 +195,7 @@
base-url base-url
relative-resource-url) relative-resource-url)
(catch ExceptionInfo ex (catch ExceptionInfo ex
(let [http-status (get-in (ex-data ex) [:object :status])] (let [http-status (:status (ex-data ex))]
; TODO: do we want to handle 410 differently? either way, the resource is not available ; TODO: do we want to handle 410 differently? either way, the resource is not available
; though, a 410 could indicate to the caller that it might be available under a ; though, a 410 could indicate to the caller that it might be available under a
; previous version ... ; previous version ...