luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-17 16:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into patch-1

Browse source
This commit is contained in:
Olim Saidov 2020-02-05 14:46:32 +05:00 committed by GitHub
commit a7a0b0e287
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/reitit-malli/src/reitit/coercion/malli.cljc
View file

@ -75,18 +75,18 @@
;; swagger ;; swagger
;; ;;
(defmulti extract-parameter (fn [in _] in)) (defmulti extract-parameter (fn [in _ _] in))
(defmethod extract-parameter :body [_ schema] (defmethod extract-parameter :body [_ schema options]
(let [swagger-schema (swagger/transform schema {:in :body, :type :parameter})] (let [swagger-schema (swagger/transform schema (merge options {:in :body, :type :parameter}))]
[{:in "body" [{:in "body"
:name (:title swagger-schema "") :name (:title swagger-schema "")
:description (:description swagger-schema "") :description (:description swagger-schema "")
:required (not= :maybe (m/name schema)) :required (not= :maybe (m/name schema))
:schema swagger-schema}])) :schema swagger-schema}]))
(defmethod extract-parameter :default [in schema] (defmethod extract-parameter :default [in schema options]
(let [{:keys [properties required]} (swagger/transform schema {:in in, :type :parameter})] (let [{:keys [properties required]} (swagger/transform schema (merge options {:in in, :type :parameter}))]
(mapv (mapv
(fn [[k {:keys [type] :as schema}]] (fn [[k {:keys [type] :as schema}]]
(merge (merge
@ -135,7 +135,7 @@
(if parameters (if parameters
{:parameters {:parameters
(->> (for [[in schema] parameters (->> (for [[in schema] parameters
parameter (extract-parameter in (compile schema options))] parameter (extract-parameter in (compile schema options) options)]
parameter) parameter)
(into []))}) (into []))})
(if responses (if responses