From b86691267c2a7c2e45c40f4584a5693855d581e7 Mon Sep 17 00:00:00 2001 From: Andrew Zabelin Date: Mon, 5 Feb 2024 17:47:54 +0300 Subject: [PATCH] fix(python core): fix codeable concept patterns --- src/python-generator/second-try/main.clj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/python-generator/second-try/main.clj b/src/python-generator/second-try/main.clj index e8d42ad..726237a 100644 --- a/src/python-generator/second-try/main.clj +++ b/src/python-generator/second-try/main.clj @@ -100,7 +100,7 @@ (if-let [pattern (some #(when (= (name (first %)) (:name item)) (last %)) patterns)] (case (:value item) "str" (assoc item :value (:pattern pattern) :literal true) - "CodeableConcept" (conj item (hash-map :value (str (str/join (map help/uppercase-first-letter (str/split (help/get-resource-name constraint-name) #"-"))) (str/join (map help/uppercase-first-letter (str/split (:name item) #"-"))) " = " (str/join (map help/uppercase-first-letter (str/split (help/get-resource-name constraint-name) #"-"))) (str/join (map help/uppercase-first-letter (str/split (:name item) #"-"))) "()"))) + "CodeableConcept" (conj item (hash-map :value (str (str/join (map help/uppercase-first-letter (str/split (help/get-resource-name constraint-name) #"-"))) (str/join (map help/uppercase-first-letter (str/split (:name item) #"-")))) :codeable-concept-pattern true)) "Quantity" item item) item)) (:elements schema)) (hash-map :elements) (conj schema) @@ -138,7 +138,8 @@ ((if (:array item) (fn [s] (str "List[" s "]")) str)) ((if (:literal item) (fn [s] (str "Literal[\"" s "\"] = " "\"" s "\"")) str)) ((if (and (not (:required item)) (not (:literal item))) (fn [s] (str "Optional[" s "]")) str)) - ((if (and (not (:required item)) (not (:literal item))) help/append-default-none str)) + ((if (and (not (:required item)) (not (:literal item))) (fn [s] (str s " = None")) str)) + ((if (and (:required item) (:codeable-concept-pattern item)) (fn [s] (str s " = " (:value item) "()")) str)) ;; ((if (and (not (:required item)) (:array item)) help/append-default-vector str)) (str "\t" (:name item) ": ") (str "\n")))) elements)