removing Resource. segment of FHIRpath expressions (not supported)

fastenhealth · Aug 13, 2023 · 4dad809 · 4dad809
1 parent ddbf650
commit 4dad809
Show file tree

Hide file tree

Showing 56 changed files with 277 additions and 275 deletions.
diff --git a/backend/pkg/models/database/fhir_account.go b/backend/pkg/models/database/fhir_account.go
@@ -149,7 +149,7 @@ func (s *FhirAccount) PopulateAndExtractSearchParameters(resourceRaw json.RawMes
 	}
 	// extracting Language
 	languageResult, err := vm.RunString(` 
-							LanguageResult = window.fhirpath.evaluate(fhirResource, 'Resource.language')
+							LanguageResult = window.fhirpath.evaluate(fhirResource, 'language')
 							LanguageProcessed = LanguageResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept
@@ -195,7 +195,7 @@ func (s *FhirAccount) PopulateAndExtractSearchParameters(resourceRaw json.RawMes
 		s.Language = []byte(languageResult.String())
 	}
 	// extracting LastUpdated
-	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.lastUpdated')[0]")
+	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.lastUpdated')[0]")
 	if err == nil && lastUpdatedResult.String() != "undefined" {
 		t, err := time.Parse(time.RFC3339, lastUpdatedResult.String())
 		if err == nil {
@@ -284,11 +284,11 @@ func (s *FhirAccount) PopulateAndExtractSearchParameters(resourceRaw json.RawMes
 		}
 	}
 	// extracting Profile
-	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'Resource.meta.profile'))")
+	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'meta.profile'))")
 	if err == nil && profileResult.String() != "undefined" {
 	}
 	// extracting SourceUri
-	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.source')[0]")
+	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.source')[0]")
 	if err == nil && sourceUriResult.String() != "undefined" {
 		s.SourceUri = sourceUriResult.String()
 	}
@@ -345,7 +345,7 @@ func (s *FhirAccount) PopulateAndExtractSearchParameters(resourceRaw json.RawMes
 	}
 	// extracting Tag
 	tagResult, err := vm.RunString(` 
-							TagResult = window.fhirpath.evaluate(fhirResource, 'Resource.meta.tag')
+							TagResult = window.fhirpath.evaluate(fhirResource, 'meta.tag')
 							TagProcessed = TagResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept

diff --git a/backend/pkg/models/database/fhir_adverse_event.go b/backend/pkg/models/database/fhir_adverse_event.go
@@ -280,7 +280,7 @@ func (s *FhirAdverseEvent) PopulateAndExtractSearchParameters(resourceRaw json.R
 	}
 	// extracting Language
 	languageResult, err := vm.RunString(` 
-							LanguageResult = window.fhirpath.evaluate(fhirResource, 'Resource.language')
+							LanguageResult = window.fhirpath.evaluate(fhirResource, 'language')
 							LanguageProcessed = LanguageResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept
@@ -326,7 +326,7 @@ func (s *FhirAdverseEvent) PopulateAndExtractSearchParameters(resourceRaw json.R
 		s.Language = []byte(languageResult.String())
 	}
 	// extracting LastUpdated
-	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.lastUpdated')[0]")
+	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.lastUpdated')[0]")
 	if err == nil && lastUpdatedResult.String() != "undefined" {
 		t, err := time.Parse(time.RFC3339, lastUpdatedResult.String())
 		if err == nil {
@@ -343,7 +343,7 @@ func (s *FhirAdverseEvent) PopulateAndExtractSearchParameters(resourceRaw json.R
 	if err == nil && locationResult.String() != "undefined" {
 	}
 	// extracting Profile
-	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'Resource.meta.profile'))")
+	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'meta.profile'))")
 	if err == nil && profileResult.String() != "undefined" {
 	}
 	// extracting Recorder
@@ -449,7 +449,7 @@ func (s *FhirAdverseEvent) PopulateAndExtractSearchParameters(resourceRaw json.R
 		s.Severity = []byte(severityResult.String())
 	}
 	// extracting SourceUri
-	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.source')[0]")
+	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.source')[0]")
 	if err == nil && sourceUriResult.String() != "undefined" {
 		s.SourceUri = sourceUriResult.String()
 	}
@@ -467,7 +467,7 @@ func (s *FhirAdverseEvent) PopulateAndExtractSearchParameters(resourceRaw json.R
 	}
 	// extracting Tag
 	tagResult, err := vm.RunString(` 
-							TagResult = window.fhirpath.evaluate(fhirResource, 'Resource.meta.tag')
+							TagResult = window.fhirpath.evaluate(fhirResource, 'meta.tag')
 							TagProcessed = TagResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept

diff --git a/backend/pkg/models/database/fhir_allergy_intolerance.go b/backend/pkg/models/database/fhir_allergy_intolerance.go
@@ -456,7 +456,7 @@ func (s *FhirAllergyIntolerance) PopulateAndExtractSearchParameters(resourceRaw
 	}
 	// extracting Language
 	languageResult, err := vm.RunString(` 
-							LanguageResult = window.fhirpath.evaluate(fhirResource, 'Resource.language')
+							LanguageResult = window.fhirpath.evaluate(fhirResource, 'language')
 							LanguageProcessed = LanguageResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept
@@ -515,7 +515,7 @@ func (s *FhirAllergyIntolerance) PopulateAndExtractSearchParameters(resourceRaw
 		}
 	}
 	// extracting LastUpdated
-	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.lastUpdated')[0]")
+	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.lastUpdated')[0]")
 	if err == nil && lastUpdatedResult.String() != "undefined" {
 		t, err := time.Parse(time.RFC3339, lastUpdatedResult.String())
 		if err == nil {
@@ -588,7 +588,7 @@ func (s *FhirAllergyIntolerance) PopulateAndExtractSearchParameters(resourceRaw
 		}
 	}
 	// extracting Profile
-	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'Resource.meta.profile'))")
+	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'meta.profile'))")
 	if err == nil && profileResult.String() != "undefined" {
 	}
 	// extracting Recorder
@@ -690,13 +690,13 @@ func (s *FhirAllergyIntolerance) PopulateAndExtractSearchParameters(resourceRaw
 		s.Severity = []byte(severityResult.String())
 	}
 	// extracting SourceUri
-	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.source')[0]")
+	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.source')[0]")
 	if err == nil && sourceUriResult.String() != "undefined" {
 		s.SourceUri = sourceUriResult.String()
 	}
 	// extracting Tag
 	tagResult, err := vm.RunString(` 
-							TagResult = window.fhirpath.evaluate(fhirResource, 'Resource.meta.tag')
+							TagResult = window.fhirpath.evaluate(fhirResource, 'meta.tag')
 							TagProcessed = TagResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept

diff --git a/backend/pkg/models/database/fhir_appointment.go b/backend/pkg/models/database/fhir_appointment.go
@@ -257,7 +257,7 @@ func (s *FhirAppointment) PopulateAndExtractSearchParameters(resourceRaw json.Ra
 	}
 	// extracting Language
 	languageResult, err := vm.RunString(` 
-							LanguageResult = window.fhirpath.evaluate(fhirResource, 'Resource.language')
+							LanguageResult = window.fhirpath.evaluate(fhirResource, 'language')
 							LanguageProcessed = LanguageResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept
@@ -303,7 +303,7 @@ func (s *FhirAppointment) PopulateAndExtractSearchParameters(resourceRaw json.Ra
 		s.Language = []byte(languageResult.String())
 	}
 	// extracting LastUpdated
-	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.lastUpdated')[0]")
+	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.lastUpdated')[0]")
 	if err == nil && lastUpdatedResult.String() != "undefined" {
 		t, err := time.Parse(time.RFC3339, lastUpdatedResult.String())
 		if err == nil {
@@ -371,7 +371,7 @@ func (s *FhirAppointment) PopulateAndExtractSearchParameters(resourceRaw json.Ra
 	if err == nil && practitionerResult.String() != "undefined" {
 	}
 	// extracting Profile
-	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'Resource.meta.profile'))")
+	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'meta.profile'))")
 	if err == nil && profileResult.String() != "undefined" {
 	}
 	// extracting ReasonCode
@@ -524,7 +524,7 @@ func (s *FhirAppointment) PopulateAndExtractSearchParameters(resourceRaw json.Ra
 	if err == nil && slotResult.String() != "undefined" {
 	}
 	// extracting SourceUri
-	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.source')[0]")
+	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.source')[0]")
 	if err == nil && sourceUriResult.String() != "undefined" {
 		s.SourceUri = sourceUriResult.String()
 	}
@@ -628,7 +628,7 @@ func (s *FhirAppointment) PopulateAndExtractSearchParameters(resourceRaw json.Ra
 	}
 	// extracting Tag
 	tagResult, err := vm.RunString(` 
-							TagResult = window.fhirpath.evaluate(fhirResource, 'Resource.meta.tag')
+							TagResult = window.fhirpath.evaluate(fhirResource, 'meta.tag')
 							TagProcessed = TagResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept

diff --git a/backend/pkg/models/database/fhir_binary.go b/backend/pkg/models/database/fhir_binary.go
@@ -78,7 +78,7 @@ func (s *FhirBinary) PopulateAndExtractSearchParameters(resourceRaw json.RawMess
 	// execute the fhirpath expression for each search parameter
 	// extracting Language
 	languageResult, err := vm.RunString(` 
-							LanguageResult = window.fhirpath.evaluate(fhirResource, 'Resource.language')
+							LanguageResult = window.fhirpath.evaluate(fhirResource, 'language')
 							LanguageProcessed = LanguageResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept
@@ -124,7 +124,7 @@ func (s *FhirBinary) PopulateAndExtractSearchParameters(resourceRaw json.RawMess
 		s.Language = []byte(languageResult.String())
 	}
 	// extracting LastUpdated
-	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.lastUpdated')[0]")
+	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.lastUpdated')[0]")
 	if err == nil && lastUpdatedResult.String() != "undefined" {
 		t, err := time.Parse(time.RFC3339, lastUpdatedResult.String())
 		if err == nil {
@@ -137,17 +137,17 @@ func (s *FhirBinary) PopulateAndExtractSearchParameters(resourceRaw json.RawMess
 		}
 	}
 	// extracting Profile
-	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'Resource.meta.profile'))")
+	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'meta.profile'))")
 	if err == nil && profileResult.String() != "undefined" {
 	}
 	// extracting SourceUri
-	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.source')[0]")
+	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.source')[0]")
 	if err == nil && sourceUriResult.String() != "undefined" {
 		s.SourceUri = sourceUriResult.String()
 	}
 	// extracting Tag
 	tagResult, err := vm.RunString(` 
-							TagResult = window.fhirpath.evaluate(fhirResource, 'Resource.meta.tag')
+							TagResult = window.fhirpath.evaluate(fhirResource, 'meta.tag')
 							TagProcessed = TagResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept

diff --git a/backend/pkg/models/database/fhir_care_plan.go b/backend/pkg/models/database/fhir_care_plan.go
@@ -454,7 +454,7 @@ func (s *FhirCarePlan) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 	}
 	// extracting Language
 	languageResult, err := vm.RunString(` 
-							LanguageResult = window.fhirpath.evaluate(fhirResource, 'Resource.language')
+							LanguageResult = window.fhirpath.evaluate(fhirResource, 'language')
 							LanguageProcessed = LanguageResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept
@@ -500,7 +500,7 @@ func (s *FhirCarePlan) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 		s.Language = []byte(languageResult.String())
 	}
 	// extracting LastUpdated
-	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.lastUpdated')[0]")
+	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.lastUpdated')[0]")
 	if err == nil && lastUpdatedResult.String() != "undefined" {
 		t, err := time.Parse(time.RFC3339, lastUpdatedResult.String())
 		if err == nil {
@@ -521,15 +521,15 @@ func (s *FhirCarePlan) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 	if err == nil && performerResult.String() != "undefined" {
 	}
 	// extracting Profile
-	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'Resource.meta.profile'))")
+	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'meta.profile'))")
 	if err == nil && profileResult.String() != "undefined" {
 	}
 	// extracting Replaces
 	replacesResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'CarePlan.replaces'))")
 	if err == nil && replacesResult.String() != "undefined" {
 	}
 	// extracting SourceUri
-	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.source')[0]")
+	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.source')[0]")
 	if err == nil && sourceUriResult.String() != "undefined" {
 		s.SourceUri = sourceUriResult.String()
 	}
@@ -586,7 +586,7 @@ func (s *FhirCarePlan) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 	}
 	// extracting Tag
 	tagResult, err := vm.RunString(` 
-							TagResult = window.fhirpath.evaluate(fhirResource, 'Resource.meta.tag')
+							TagResult = window.fhirpath.evaluate(fhirResource, 'meta.tag')
 							TagProcessed = TagResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept

diff --git a/backend/pkg/models/database/fhir_care_team.go b/backend/pkg/models/database/fhir_care_team.go
@@ -270,7 +270,7 @@ func (s *FhirCareTeam) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 	}
 	// extracting Language
 	languageResult, err := vm.RunString(` 
-							LanguageResult = window.fhirpath.evaluate(fhirResource, 'Resource.language')
+							LanguageResult = window.fhirpath.evaluate(fhirResource, 'language')
 							LanguageProcessed = LanguageResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept
@@ -316,7 +316,7 @@ func (s *FhirCareTeam) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 		s.Language = []byte(languageResult.String())
 	}
 	// extracting LastUpdated
-	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.lastUpdated')[0]")
+	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.lastUpdated')[0]")
 	if err == nil && lastUpdatedResult.String() != "undefined" {
 		t, err := time.Parse(time.RFC3339, lastUpdatedResult.String())
 		if err == nil {
@@ -333,11 +333,11 @@ func (s *FhirCareTeam) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 	if err == nil && participantResult.String() != "undefined" {
 	}
 	// extracting Profile
-	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'Resource.meta.profile'))")
+	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'meta.profile'))")
 	if err == nil && profileResult.String() != "undefined" {
 	}
 	// extracting SourceUri
-	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.source')[0]")
+	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.source')[0]")
 	if err == nil && sourceUriResult.String() != "undefined" {
 		s.SourceUri = sourceUriResult.String()
 	}
@@ -394,7 +394,7 @@ func (s *FhirCareTeam) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 	}
 	// extracting Tag
 	tagResult, err := vm.RunString(` 
-							TagResult = window.fhirpath.evaluate(fhirResource, 'Resource.meta.tag')
+							TagResult = window.fhirpath.evaluate(fhirResource, 'meta.tag')
 							TagProcessed = TagResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept

diff --git a/backend/pkg/models/database/fhir_claim.go b/backend/pkg/models/database/fhir_claim.go
@@ -230,7 +230,7 @@ func (s *FhirClaim) PopulateAndExtractSearchParameters(resourceRaw json.RawMessa
 	}
 	// extracting Language
 	languageResult, err := vm.RunString(` 
-							LanguageResult = window.fhirpath.evaluate(fhirResource, 'Resource.language')
+							LanguageResult = window.fhirpath.evaluate(fhirResource, 'language')
 							LanguageProcessed = LanguageResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept
@@ -276,7 +276,7 @@ func (s *FhirClaim) PopulateAndExtractSearchParameters(resourceRaw json.RawMessa
 		s.Language = []byte(languageResult.String())
 	}
 	// extracting LastUpdated
-	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.lastUpdated')[0]")
+	lastUpdatedResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.lastUpdated')[0]")
 	if err == nil && lastUpdatedResult.String() != "undefined" {
 		t, err := time.Parse(time.RFC3339, lastUpdatedResult.String())
 		if err == nil {
@@ -344,15 +344,15 @@ func (s *FhirClaim) PopulateAndExtractSearchParameters(resourceRaw json.RawMessa
 	if err == nil && procedureUdiResult.String() != "undefined" {
 	}
 	// extracting Profile
-	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'Resource.meta.profile'))")
+	profileResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'meta.profile'))")
 	if err == nil && profileResult.String() != "undefined" {
 	}
 	// extracting Provider
 	providerResult, err := vm.RunString("JSON.stringify(window.fhirpath.evaluate(fhirResource, 'Claim.provider'))")
 	if err == nil && providerResult.String() != "undefined" {
 	}
 	// extracting SourceUri
-	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'Resource.meta.source')[0]")
+	sourceUriResult, err := vm.RunString("window.fhirpath.evaluate(fhirResource, 'meta.source')[0]")
 	if err == nil && sourceUriResult.String() != "undefined" {
 		s.SourceUri = sourceUriResult.String()
 	}
@@ -409,7 +409,7 @@ func (s *FhirClaim) PopulateAndExtractSearchParameters(resourceRaw json.RawMessa
 	}
 	// extracting Tag
 	tagResult, err := vm.RunString(` 
-							TagResult = window.fhirpath.evaluate(fhirResource, 'Resource.meta.tag')
+							TagResult = window.fhirpath.evaluate(fhirResource, 'meta.tag')
 							TagProcessed = TagResult.reduce((accumulator, currentValue) => {
 								if (currentValue.coding) {
 									//CodeableConcept