adds tests

dhis2 · Nov 28, 2024 · 8614283 · 8614283
1 parent 92837ee
commit 8614283
Show file tree

Hide file tree

Showing 5 changed files with 357 additions and 7 deletions.
diff --git a/app/src/main/java/org/dhis2/bindings/Extensions.kt b/app/src/main/java/org/dhis2/bindings/Extensions.kt
@@ -20,6 +20,7 @@ import java.text.DecimalFormat
 
 fun <T : Any?> MutableLiveData<T>.default(initialValue: T) = this.apply { setValue(initialValue) }
 
+@Deprecated("Use ProfilePictureProvider instead")
 fun TrackedEntityInstance.profilePicturePath(d2: D2, programUid: String?): String {
     var path: String? = null
 

diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImpl.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImpl.java
@@ -33,6 +33,7 @@
 import org.dhis2.metadata.usecases.FileResourceConfiguration;
 import org.dhis2.metadata.usecases.ProgramConfiguration;
 import org.dhis2.metadata.usecases.TrackedEntityInstanceConfiguration;
+import org.dhis2.tracker.data.ProfilePictureProvider;
 import org.dhis2.tracker.relationships.model.RelationshipDirection;
 import org.dhis2.tracker.relationships.model.RelationshipModel;
 import org.dhis2.tracker.relationships.model.RelationshipOwnerType;
@@ -121,6 +122,7 @@ public class SearchRepositoryImpl implements SearchRepository {
     private HashMap<String, List<String>> trackedEntityTypeAttributesUidsCache = new HashMap();
 
     private final MetadataIconProvider metadataIconProvider;
+    private final ProfilePictureProvider profilePictureProvider;
 
     SearchRepositoryImpl(String teiType,
                          @Nullable String initialProgram,
@@ -134,7 +136,8 @@ public class SearchRepositoryImpl implements SearchRepository {
                          NetworkUtils networkUtils,
                          SearchTEIRepository searchTEIRepository,
                          ThemeManager themeManager,
-                         MetadataIconProvider metadataIconProvider
+                         MetadataIconProvider metadataIconProvider,
+                         ProfilePictureProvider profilePictureProvider
     ) {
         this.teiType = teiType;
         this.d2 = d2;
@@ -155,6 +158,7 @@ public class SearchRepositoryImpl implements SearchRepository {
                 currentProgram,
                 resources);
         this.metadataIconProvider = metadataIconProvider;
+        this.profilePictureProvider = profilePictureProvider;
     }
 
 
@@ -746,7 +750,7 @@ public SearchTeiModel transform(TrackedEntitySearchItem searchItem, @Nullable Pr
             } else {
                 searchTei.setEnrolledOrgUnit(orgUnitName(searchTei.getTei().organisationUnit()));
             }
-            searchTei.setProfilePicture(profilePicturePath(dbTei, selectedProgram));
+            searchTei.setProfilePicture(profilePictureProvider.invoke(dbTei, selectedProgram != null ? selectedProgram.uid() : null));
         } else {
             searchTei.setTei(teiFromItem);
             searchTei.setEnrolledOrgUnit(orgUnitName(searchTei.getTei().organisationUnit()));

diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java
@@ -155,6 +155,7 @@ SearchRepository searchRepository(@NonNull D2 d2,
                                       SearchTEIRepository searchTEIRepository,
                                       ThemeManager themeManager,
                                       MetadataIconProvider metadataIconProvider) {
+        ProfilePictureProvider profilePictureProvider = new ProfilePictureProvider(d2);
         return new SearchRepositoryImpl(teiType,
                 initialProgram,
                 d2,
@@ -167,7 +168,8 @@ SearchRepository searchRepository(@NonNull D2 d2,
                 networkUtils,
                 searchTEIRepository,
                 themeManager,
-                metadataIconProvider);
+                metadataIconProvider,
+                profilePictureProvider);
     }
 
     @Provides