rename to ProfilePictureProvider

dhis2 · Oct 4, 2024 · 5eb7619 · 5eb7619
1 parent 5524398
commit 5eb7619
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java
@@ -60,7 +60,7 @@
 import org.dhis2.maps.geometry.polygon.MapPolygonToFeature;
 import org.dhis2.maps.usecases.MapStyleConfiguration;
 import org.dhis2.maps.utils.DhisMapUtils;
-import org.dhis2.tracker.GetTeiProfilePicturePathUseCase;
+import org.dhis2.tracker.ProfilePictureProvider;
 import org.dhis2.ui.ThemeManager;
 import org.dhis2.usescases.events.EventInfoProvider;
 import org.dhis2.usescases.searchTrackEntity.ui.mapper.TEICardMapper;
@@ -181,7 +181,7 @@ SearchRepositoryKt searchRepositoryKt(
     ) {
         ResourceManager resourceManager = new ResourceManager(moduleContext, colorUtils);
         DateLabelProvider dateLabelProvider = new DateLabelProvider(moduleContext, new ResourceManager(moduleContext, colorUtils));
-        GetTeiProfilePicturePathUseCase teiProfilePicturePathUseCase = new GetTeiProfilePicturePathUseCase(d2);
+        ProfilePictureProvider profilePictureProvider = new ProfilePictureProvider(d2);
 
         return new SearchRepositoryImplKt(
                 searchRepository,
@@ -191,7 +191,7 @@ SearchRepositoryKt searchRepositoryKt(
                 metadataIconProvider,
                 new TrackedEntityInstanceInfoProvider(
                         d2,
-                        teiProfilePicturePathUseCase,
+                        profilePictureProvider,
                         dateLabelProvider,
                         metadataIconProvider
                 ),

diff --git a/...org/dhis2/usescases/teiDashboard/dashboardfragments/relationships/RelationshipModule.java b/...org/dhis2/usescases/teiDashboard/dashboardfragments/relationships/RelationshipModule.java
@@ -15,7 +15,7 @@
 import org.dhis2.maps.geometry.polygon.MapPolygonToFeature;
 import org.dhis2.maps.mapper.MapRelationshipToRelationshipMapModel;
 import org.dhis2.maps.usecases.MapStyleConfiguration;
-import org.dhis2.tracker.GetTeiProfilePicturePathUseCase;
+import org.dhis2.tracker.ProfilePictureProvider;
 import org.dhis2.usescases.events.EventInfoProvider;
 import org.dhis2.usescases.teiDashboard.TeiAttributesProvider;
 import org.dhis2.usescases.tracker.TrackedEntityInstanceInfoProvider;
@@ -84,7 +84,7 @@ RelationshipRepository providesRepository(D2 d2,
             config = new EventRelationshipConfiguration(eventUid);
         }
         DateLabelProvider dateLabelProvider = new DateLabelProvider(moduleContext, resourceManager);
-        GetTeiProfilePicturePathUseCase teiProfilePicturePathUseCase = new GetTeiProfilePicturePathUseCase(d2);
+        ProfilePictureProvider profilePictureProvider = new ProfilePictureProvider(d2);
         return new RelationshipRepositoryImpl(
                 d2,
                 config,
@@ -93,7 +93,7 @@ RelationshipRepository providesRepository(D2 d2,
                 metadataIconProvider,
                 new TrackedEntityInstanceInfoProvider(
                         d2,
-                        teiProfilePicturePathUseCase,
+                        profilePictureProvider,
                         dateLabelProvider,
                         metadataIconProvider
                 ),

diff --git a/app/src/main/java/org/dhis2/usescases/tracker/TrackedEntityInstanceInfoProvider.kt b/app/src/main/java/org/dhis2/usescases/tracker/TrackedEntityInstanceInfoProvider.kt
@@ -5,7 +5,7 @@ import org.dhis2.commons.resources.MetadataIconProvider
 import org.dhis2.maps.model.MapItemModel
 import org.dhis2.maps.model.RelatedInfo
 import org.dhis2.maps.model.RelationshipDirection
-import org.dhis2.tracker.GetTeiProfilePicturePathUseCase
+import org.dhis2.tracker.ProfilePictureProvider
 import org.dhis2.ui.avatar.AvatarProviderConfiguration
 import org.dhis2.ui.avatar.AvatarProviderConfiguration.Metadata
 import org.dhis2.ui.avatar.AvatarProviderConfiguration.ProfilePic
@@ -24,7 +24,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
 class TrackedEntityInstanceInfoProvider(
     private val d2: D2,
-    private val getProfilePicturePathUseCase: GetTeiProfilePicturePathUseCase,
+    private val profilePictureProvider: ProfilePictureProvider,
     private val dateLabelProvider: DateLabelProvider,
     private val metadataIconProvider: MetadataIconProvider,
 ) {
@@ -36,7 +36,7 @@ class TrackedEntityInstanceInfoProvider(
     ): AvatarProviderConfiguration {
         val program = programUid?.let { d2.programModule().programs().uid(it).blockingGet() }
         val hasIcon = d2.iconModule().icons().key(program?.style()?.icon() ?: "").blockingExists()
-        val profilePath = getProfilePicturePathUseCase(tei, programUid)
+        val profilePath = profilePictureProvider(tei, programUid)
 
         return when {
             profilePath.isNotEmpty() -> {

diff --git a/app/src/test/java/org/dhis2/usescases/tracker/TrackedEntityInstanceInfoProviderTests.kt b/app/src/test/java/org/dhis2/usescases/tracker/TrackedEntityInstanceInfoProviderTests.kt
@@ -3,7 +3,7 @@ package org.dhis2.usescases.tracker
 import androidx.compose.ui.graphics.Color
 import org.dhis2.commons.date.DateLabelProvider
 import org.dhis2.commons.resources.MetadataIconProvider
-import org.dhis2.tracker.GetTeiProfilePicturePathUseCase
+import org.dhis2.tracker.ProfilePictureProvider
 import org.dhis2.ui.MetadataIconData
 import org.dhis2.ui.avatar.AvatarProviderConfiguration
 import org.hisp.dhis.android.core.D2
@@ -25,7 +25,7 @@ class TrackedEntityInstanceInfoProviderTests {
     private lateinit var teiInfoProvider: TrackedEntityInstanceInfoProvider
 
     private val d2: D2 = Mockito.mock(D2::class.java, Mockito.RETURNS_DEEP_STUBS)
-    private val getProfilePicturePathUseCase: GetTeiProfilePicturePathUseCase = mock()
+    private val profilePictureProvider: ProfilePictureProvider = mock()
     private val dateLabelProvider: DateLabelProvider = mock()
     private val metadataIconProvider: MetadataIconProvider = mock {
         on { invoke(any()) } doReturn MetadataIconData.defaultIcon()
@@ -35,7 +35,7 @@ class TrackedEntityInstanceInfoProviderTests {
     fun setup() {
         teiInfoProvider = TrackedEntityInstanceInfoProvider(
             d2,
-            getProfilePicturePathUseCase,
+            profilePictureProvider,
             dateLabelProvider,
             metadataIconProvider,
         )
@@ -50,7 +50,7 @@ class TrackedEntityInstanceInfoProviderTests {
             value = "Value",
         )
 
-        whenever(getProfilePicturePathUseCase.invoke(tei, programUid)) doReturn "/path/to/picture"
+        whenever(profilePictureProvider.invoke(tei, programUid)) doReturn "/path/to/picture"
         whenever(d2.programModule().programs().uid(programUid).blockingGet()) doReturn mockProgram()
         whenever(d2.iconModule().icons().key(any()).blockingExists()) doReturn false
 
@@ -69,7 +69,7 @@ class TrackedEntityInstanceInfoProviderTests {
             value = "Value",
         )
 
-        whenever(getProfilePicturePathUseCase.invoke(tei, programUid)) doReturn ""
+        whenever(profilePictureProvider.invoke(tei, programUid)) doReturn ""
         whenever(d2.programModule().programs().uid(programUid).blockingGet()) doReturn mockProgram()
         whenever(d2.iconModule().icons().key(any()).blockingExists()) doReturn true
         whenever(metadataIconProvider.invoke(any())) doReturn MetadataIconData(
@@ -97,7 +97,7 @@ class TrackedEntityInstanceInfoProviderTests {
             value = "Value",
         )
 
-        whenever(getProfilePicturePathUseCase.invoke(tei, programUid)) doReturn ""
+        whenever(profilePictureProvider.invoke(tei, programUid)) doReturn ""
         whenever(d2.programModule().programs().uid(programUid).blockingGet()) doReturn mockProgram()
         whenever(d2.iconModule().icons().key(any()).blockingExists()) doReturn true
 
@@ -116,7 +116,7 @@ class TrackedEntityInstanceInfoProviderTests {
             value = "First Attribute Value",
         )
 
-        whenever(getProfilePicturePathUseCase.invoke(tei, programUid)) doReturn ""
+        whenever(profilePictureProvider.invoke(tei, programUid)) doReturn ""
         whenever(d2.programModule().programs().uid(programUid).blockingGet()) doReturn mockProgram()
         whenever(d2.iconModule().icons().key(any()).blockingExists()) doReturn false
 
@@ -131,7 +131,7 @@ class TrackedEntityInstanceInfoProviderTests {
         val tei = mockedTrackedEntityInstance()
         val programUid = "programUid"
 
-        whenever(getProfilePicturePathUseCase.invoke(tei, programUid)) doReturn ""
+        whenever(profilePictureProvider.invoke(tei, programUid)) doReturn ""
         whenever(d2.programModule().programs().uid(programUid).blockingGet()) doReturn mockProgram()
         whenever(d2.iconModule().icons().key(any()).blockingExists()) doReturn false
 

diff --git a/...racker/GetTeiProfilePicturePathUseCase.kt → ...g/dhis2/tracker/ProfilePictureProvider.kt b/...racker/GetTeiProfilePicturePathUseCase.kt → ...g/dhis2/tracker/ProfilePictureProvider.kt
@@ -5,7 +5,7 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 
-class GetTeiProfilePicturePathUseCase(
+class ProfilePictureProvider(
     private val d2: D2,
 ) {
     operator fun invoke(
@@ -83,7 +83,7 @@ class GetTeiProfilePicturePathUseCase(
             }
         }
 
-        return path ?: ""
+        return path
     }
 
 }