test: update tests and fixtures

Author: krvital

src/aidbox_sdk/generator/dotnet.clj

@@ -96,7 +96,7 @@
                 "new ")
               (when (and (:required element)
                          (not (:meta element))) "required ")
-              (:value element)
+              (or (:value element) (:type element))
               (:generic element)
               (when (:array element) "[]")
               (when (and (not (:required element))
@@ -133,12 +133,10 @@
                               (assoc % :value "T")
                               %)))
 
-        properties (try (->> elements
-                             (map generate-property)
-                             (map u/add-indent)
-                             (str/join "\n"))
-                        (catch Exception _
-                          (prn schema)))
+        properties (->> elements
+                        (map generate-property)
+                        (map u/add-indent)
+                        (str/join "\n"))
 
         base-class (cond (= base-class "Resource") "Base.Resource"
                          (= base-class "DomainResource") "DomainResource, IResource"
@@ -213,13 +211,13 @@
 
 (defn apply-choices [choices schema]
   (->> choices
-       (map (fn [[key, item]]
+       (map (fn [[key item]]
               (set/difference
                (set (:choices (first (filter #(= (:name %) (name key)) schema))))
                (set (:choices item)))))
        (reduce set/union #{})
-       ((fn [choises-to-exclude]
-          (filter #(not (contains? choises-to-exclude (:name %))) schema)))))
+       ((fn [choices-to-exclude]
+          (filter #(not (contains? choices-to-exclude (:name %))) schema)))))
 
 (defn pattern-codeable-concept [name schema]
   (->> (str "}")
@@ -233,7 +231,7 @@
                                     (str (when (contains? code :display) (str "\tpublic new string Display { get; } = \"" (:display code) "\";\n")))
                                     (str "\n\nclass Coding" (str/join (str/split (:code code) #"-")) " : Coding\n{\n"))) coding))) "\n")))
 
-(defn create-single-pattern [constraint-name, [key, schema], elements]
+(defn create-single-pattern [constraint-name [key schema] elements]
   (case (url->resource-name (some #(when (= (name key) (:name %)) (:value %)) elements))
     "CodeableConcept" (pattern-codeable-concept (str (uppercase-first-letter (url->resource-name constraint-name)) (uppercase-first-letter (subs (str key) 1))) schema) ""))
 
@@ -242,14 +240,22 @@
               (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 uppercase-first-letter (str/split (url->resource-name constraint-name) #"-"))) (str/join (map uppercase-first-letter (str/split (:name item) #"-")))) :codeable-concept-pattern true))
+                  "CodeableConcept" (conj item (hash-map :value (str
+                                                                 (str/join
+                                                                  (map uppercase-first-letter
+                                                                       (str/split (url->resource-name constraint-name) #"-")))
+                                                                 (str/join (map uppercase-first-letter
+                                                                                (str/split (:name item) #"-"))))
+                                                         :codeable-concept-pattern true))
                   "Quantity" item item) item)) (:elements schema))
        (hash-map :elements)
        (conj schema (hash-map :patterns (concat (get schema :patterns []) (map (fn [item] (create-single-pattern constraint-name item (:elements schema))) patterns))))))
 
 (defn add-meta [constraint-name elements]
   (->> (filter #(not (= (:name %) "meta")) elements)
-       (concat [{:name "meta" :required true :value (str "Meta") :meta (str " = new() { Profile = [\"" constraint-name "\"] };")}])))
+       (concat [{:name "meta"
+                 :required true :value "Meta"
+                 :meta (str " = Meta(profile=[\"" constraint-name "\"]);")}])))
 
 (defn apply-single-constraint [constraint parent-schema]
   (->> (:elements parent-schema)

test/aidbox_sdk/fixtures/schemas.clj

@@ -2382,3 +2382,38 @@
     :base ["Patient"],
     :version "1.0.0",
     :fqn "hl7.fhir.uv.extensions.r4#1.0.0/patient-extensions-Patient-age"}])
+
+(def patient-search-params-ir-schemas
+  [{:name "Patient"
+    :base "DomainResource"
+    :elements
+    [{:type "string" :name "_id"}
+     {:type "string" :name "active"}
+     {:type "string" :name "address"}
+     {:type "string" :name "address-city"}
+     {:type "string" :name "address-country"}
+     {:type "string" :name "address-postalcode"}
+     {:type "string" :name "address-state"}
+     {:type "string" :name "address-use"}
+     {:type "string" :name "age"}
+     {:type "string" :name "birthOrderBoolean"}
+     {:type "string" :name "birthdate"}
+     {:type "string" :name "death-date"}
+     {:type "string" :name "deceased"}
+     {:type "string" :name "email"}
+     {:type "string" :name "ethnicity"}
+     {:type "string" :name "family"}
+     {:type "string" :name "gender"}
+     {:type "string" :name "general-practitioner"}
+     {:type "string" :name "given"}
+     {:type "string" :name "identifier"}
+     {:type "string" :name "language"}
+     {:type "string" :name "link"}
+     {:type "string" :name "mothersMaidenName"}
+     {:type "string" :name "name"}
+     {:type "string" :name "organization"}
+     {:type "string" :name "part-agree"}
+     {:type "string" :name "phone"}
+     {:type "string" :name "phonetic"}
+     {:type "string" :name "race"}
+     {:type "string" :name "telecom"}]}])

test/aidbox_sdk/generator/dotnet_test.clj

@@ -56,27 +56,26 @@
 
     (testing ""))
 
-(deftest generate-datatypes
+(deftest test-generate-datatypes
   (is
    (= (sut/generate-datatypes generator [fixtures/coding-ir-schema])
       [{:path (io/file "Base.cs"),
         :content
         "namespace Aidbox.FHIR.Base;\n\npublic class Coding : Element\n{\n    public string? Code { get; set; }\n    public string? System { get; set; }\n    public string? Display { get; set; }\n    public string? Version { get; set; }\n    public bool? UserSelected { get; set; }\n}"}])))
 
-(deftest generate-resources
+(deftest test-generate-resources
   (is
    (= (sut/generate-resource-module generator fixtures/patient-ir-schema)
       {:path (io/file "hl7-fhir-r4-core/Patient.cs"),
        :content
        "using Aidbox.FHIR.Base;\nusing Aidbox.FHIR.Utils;\n\nnamespace Aidbox.FHIR.R4.Core;\n\npublic class Patient : DomainResource, IResource\n{\n    public bool? MultipleBirthBoolean { get; set; }\n    public Base.Address[]? Address { get; set; }\n    public string? DeceasedDateTime { get; set; }\n    public Base.ResourceReference? ManagingOrganization { get; set; }\n    public bool? DeceasedBoolean { get; set; }\n    public Base.HumanName[]? Name { get; set; }\n    public string? BirthDate { get; set; }\n    public int? MultipleBirthInteger { get; set; }\n    public object? MultipleBirth    \n    {\n        get\n        {\n            if (MultipleBirthBoolean is not null)\n            {\n                return MultipleBirthBoolean;\n            }\n    \n            if (MultipleBirthInteger is not null)\n            {\n                return MultipleBirthInteger;\n            }\n    \n            return null;\n        }\n    \n        set\n        {\n            if (value?.GetType() == typeof(bool))\n            {\n                MultipleBirthBoolean = (bool)value;\n                return;\n            }\n    \n            if (value?.GetType() == typeof(int))\n            {\n                MultipleBirthInteger = (int)value;\n                return;\n            }\n    \n            throw new ArgumentException(\"Invalid type provided\");\n        }\n    }\n    public object? Deceased    \n    {\n        get\n        {\n            if (DeceasedDateTime is not null)\n            {\n                return DeceasedDateTime;\n            }\n    \n            if (DeceasedBoolean is not null)\n            {\n                return DeceasedBoolean;\n            }\n    \n            return null;\n        }\n    \n        set\n        {\n            if (value?.GetType() == typeof(string))\n            {\n                DeceasedDateTime = (string)value;\n                return;\n            }\n    \n            if (value?.GetType() == typeof(bool))\n            {\n                DeceasedBoolean = (bool)value;\n                return;\n            }\n    \n            throw new ArgumentException(\"Invalid type provided\");\n        }\n    }\n    public Base.Attachment[]? Photo { get; set; }\n    public Patient_Link[]? Link { get; set; }\n    public bool? Active { get; set; }\n    public Patient_Communication[]? Communication { get; set; }\n    public Base.Identifier[]? Identifier { get; set; }\n    public Base.ContactPoint[]? Telecom { get; set; }\n    public Base.ResourceReference[]? GeneralPractitioner { get; set; }\n    public string? Gender { get; set; }\n    public Base.CodeableConcept? MaritalStatus { get; set; }\n    public Patient_Contact[]? Contact { get; set; }\n\n    public class Patient_Link : BackboneElement\n    {\n        public required string Type { get; set; }\n        public required Base.ResourceReference Other { get; set; }\n    }\n\n    public class Patient_Communication : BackboneElement\n    {\n        public required Base.CodeableConcept Language { get; set; }\n        public bool? Preferred { get; set; }\n    }\n\n    public class Patient_Contact : BackboneElement\n    {\n        public Base.HumanName? Name { get; set; }\n        public string? Gender { get; set; }\n        public Base.Period? Period { get; set; }\n        public Base.Address? Address { get; set; }\n        public Base.ContactPoint[]? Telecom { get; set; }\n        public Base.ResourceReference? Organization { get; set; }\n        public Base.CodeableConcept[]? Relationship { get; set; }\n    }\n}"})))
 
-(deftest generate-search-params
+(deftest test-generate-search-params
   (is
-   (= (sut/generate-search-params generator fixtures/patient-search-params-schemas
-                                  [fixtures/patient-fhir-schema])
+   (= (sut/generate-search-params generator fixtures/patient-search-params-ir-schemas)
       [{:path (io/file "search/PatientSearchParameters.cs"),
         :content
-        "namespace Aidbox.FHIR.Search;\n\npublic class PatientSearchParameters : DomainResourceSearchParameters\n{\n    public string? Id { get; set; }\n    public string? Active { get; set; }\n    public string? Address { get; set; }\n    public string? AddressCity { get; set; }\n    public string? AddressCountry { get; set; }\n    public string? AddressPostalcode { get; set; }\n    public string? AddressState { get; set; }\n    public string? AddressUse { get; set; }\n    public string? Birthdate { get; set; }\n    public string? DeathDate { get; set; }\n    public string? Deceased { get; set; }\n    public string? Email { get; set; }\n    public string? Ethnicity { get; set; }\n    public string? Family { get; set; }\n    public string? Gender { get; set; }\n    public string? GeneralPractitioner { get; set; }\n    public string? Given { get; set; }\n    public string? Identifier { get; set; }\n    public string? Language { get; set; }\n    public string? Link { get; set; }\n    public string? Name { get; set; }\n    public string? Organization { get; set; }\n    public string? PartAgree { get; set; }\n    public string? Phone { get; set; }\n    public string? Phonetic { get; set; }\n    public string? Race { get; set; }\n    public string? Telecom { get; set; }\n}"}])))
+        "namespace Aidbox.FHIR.Search;\n\npublic class PatientSearchParameters : DomainResourceSearchParameters\n{\n    public string? Id { get; set; }\n    public string? Active { get; set; }\n    public string? Address { get; set; }\n    public string? AddressCity { get; set; }\n    public string? AddressCountry { get; set; }\n    public string? AddressPostalcode { get; set; }\n    public string? AddressState { get; set; }\n    public string? AddressUse { get; set; }\n    public string? Age { get; set; }\n    public string? BirthOrderBoolean { get; set; }\n    public string? Birthdate { get; set; }\n    public string? DeathDate { get; set; }\n    public string? Deceased { get; set; }\n    public string? Email { get; set; }\n    public string? Ethnicity { get; set; }\n    public string? Family { get; set; }\n    public string? Gender { get; set; }\n    public string? GeneralPractitioner { get; set; }\n    public string? Given { get; set; }\n    public string? Identifier { get; set; }\n    public string? Language { get; set; }\n    public string? Link { get; set; }\n    public string? MothersMaidenName { get; set; }\n    public string? Name { get; set; }\n    public string? Organization { get; set; }\n    public string? PartAgree { get; set; }\n    public string? Phone { get; set; }\n    public string? Phonetic { get; set; }\n    public string? Race { get; set; }\n    public string? Telecom { get; set; }\n}"}])))
 
 ;; TODO
 #_(deftest generate-constraints