Upgrade Engine & SDC artifacts (#3328)

Co-authored-by: Peter Lubell-Doughtie <peter@ona.io>
opensrp · Jun 13, 2024 · 11ca94c · 11ca94c
1 parent ebd8869
commit 11ca94c
Show file tree

Hide file tree

Showing 33 changed files with 35 additions and 35 deletions.
diff --git a/...id/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt b/...id/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt
@@ -27,9 +27,9 @@ import ca.uhn.fhir.rest.gclient.ReferenceClientParam
 import ca.uhn.fhir.rest.gclient.StringClientParam
 import ca.uhn.fhir.rest.gclient.TokenClientParam
 import com.google.android.fhir.FhirEngine
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.get
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.Search
 import com.google.android.fhir.search.filter.ReferenceParamFilterCriterion
 import com.google.android.fhir.search.filter.TokenParamFilterCriterion

diff --git a/.../engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/P2PReceiverTransferDao.kt b/.../engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/P2PReceiverTransferDao.kt
@@ -17,7 +17,7 @@
 package org.smartregister.fhircore.engine.p2p.dao
 
 import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import java.util.TreeSet
 import javax.inject.Inject
 import kotlinx.coroutines.runBlocking

diff --git a/...id/engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/P2PSenderTransferDao.kt b/...id/engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/P2PSenderTransferDao.kt
@@ -17,7 +17,7 @@
 package org.smartregister.fhircore.engine.p2p.dao
 
 import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import java.util.TreeSet
 import javax.inject.Inject
 import kotlinx.coroutines.runBlocking

diff --git a/.../src/main/java/org/smartregister/fhircore/engine/rulesengine/ResourceDataRulesExecutor.kt b/.../src/main/java/org/smartregister/fhircore/engine/rulesengine/ResourceDataRulesExecutor.kt
@@ -19,7 +19,7 @@ package org.smartregister.fhircore.engine.rulesengine
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.runtime.snapshots.SnapshotStateMap
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import javax.inject.Inject
 import org.hl7.fhir.r4.model.Resource
 import org.jeasy.rules.api.Facts

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/rulesengine/RulesFactory.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/rulesengine/RulesFactory.kt
@@ -17,7 +17,7 @@
 package org.smartregister.fhircore.engine.rulesengine
 
 import android.content.Context
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.search.Order
 import dagger.hilt.android.qualifiers.ApplicationContext
 import java.math.BigDecimal

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt
@@ -21,8 +21,8 @@ import androidx.annotation.VisibleForTesting
 import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.util.TerserUtil
 import com.google.android.fhir.FhirEngine
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.get
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.search
 import dagger.hilt.android.qualifiers.ApplicationContext
 import java.util.Date

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirResourceUtil.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirResourceUtil.kt
@@ -18,8 +18,8 @@ package org.smartregister.fhircore.engine.task
 
 import android.content.Context
 import ca.uhn.fhir.rest.param.ParamPrefixEnum
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.get
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.filter.TokenParamFilterCriterion
 import com.google.android.fhir.search.search
 import dagger.hilt.android.qualifiers.ApplicationContext

diff --git a/.../src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt b/.../src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt
@@ -17,8 +17,8 @@
 package org.smartregister.fhircore.engine.util.extension
 
 import com.google.android.fhir.datacapture.extensions.asStringValue
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.datacapture.extensions.targetStructureMap
-import com.google.android.fhir.logicalId
 import java.util.Locale
 import org.hl7.fhir.r4.model.BooleanType
 import org.hl7.fhir.r4.model.Bundle

diff --git a/...ngine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt b/...ngine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
@@ -21,8 +21,8 @@ import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.parser.IParser
 import ca.uhn.fhir.rest.gclient.ReferenceClientParam
 import com.google.android.fhir.datacapture.extensions.createQuestionnaireResponseItem
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.get
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.search
 import java.time.Duration
 import java.time.temporal.ChronoUnit

diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/FhirExtractionTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/FhirExtractionTest.kt
@@ -19,10 +19,10 @@ package org.smartregister.fhircore.engine
 import androidx.work.WorkManager
 import androidx.work.WorkRequest
 import com.google.android.fhir.FhirEngine
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.datacapture.mapping.ResourceMapper
 import com.google.android.fhir.datacapture.mapping.StructureMapExtractionContext
 import com.google.android.fhir.get
-import com.google.android.fhir.logicalId
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.mockk.coEvery

diff --git a/...rc/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt b/...rc/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt
@@ -22,8 +22,8 @@ import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.SearchResult
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.db.ResourceNotFoundException
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.Search
 import com.google.common.reflect.TypeToken
 import dagger.hilt.android.testing.HiltAndroidRule

diff --git a/...ngine/src/test/java/org/smartregister/fhircore/engine/data/local/DefaultRepositoryTest.kt b/...ngine/src/test/java/org/smartregister/fhircore/engine/data/local/DefaultRepositoryTest.kt
@@ -22,9 +22,9 @@ import ca.uhn.fhir.parser.IParser
 import ca.uhn.fhir.rest.param.ParamPrefixEnum
 import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.SearchResult
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.get
-import com.google.android.fhir.logicalId
 import com.google.gson.Gson
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule

diff --git a/...test/java/org/smartregister/fhircore/engine/data/local/register/RegisterRepositoryTest.kt b/...test/java/org/smartregister/fhircore/engine/data/local/register/RegisterRepositoryTest.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.state.ToggleableState
 import androidx.test.core.app.ApplicationProvider
 import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.search.Search
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest

diff --git a/...st/java/org/smartregister/fhircore/engine/data/remote/shared/FhirResourceConverterTest.kt b/...st/java/org/smartregister/fhircore/engine/data/remote/shared/FhirResourceConverterTest.kt
@@ -18,7 +18,7 @@ package org.smartregister.fhircore.engine.data.remote.shared
 
 import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.context.FhirVersionEnum
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import io.mockk.MockKAnnotations
 import io.mockk.impl.annotations.MockK
 import java.lang.reflect.Type

diff --git a/...ine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/P2PReceiverTransferDaoTest.kt b/...ine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/P2PReceiverTransferDaoTest.kt
@@ -20,7 +20,7 @@ import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.context.FhirVersionEnum
 import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.just

diff --git a/...ngine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/P2PSenderTransferDaoTest.kt b/...ngine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/P2PSenderTransferDaoTest.kt
@@ -21,7 +21,7 @@ import ca.uhn.fhir.context.FhirVersionEnum
 import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.SearchResult
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.mockk

diff --git a/...id/engine/src/test/java/org/smartregister/fhircore/engine/rulesengine/RulesFactoryTest.kt b/...id/engine/src/test/java/org/smartregister/fhircore/engine/rulesengine/RulesFactoryTest.kt
@@ -17,7 +17,7 @@
 package org.smartregister.fhircore.engine.rulesengine
 
 import androidx.test.core.app.ApplicationProvider
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.mockk.every

diff --git a/.../engine/src/test/java/org/smartregister/fhircore/engine/task/FhirCarePlanGeneratorTest.kt b/.../engine/src/test/java/org/smartregister/fhircore/engine/task/FhirCarePlanGeneratorTest.kt
@@ -24,9 +24,9 @@ import ca.uhn.fhir.parser.IParser
 import ca.uhn.fhir.rest.gclient.ReferenceClientParam
 import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.SearchResult
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.get
 import com.google.android.fhir.knowledge.KnowledgeManager
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.Search
 import com.google.android.fhir.search.search
 import com.google.android.fhir.workflow.FhirOperator

diff --git a/.../engine/src/test/java/org/smartregister/fhircore/engine/ui/multiselect/TreeBuilderTest.kt b/.../engine/src/test/java/org/smartregister/fhircore/engine/ui/multiselect/TreeBuilderTest.kt
@@ -19,7 +19,7 @@ package org.smartregister.fhircore.engine.ui.multiselect
 import android.app.Application
 import androidx.test.core.app.ApplicationProvider
 import ca.uhn.fhir.context.FhirContext
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import javax.inject.Inject

diff --git a/...src/test/java/org/smartregister/fhircore/engine/util/extension/FhirEngineExtensionTest.kt b/...src/test/java/org/smartregister/fhircore/engine/util/extension/FhirEngineExtensionTest.kt
@@ -21,8 +21,8 @@ import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.context.FhirVersionEnum
 import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.SearchResult
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.knowledge.KnowledgeManager
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.workflow.FhirOperator
 import io.mockk.coEvery
 import io.mockk.coVerify

diff --git a/...ne/src/test/java/org/smartregister/fhircore/engine/util/extension/MeasureExtensionTest.kt b/...ne/src/test/java/org/smartregister/fhircore/engine/util/extension/MeasureExtensionTest.kt
@@ -17,7 +17,7 @@
 package org.smartregister.fhircore.engine.util.extension
 
 import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.mockk.coEvery

diff --git a/...e/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt b/...e/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt
@@ -21,7 +21,7 @@ import androidx.test.core.app.ApplicationProvider
 import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.context.FhirVersionEnum
 import ca.uhn.fhir.parser.IParser
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.mockk.coEvery

diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
@@ -16,14 +16,14 @@ android-x-test= "1.5.2"
 core-testing = "2.2.0"
 coverallsGradlePlugin = "2.12.0"
 cqfFhirCr = "3.0.0-PRE9"
-data-capture = "1.1.0-preview8-SNAPSHOT"
+data-capture = "1.1.0-preview10-SNAPSHOT"
 datastore = "1.0.0"
 desugar-jdk-libs = "2.0.4"
 dokkaBase = "1.8.20"
 easy-rules-jexl = "4.1.0"
 espresso-core = "3.5.1"
 fhir-common-utils = "1.0.0-SNAPSHOT"
-fhir-engine = "1.0.0-preview7.1-SNAPSHOT"
+fhir-engine = "1.0.0-preview9-SNAPSHOT"
 foundation = "1.6.3"
 fragment-ktx = "1.6.2"
 glide = "4.16.0"

diff --git a/android/quest/src/androidTest/java/org/smartregister/fhircore/quest/integration/Faker.kt b/android/quest/src/androidTest/java/org/smartregister/fhircore/quest/integration/Faker.kt
@@ -23,9 +23,9 @@ import com.google.android.fhir.LocalChange
 import com.google.android.fhir.SearchResult
 import com.google.android.fhir.search.Search
 import com.google.android.fhir.sync.ConflictResolver
-import com.google.android.fhir.sync.upload.LocalChangesFetchMode
 import com.google.android.fhir.sync.upload.SyncUploadProgress
 import com.google.android.fhir.sync.upload.UploadRequestResult
+import com.google.android.fhir.sync.upload.UploadStrategy
 import com.google.gson.Gson
 import dagger.hilt.android.testing.HiltTestApplication
 import java.time.OffsetDateTime
@@ -102,7 +102,7 @@ object Faker {
         }
 
         override suspend fun syncUpload(
-          localChangesFetchMode: LocalChangesFetchMode,
+          uploadStrategy: UploadStrategy,
           upload: suspend (List<LocalChange>) -> Flow<UploadRequestResult>,
         ): Flow<SyncUploadProgress> {
           return flowOf()

diff --git a/...main/java/org/smartregister/fhircore/quest/data/report/measure/MeasureReportRepository.kt b/...main/java/org/smartregister/fhircore/quest/data/report/measure/MeasureReportRepository.kt
@@ -19,8 +19,8 @@ package org.smartregister.fhircore.quest.data.report.measure
 import android.content.Context
 import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.FhirEngine
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.knowledge.KnowledgeManager
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.search
 import com.google.android.fhir.workflow.FhirOperator
 import dagger.hilt.android.qualifiers.ApplicationContext

diff --git a/...est/src/main/java/org/smartregister/fhircore/quest/ui/multiselect/MultiSelectViewModel.kt b/...est/src/main/java/org/smartregister/fhircore/quest/ui/multiselect/MultiSelectViewModel.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.state.ToggleableState
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import dagger.hilt.android.lifecycle.HiltViewModel
 import java.util.LinkedList
 import javax.inject.Inject

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/profile/ProfileViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/profile/ProfileViewModel.kt
@@ -22,8 +22,8 @@ import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.db.ResourceNotFoundException
-import com.google.android.fhir.logicalId
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableSharedFlow

diff --git a/...src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/...src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -23,13 +23,13 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import ca.uhn.fhir.context.FhirContext
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.datacapture.mapping.ResourceMapper
 import com.google.android.fhir.datacapture.mapping.StructureMapExtractionContext
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValidator
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.db.ResourceNotFoundException
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.Search
 import com.google.android.fhir.search.filter.TokenParamFilterCriterion
 import com.google.android.fhir.search.search

diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/data/DataMigrationTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/data/DataMigrationTest.kt
@@ -16,7 +16,7 @@
 
 package org.smartregister.fhircore.quest.data
 
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import java.util.Date

diff --git a/...d/quest/src/test/java/org/smartregister/fhircore/quest/ui/profile/ProfileViewModelTest.kt b/...d/quest/src/test/java/org/smartregister/fhircore/quest/ui/profile/ProfileViewModelTest.kt
@@ -23,7 +23,7 @@ import androidx.navigation.NavController
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
 import ca.uhn.fhir.parser.IParser
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.mockk.coEvery

diff --git a/...test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt b/...test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt
@@ -21,10 +21,10 @@ import androidx.test.core.app.ApplicationProvider
 import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.SearchResult
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.datacapture.mapping.ResourceMapper
 import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.get
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.Search
 import com.google.android.fhir.workflow.FhirOperator
 import dagger.hilt.android.testing.HiltAndroidRule

diff --git a/...st/src/test/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensionsTest.kt b/...st/src/test/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensionsTest.kt
@@ -25,7 +25,7 @@ import android.widget.Toast
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.NavOptions
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.mockk.every

diff --git a/...a/org/smartregister/fhircore/quest/util/mappers/MeasureReportPatientViewDataMapperTest.kt b/...a/org/smartregister/fhircore/quest/util/mappers/MeasureReportPatientViewDataMapperTest.kt
@@ -16,7 +16,7 @@
 
 package org.smartregister.fhircore.quest.util.mappers
 
-import com.google.android.fhir.logicalId
+import com.google.android.fhir.datacapture.extensions.logicalId
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import javax.inject.Inject