|
125 | 125 | (created (str "productions/" (:id p)) {})) |
126 | 126 | (catch clojure.lang.ExceptionInfo e |
127 | 127 | (let [{:keys [error-id]} (ex-data e)] |
128 | | - (log/error error-id (ex-message e)) |
| 128 | + (log/error (ex-message e) error-id) |
129 | 129 | (case error-id |
130 | 130 | :duplicate-key (bad-request {:status-text (ex-message e)}) |
131 | 131 | (internal-server-error {:status-text (ex-message e)}))))))}}] |
|
311 | 311 | p (abacus/import-new-production tempfile)] |
312 | 312 | (created (str "productions/" (:id p)) {})) |
313 | 313 | (catch clojure.lang.ExceptionInfo e |
314 | | - (let [{:keys [error-id errors]} (ex-data e)] |
315 | | - (log/error error-id errors) |
| 314 | + (let [{:keys [error-id errors]} (ex-data e) |
| 315 | + message (ex-message e)] |
| 316 | + (log/error message error-id errors) |
316 | 317 | (case error-id |
317 | 318 | :duplicate-key |
318 | | - (bad-request {:status-text (ex-message e)}) |
| 319 | + (bad-request {:status-text message}) |
319 | 320 | :invalid-xml |
320 | 321 | (bad-request {:status-text "Upload of ABACUS XML failed" |
321 | 322 | :errors errors}) |
322 | | - (internal-server-error {:status-text (ex-message e)}))))))}}] |
| 323 | + (internal-server-error {:status-text message}))))))}}] |
323 | 324 | ["/recorded" |
324 | 325 | {:post {:summary "Mark a production as recorded" |
325 | 326 | :parameters {:multipart {:file multipart/temp-file-part}} |
|
329 | 330 | (abacus/import-recorded-production tempfile) |
330 | 331 | (no-content) |
331 | 332 | (catch clojure.lang.ExceptionInfo e |
332 | | - (let [{:keys [error-id errors]} (ex-data e)] |
333 | | - (log/error error-id errors) |
| 333 | + (let [{:keys [error-id errors]} (ex-data e) |
| 334 | + message (ex-message e)] |
| 335 | + (log/error message error-id errors) |
334 | 336 | (case error-id |
335 | 337 | :product-not-found (not-found) |
336 | | - :invalid-state (bad-request {:status-text (ex-message e)}) |
337 | | - :invalid-daisy-export (bad-request {:status-text (ex-message e)}) |
| 338 | + :invalid-state (bad-request {:status-text message}) |
| 339 | + :invalid-daisy-export (bad-request {:status-text message}) |
338 | 340 | :invalid-xml (bad-request {:status-text "Upload of ABACUS XML failed" :errors errors}) |
339 | | - :invalid-exported-production (bad-request {:status-text (ex-message e) :errors errors}) |
340 | | - (internal-server-error {:status-text (ex-message e)})))))))}}] |
| 341 | + :invalid-exported-production (bad-request {:status-text message :errors errors}) |
| 342 | + (internal-server-error {:status-text message})))))))}}] |
341 | 343 | ["/status" |
342 | 344 | {:post {:summary "Request the status of a production" |
343 | 345 | :parameters {:multipart {:file multipart/temp-file-part}} |
|
347 | 349 | (abacus/import-status-request tempfile) |
348 | 350 | (no-content) |
349 | 351 | (catch clojure.lang.ExceptionInfo e |
350 | | - (let [{:keys [error-id errors]} (ex-data e)] |
351 | | - (log/error error-id errors) |
| 352 | + (let [{:keys [error-id errors]} (ex-data e) |
| 353 | + message (ex-message e)] |
| 354 | + (log/error message error-id errors) |
352 | 355 | (case error-id |
353 | 356 | :product-not-found (not-found) |
354 | 357 | :invalid-xml (bad-request {:status-text "Upload of ABACUS XML failed" :errors errors}) |
355 | | - (internal-server-error {:status-text (ex-message e)})))))))}}] |
| 358 | + (internal-server-error {:status-text message})))))))}}] |
356 | 359 | ["/metadata" |
357 | 360 | {:post {:summary "Update the meta data of a production" |
358 | 361 | :parameters {:multipart {:file multipart/temp-file-part}} |
|
362 | 365 | (abacus/import-metadata-update tempfile) |
363 | 366 | (no-content)) |
364 | 367 | (catch clojure.lang.ExceptionInfo e |
365 | | - (let [{:keys [error-id errors]} (ex-data e)] |
366 | | - (log/error error-id errors) |
| 368 | + (let [{:keys [error-id errors]} (ex-data e) |
| 369 | + message (ex-message e)] |
| 370 | + (log/error message error-id errors) |
367 | 371 | (case error-id |
368 | 372 | :invalid-xml (bad-request {:status-text "Upload of ABACUS XML failed" |
369 | 373 | :errors errors}) |
370 | | - :product-not-found (not-found {:status-text (ex-message e)}) |
| 374 | + :product-not-found (not-found {:status-text message}) |
371 | 375 | (internal-server-error))))))}}]] |
372 | 376 | ["/vubis" |
373 | 377 | {:swagger {:tags ["Upload of Vubis export data"]}} |
|
0 commit comments