From 499c723e70133c59beee4f7a7dfea1c9bcc6bd7a Mon Sep 17 00:00:00 2001 From: Simon Njoroge Date: Thu, 17 Oct 2024 10:29:25 +0300 Subject: [PATCH 1/5] Add Consent backbone elements --- .../data/helper/TransformSupportServices.kt | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt b/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt index 48b2a036..8ad3f2c5 100644 --- a/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt +++ b/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt @@ -18,23 +18,8 @@ package org.smartregister.fct.engine.data.helper import org.hl7.fhir.exceptions.FHIRException import org.hl7.fhir.r4.context.SimpleWorkerContext -import org.hl7.fhir.r4.model.AdverseEvent -import org.hl7.fhir.r4.model.Base -import org.hl7.fhir.r4.model.CarePlan -import org.hl7.fhir.r4.model.Coding -import org.hl7.fhir.r4.model.Encounter -import org.hl7.fhir.r4.model.EpisodeOfCare -import org.hl7.fhir.r4.model.Group -import org.hl7.fhir.r4.model.Immunization -import org.hl7.fhir.r4.model.ListResource -import org.hl7.fhir.r4.model.Location -import org.hl7.fhir.r4.model.Observation -import org.hl7.fhir.r4.model.Patient -import org.hl7.fhir.r4.model.PlanDefinition -import org.hl7.fhir.r4.model.ResourceFactory +import org.hl7.fhir.r4.model.* import org.hl7.fhir.r4.model.RiskAssessment.RiskAssessmentPredictionComponent -import org.hl7.fhir.r4.model.Task -import org.hl7.fhir.r4.model.Timing import org.hl7.fhir.r4.terminologies.ConceptMapEngine import org.hl7.fhir.r4.utils.StructureMapUtilities.ITransformerServices import org.smartregister.fct.logger.FCTLogger @@ -83,6 +68,11 @@ class TransformSupportServices(val simpleWorkerContext: SimpleWorkerContext) : AdverseEvent.AdverseEventSuspectEntityCausalityComponent() "Location_Position" -> Location.LocationPositionComponent() "List_Entry" -> ListResource.ListEntryComponent() + "Consent_PolicyRule" -> Consent.ConsentPolicyComponent() + "Consent_Verification" -> Consent.ConsentVerificationComponent() + "Consent_Provision" -> Consent.provisionComponent() + "Consent_ProvisionActor" -> Consent.provisionActorComponent() + "Consent_ProvisionData" -> Consent.provisionDataComponent() else -> ResourceFactory.createResourceOrType(name) } } From 7851fe01aad3af5667d1320a4e01d0eff24dd27c Mon Sep 17 00:00:00 2001 From: Simon Njoroge Date: Thu, 17 Oct 2024 11:22:40 +0300 Subject: [PATCH 2/5] Update Consent backbone elements --- .../fct/engine/data/helper/TransformSupportServices.kt | 2 +- .../org/smartregister/external/TransformSupportServices.kt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt b/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt index 8ad3f2c5..2017666f 100644 --- a/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt +++ b/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt @@ -68,7 +68,7 @@ class TransformSupportServices(val simpleWorkerContext: SimpleWorkerContext) : AdverseEvent.AdverseEventSuspectEntityCausalityComponent() "Location_Position" -> Location.LocationPositionComponent() "List_Entry" -> ListResource.ListEntryComponent() - "Consent_PolicyRule" -> Consent.ConsentPolicyComponent() + "Consent_Policy" -> Consent.ConsentPolicyComponent() "Consent_Verification" -> Consent.ConsentVerificationComponent() "Consent_Provision" -> Consent.provisionComponent() "Consent_ProvisionActor" -> Consent.provisionActorComponent() diff --git a/efsity/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt b/efsity/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt index f7cb7642..e588571c 100644 --- a/efsity/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt +++ b/efsity/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt @@ -70,6 +70,11 @@ class TransformSupportServices @Inject constructor(val simpleWorkerContext: Simp AdverseEvent.AdverseEventSuspectEntityCausalityComponent() "Location_Position" -> Location.LocationPositionComponent() "List_Entry" -> ListResource.ListEntryComponent() + "Consent_Policy" -> Consent.ConsentPolicyComponent() + "Consent_Verification" -> Consent.ConsentVerificationComponent() + "Consent_Provision" -> Consent.provisionComponent() + "Consent_ProvisionActor" -> Consent.provisionActorComponent() + "Consent_ProvisionData" -> Consent.provisionDataComponent() else -> ResourceFactory.createResourceOrType(name) } } From 492636b3656046d6d3bad4998566e45d12ba0d00 Mon Sep 17 00:00:00 2001 From: Simon Njoroge Date: Thu, 17 Oct 2024 11:25:40 +0300 Subject: [PATCH 3/5] Remove wildcard imports --- .../data/helper/TransformSupportServices.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt b/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt index 2017666f..ad54c367 100644 --- a/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt +++ b/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt @@ -19,7 +19,23 @@ package org.smartregister.fct.engine.data.helper import org.hl7.fhir.exceptions.FHIRException import org.hl7.fhir.r4.context.SimpleWorkerContext import org.hl7.fhir.r4.model.* +import org.hl7.fhir.r4.model.AdverseEvent +import org.hl7.fhir.r4.model.Base +import org.hl7.fhir.r4.model.CarePlan +import org.hl7.fhir.r4.model.Coding +import org.hl7.fhir.r4.model.Encounter +import org.hl7.fhir.r4.model.EpisodeOfCare +import org.hl7.fhir.r4.model.Group +import org.hl7.fhir.r4.model.Immunization +import org.hl7.fhir.r4.model.ListResource +import org.hl7.fhir.r4.model.Location +import org.hl7.fhir.r4.model.Observation +import org.hl7.fhir.r4.model.Patient +import org.hl7.fhir.r4.model.PlanDefinition +import org.hl7.fhir.r4.model.ResourceFactory import org.hl7.fhir.r4.model.RiskAssessment.RiskAssessmentPredictionComponent +import org.hl7.fhir.r4.model.Task +import org.hl7.fhir.r4.model.Timing import org.hl7.fhir.r4.terminologies.ConceptMapEngine import org.hl7.fhir.r4.utils.StructureMapUtilities.ITransformerServices import org.smartregister.fct.logger.FCTLogger From 98118b3f08cd31f7f93f2ccc7da22cc56e7b4e39 Mon Sep 17 00:00:00 2001 From: Simon Njoroge Date: Thu, 17 Oct 2024 11:26:52 +0300 Subject: [PATCH 4/5] Clean up wildcard import --- .../fct/engine/data/helper/TransformSupportServices.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt b/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt index ad54c367..47db8006 100644 --- a/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt +++ b/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt @@ -18,7 +18,6 @@ package org.smartregister.fct.engine.data.helper import org.hl7.fhir.exceptions.FHIRException import org.hl7.fhir.r4.context.SimpleWorkerContext -import org.hl7.fhir.r4.model.* import org.hl7.fhir.r4.model.AdverseEvent import org.hl7.fhir.r4.model.Base import org.hl7.fhir.r4.model.CarePlan From 7243c364515e8db53abb3c2611149d9ecf54b74d Mon Sep 17 00:00:00 2001 From: Simon Njoroge Date: Thu, 17 Oct 2024 11:38:25 +0300 Subject: [PATCH 5/5] Import org.hl7.fhir.r4.model.Consent --- .../fct/engine/data/helper/TransformSupportServices.kt | 1 + .../org/smartregister/external/TransformSupportServices.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt b/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt index 47db8006..74c82659 100644 --- a/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt +++ b/efsity-ide/engine/src/main/java/org/smartregister/fct/engine/data/helper/TransformSupportServices.kt @@ -22,6 +22,7 @@ import org.hl7.fhir.r4.model.AdverseEvent import org.hl7.fhir.r4.model.Base import org.hl7.fhir.r4.model.CarePlan import org.hl7.fhir.r4.model.Coding +import org.hl7.fhir.r4.model.Consent import org.hl7.fhir.r4.model.Encounter import org.hl7.fhir.r4.model.EpisodeOfCare import org.hl7.fhir.r4.model.Group diff --git a/efsity/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt b/efsity/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt index e588571c..9f67bad2 100644 --- a/efsity/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt +++ b/efsity/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt @@ -9,6 +9,7 @@ import org.hl7.fhir.r4.model.AdverseEvent import org.hl7.fhir.r4.model.Base import org.hl7.fhir.r4.model.CarePlan import org.hl7.fhir.r4.model.Coding +import org.hl7.fhir.r4.model.Consent import org.hl7.fhir.r4.model.Encounter import org.hl7.fhir.r4.model.EpisodeOfCare import org.hl7.fhir.r4.model.Group