make sure that we can access ContainedResources after parsing resource

When unmarshalling codes, if the valueset only contains lowercase codes, attempt to lowercase the input and make it case insensitive (Some EHRs screw this up -- epic).

Author: AnalogJ

cmd/root.go

@@ -23,7 +23,7 @@ import (
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:     "gofhir-models-gen",
-	Version: "0.0.11",
+	Version: "0.0.12",
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.

cmd/valueSet.go

@@ -66,11 +66,22 @@ func generateValueSet(resources ResourceMap, valueSet fhir.ValueSet) (*jen.File,
 		Id("UnmarshalJSON").
 		Params(jen.Id("json").Op("[]").Byte()).
 		Error().
-		Block(
-			jen.Id("s").Op(":=").Qual("strings", "Trim").Call(jen.String().Call(jen.Id("json")), jen.Lit(`"`)),
-			jen.Switch(jen.Id("s")).BlockFunc(unmarshalRoot(*valueSet.Name, codeSystem.Concept)),
-			jen.Return(jen.Nil()),
-		)
+		BlockFunc(func(group *jen.Group) {
+			//check if all codes are lowercase
+			requireLowercase := true
+			for _, concept := range codeSystem.Concept {
+				if !isLowerCase(concept.Code) {
+					requireLowercase = false
+				}
+			}
+
+			group.Id("s").Op(":=").Qual("strings", "Trim").Call(jen.String().Call(jen.Id("json")), jen.Lit(`"`))
+			if requireLowercase {
+				group.Id("s").Op("=").Qual("strings", "ToLower").Call(jen.Id("s"))
+			}
+			group.Switch(jen.Id("s")).BlockFunc(unmarshalRoot(*valueSet.Name, codeSystem.Concept))
+			group.Return(jen.Nil())
+		})
 
 	// String function
 	file.Func().
@@ -224,3 +235,7 @@ func definitions(valueSetName string, concepts []fhir.CodeSystemConcept) func(gr
 		}
 	}
 }
+
+func isLowerCase(s string) bool {
+	return s == strings.ToLower(s)
+}

fhir/bundle.go

@@ -103,6 +103,11 @@ func (r Bundle) ResourceRef() (string, *string) {
 	return "Bundle", r.Id
 }
 
+// This function returns resource reference information
+func (r Bundle) ContainedResources() []json.RawMessage {
+	return nil
+}
+
 type OtherBundle Bundle
 
 // MarshalJSON marshals the given Bundle as JSON into a byte slice

fhir/codeSystem.go

@@ -27,6 +27,7 @@ type CodeSystem struct {
 	ImplicitRules     *string                     `bson:"implicitRules,omitempty" json:"implicitRules,omitempty"`
 	Language          *string                     `bson:"language,omitempty" json:"language,omitempty"`
 	Text              *Narrative                  `bson:"text,omitempty" json:"text,omitempty"`
+	Contained         []json.RawMessage           `bson:"contained,omitempty" json:"contained,omitempty"`
 	Extension         []Extension                 `bson:"extension,omitempty" json:"extension,omitempty"`
 	ModifierExtension []Extension                 `bson:"modifierExtension,omitempty" json:"modifierExtension,omitempty"`
 	Url               *string                     `bson:"url,omitempty" json:"url,omitempty"`
@@ -125,6 +126,11 @@ func (r CodeSystem) ResourceRef() (string, *string) {
 	return "CodeSystem", r.Id
 }
 
+// This function returns resource reference information
+func (r CodeSystem) ContainedResources() []json.RawMessage {
+	return r.Contained
+}
+
 type OtherCodeSystem CodeSystem
 
 // MarshalJSON marshals the given CodeSystem as JSON into a byte slice

fhir/structureDefinition.go

@@ -27,6 +27,7 @@ type StructureDefinition struct {
 	ImplicitRules     *string                          `bson:"implicitRules,omitempty" json:"implicitRules,omitempty"`
 	Language          *string                          `bson:"language,omitempty" json:"language,omitempty"`
 	Text              *Narrative                       `bson:"text,omitempty" json:"text,omitempty"`
+	Contained         []json.RawMessage                `bson:"contained,omitempty" json:"contained,omitempty"`
 	Extension         []Extension                      `bson:"extension,omitempty" json:"extension,omitempty"`
 	ModifierExtension []Extension                      `bson:"modifierExtension,omitempty" json:"modifierExtension,omitempty"`
 	Url               string                           `bson:"url" json:"url"`
@@ -99,6 +100,11 @@ func (r StructureDefinition) ResourceRef() (string, *string) {
 	return "StructureDefinition", r.Id
 }
 
+// This function returns resource reference information
+func (r StructureDefinition) ContainedResources() []json.RawMessage {
+	return r.Contained
+}
+
 type OtherStructureDefinition StructureDefinition
 
 // MarshalJSON marshals the given StructureDefinition as JSON into a byte slice

fhir/valueSet.go

@@ -27,6 +27,7 @@ type ValueSet struct {
 	ImplicitRules     *string            `bson:"implicitRules,omitempty" json:"implicitRules,omitempty"`
 	Language          *string            `bson:"language,omitempty" json:"language,omitempty"`
 	Text              *Narrative         `bson:"text,omitempty" json:"text,omitempty"`
+	Contained         []json.RawMessage  `bson:"contained,omitempty" json:"contained,omitempty"`
 	Extension         []Extension        `bson:"extension,omitempty" json:"extension,omitempty"`
 	ModifierExtension []Extension        `bson:"modifierExtension,omitempty" json:"modifierExtension,omitempty"`
 	Url               *string            `bson:"url,omitempty" json:"url,omitempty"`
@@ -160,6 +161,11 @@ func (r ValueSet) ResourceRef() (string, *string) {
 	return "ValueSet", r.Id
 }
 
+// This function returns resource reference information
+func (r ValueSet) ContainedResources() []json.RawMessage {
+	return r.Contained
+}
+
 type OtherValueSet ValueSet
 
 // MarshalJSON marshals the given ValueSet as JSON into a byte slice