refactor: remove duplicate code

Author: krvital

src/aidbox_sdk/converter.clj

@@ -117,11 +117,12 @@
               (or (:required schema) [])
               (seq (:elements schema)))
         backbone-elements (remove empty? (:backbone-elements data))]
-    (conj data
-          {:backbone-elements
-           (if (empty? backbone-elements)
-             []
-             (map (fn [[k, v]] (compile-backbone name k v)) backbone-elements))})))
+    (-> data
+        (assoc :backbone-elements
+               (if (empty? backbone-elements)
+                 []
+                 (map (fn [[k, v]] (compile-backbone name k v)) backbone-elements)))
+        (assoc :base "BackboneElement"))))
 
 (defn- clear-backbone-elements [resource-type schema]
   (->> (:backbone-elements schema)

src/aidbox_sdk/generator/dotnet.clj

@@ -295,25 +295,16 @@
                constraint-schemas)))))
 
 (defn generate-constraint-module [schema]
-  (let [backbone-elements-classes (->> (:backbone-elements schema)
-                                       (map #(assoc % :base "BackboneElement"))
-                                       (mapv generate-class))
-        resource-class (generate-class schema backbone-elements-classes)]
-    (generate-module
-     :name (package->module-name (:package schema))
-     :deps [{:module "Aidbox.FHIR.Base" :members []}
-            {:module "Aidbox.FHIR.Utils" :members []}]
-     :classes resource-class)))
+  (generate-module
+   :name (package->module-name (:package schema))
+   :deps [{:module "Aidbox.FHIR.Base" :members []}
+          {:module "Aidbox.FHIR.Utils" :members []}]
+   :classes (generate-class schema (map generate-class schema))))
 
 ;;
 ;; main
 ;;
 
-(defn generate-backbone-classes [ir-schema]
-  (->> (ir-schema :backbone-elements)
-       (map #(assoc % :base "BackboneElement"))
-       (map generate-class)))
-
 (defn datatypes-file-path []
   (io/file "Base.cs"))
 
@@ -333,7 +324,7 @@
                 :name "Aidbox.FHIR.Base"
                 :classes (map (fn [ir-schema]
                                 (generate-class ir-schema
-                                                (generate-backbone-classes ir-schema)))
+                                                (map generate-class (:backbone-elements ir-schema))))
                               ir-schemas))}])
 
   (generate-resource-module [_ ir-schema]
@@ -343,7 +334,7 @@
                :deps [{:module "Aidbox.FHIR.Base" :members []}
                       {:module "Aidbox.FHIR.Utils" :members []}]
                :classes [(generate-class ir-schema
-                                         (generate-backbone-classes ir-schema))])})
+                                         (map generate-class (:backbone-elements ir-schema)))])})
 
   (generate-search-params [_ ir-schemas]
     (map (fn [ir-schema]

src/aidbox_sdk/generator/python.clj

@@ -167,13 +167,6 @@
        (flatten)
        (str/join "\n\n")))
 
-(defn generate-backbone-classes
-  "Generates classes from schema's backbone elements."
-  [ir-schema]
-  (->> (ir-schema :backbone-elements)
-       (map #(assoc % :base "BackboneElement"))
-       (map generate-class)))
-
 ;;
 ;; Main
 ;;
@@ -187,7 +180,8 @@
                        {:module "typing" :members ["Optional" "List"]}]
                 :classes (map (fn [ir-schema]
                                 (generate-class ir-schema
-                                                (generate-backbone-classes ir-schema)))
+                                                (map generate-class (:backbone-elements ir-schema))
+                                                ))
                               ir-schemas))}])
 
   (generate-resource-module [_ ir-schema]
@@ -197,7 +191,7 @@
                       {:module "typing" :members ["Optional" "List"]}
                       {:module "..base" :members ["*"]}]
                :classes [(generate-class ir-schema
-                                         (generate-backbone-classes ir-schema))])})
+                                         (map generate-class (:backbone-elements ir-schema)))])})
 
   (generate-search-params [_ ir-schemas]
     (map (fn [ir-schema]
@@ -219,7 +213,7 @@
                               {:module "typing" :members ["Optional" "List"]}
                               {:module "..base" :members ["*"]}]
                        :classes (generate-class (assoc schema :url constraint-name)
-                                                (generate-backbone-classes schema)))})
+                                                (map generate-class (:backbone-elements schema))))})
           constraint-ir-schemas))
 
   (generate-sdk-files [_] (generator/prepare-sdk-files :python)))

src/aidbox_sdk/generator/typescript.clj

@@ -127,13 +127,6 @@
        (flatten)
        (str/join "\n\n")))
 
-(defn generate-backbone-classes
-  "Generates classes from schema's backbone elements."
-  [ir-schema]
-  (->> (ir-schema :backbone-elements)
-       (map #(assoc % :base "BackboneElement"))
-       (map generate-class)))
-
 (defrecord TypeScriptCodeGenerator []
   CodeGenerator
   (generate-datatypes [_ ir-schemas]
@@ -144,13 +137,13 @@
                               (sort-by :base)
                               (map (fn [ir-schema]
                                      (generate-class ir-schema
-                                                     (generate-backbone-classes ir-schema))))))}])
+                                                     (map generate-class (:backbone-elements ir-schema)))))))}])
   (generate-resource-module [_ ir-schema]
     {:path (resource-file-path ir-schema)
      :content (generate-module
                {:deps [{:module "../datatypes" :members (:deps ir-schema)}]
                 :classes [(generate-class ir-schema
-                                          (generate-backbone-classes ir-schema))]})})
+                                          (map generate-class (:backbone-elements ir-schema)))]})})
 
   (generate-search-params [_ ir-schemas] []
     (map (fn [ir-schema]
@@ -170,7 +163,7 @@
              :content (generate-module
                        :deps [{:module "../datatypes" :members (:deps schema)}]
                        :classes (generate-class (assoc schema :url constraint-name)
-                                                (generate-backbone-classes schema)))})
+                                                (map generate-class (:backbone-elements schema))))})
           ir-schemas))
   (generate-sdk-files [this] (generator/prepare-sdk-files :typescript)))
 

test/aidbox_sdk/converter_test.clj

@@ -48,4 +48,6 @@
     (is
      (= fixtures/observation-constraints-ir-schema
         (sut/convert-constraints fixtures/observation-constraints
-                                 [fixtures/observation-ir-schema])))))
+                                 [fixtures/observation-ir-schema])
+
+        ))))