move displayOrgUnitName logic to ui layer

dhis2 · Jan 10, 2024 · 533400b · 533400b
1 parent 470d5ce
commit 533400b
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 26 deletions.
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailLiveAdapter.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailLiveAdapter.kt
@@ -51,6 +51,8 @@ class ProgramEventDetailLiveAdapter(
                     event = it,
                     editable = it.event?.uid()
                         ?.let { eventViewModel.isEditable(it) } ?: true,
+                    displayOrgUnit = it.event?.program()
+                        ?.let { program -> eventViewModel.displayOrganisationUnit(program) } ?: true,
                     onSyncIconClick = {
                         eventViewModel.eventSyncClicked.value = it.event?.uid()
                     },

diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepository.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepository.kt
@@ -26,4 +26,5 @@ interface ProgramEventDetailRepository {
     fun programHasCoordinates(): Boolean
     fun programHasAnalytics(): Boolean
     fun isEventEditable(eventUid: String): Boolean
+    fun displayOrganisationUnit(programUid: String): Boolean
 }
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.kt
@@ -177,4 +177,10 @@ class ProgramEventDetailRepositoryImpl internal constructor(
     override fun isEventEditable(eventUid: String): Boolean {
         return d2.eventModule().eventService().blockingIsEditable(eventUid)
     }
+
+    override fun displayOrganisationUnit(programUid: String): Boolean {
+        return d2.organisationUnitModule().organisationUnits()
+            .byProgramUids(listOf(programUid))
+            .blockingGet().size > 1
+    }
 }
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailViewModel.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailViewModel.kt
@@ -17,9 +17,11 @@ class ProgramEventDetailViewModel(
     val eventClicked = MutableLiveData<Pair<String, String>?>(null)
     var updateEvent: String? = null
     var recreationActivity: Boolean = false
+
     enum class EventProgramScreen {
         LIST, MAP, ANALYTICS
     }
+
     private val _currentScreen = MutableLiveData(EventProgramScreen.LIST)
     val currentScreen: LiveData<EventProgramScreen>
         get() = _currentScreen.distinctUntilChanged()
@@ -60,4 +62,8 @@ class ProgramEventDetailViewModel(
     fun isEditable(eventUid: String): Boolean {
         return eventRepository.isEventEditable(eventUid)
     }
+
+    fun displayOrganisationUnit(programUid: String): Boolean {
+        return eventRepository.displayOrganisationUnit(programUid)
+    }
 }
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventMapper.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventMapper.kt
@@ -5,7 +5,6 @@ import org.dhis2.commons.data.EventViewModel
 import org.dhis2.commons.data.EventViewModelType
 import org.dhis2.commons.data.ProgramEventViewModel
 import org.dhis2.commons.data.tuples.Pair
-import org.dhis2.commons.reporting.CrashReportController
 import org.dhis2.data.dhislogic.DhisPeriodUtils
 import org.dhis2.utils.DateUtils
 import org.hisp.dhis.android.core.D2
@@ -25,22 +24,12 @@ import javax.inject.Inject
 class ProgramEventMapper @Inject constructor(
     val d2: D2,
     val periodUtils: DhisPeriodUtils,
-    val crashReportController: CrashReportController,
 ) {
 
     fun eventToEventViewModel(event: Event): EventViewModel {
         val programStage =
             d2.programModule().programStages().uid(event.programStage()).blockingGet()
 
-        val dataSetOrgUnitNumber = d2.organisationUnitModule().organisationUnits()
-            .byProgramUids(listOf(event.program()!!))
-            .blockingGet().size
-
-        crashReportController.addBreadCrumb(
-            "ProgramEventMapper.eventToEventViewModel",
-            "Event: $event",
-        )
-
         val eventDate = event.eventDate() ?: event.dueDate()
 
         return EventViewModel(
@@ -66,7 +55,6 @@ class ProgramEventMapper @Inject constructor(
             },
             nameCategoryOptionCombo =
             getCategoryComboFromOptionCombo(event.attributeOptionCombo())?.displayName(),
-            displayOrgUnitName = dataSetOrgUnitNumber > 1,
         )
     }
 

diff --git a/...c/main/java/org/dhis2/usescases/programEventDetail/eventList/ui/mapper/EventCardMapper.kt b/...c/main/java/org/dhis2/usescases/programEventDetail/eventList/ui/mapper/EventCardMapper.kt
@@ -38,13 +38,14 @@ class EventCardMapper(
     fun map(
         event: EventViewModel,
         editable: Boolean,
+        displayOrgUnit: Boolean,
         onSyncIconClick: () -> Unit,
         onCardClick: () -> Unit,
     ): ListCardUiModel {
         return ListCardUiModel(
             title = event.displayDate ?: "",
             lastUpdated = event.lastUpdate.toDateSpan(context),
-            additionalInfo = getAdditionalInfoList(event, editable),
+            additionalInfo = getAdditionalInfoList(event, editable, displayOrgUnit),
             actionButton = {
                 ProvideSyncButton(
                     state = event.event?.aggregatedSyncState(),
@@ -60,6 +61,7 @@ class EventCardMapper(
     private fun getAdditionalInfoList(
         event: EventViewModel,
         editable: Boolean,
+        displayOrgUnit: Boolean,
     ): List<AdditionalInfoItem> {
         val list = event.dataElementValues?.filter {
             !it.second.isNullOrEmpty()
@@ -70,7 +72,7 @@ class EventCardMapper(
             )
         }?.toMutableList() ?: mutableListOf()
 
-        if (event.displayOrgUnitName) {
+        if (displayOrgUnit) {
             checkRegisteredIn(
                 list = list,
                 orgUnit = event.orgUnitName,

diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImpl.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImpl.java
@@ -657,8 +657,7 @@ public List<EventViewModel> getEventsForMap(List<SearchTeiModel> teis) {
                             false,
                             false,
                             periodUtils.getPeriodUIString(stage.periodType(), event.eventDate() != null ? event.eventDate() : event.dueDate(), Locale.getDefault()),
-                            null,
-                            true
+                            null
                     ));
         }
 
@@ -704,8 +703,7 @@ public EventViewModel getEventInfo(String uid) {
                 false,
                 false,
                 periodUtils.getPeriodUIString(stage.periodType(), event.eventDate() != null ? event.eventDate() : event.dueDate(), Locale.getDefault()),
-                null,
-                true
+                null
         );
     }
 

diff --git a/...java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt b/...java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt
@@ -116,7 +116,6 @@ class TeiDataRepositoryImpl(
                                 dataElementValues = null,
                                 displayDate = null,
                                 nameCategoryOptionCombo = null,
-                                displayOrgUnitName = true,
                             )
                         }
                     }
@@ -185,7 +184,6 @@ class TeiDataRepositoryImpl(
                             groupedByStage = true,
                             displayDate = null,
                             nameCategoryOptionCombo = null,
-                            displayOrgUnitName = true,
                         ),
                     )
                     if (isSelected) {
@@ -219,7 +217,6 @@ class TeiDataRepositoryImpl(
                                     ),
                                     nameCategoryOptionCombo =
                                     getCategoryComboFromOptionCombo(event.attributeOptionCombo())?.displayName(),
-                                    displayOrgUnitName = true,
                                 ),
                             )
                         }
@@ -265,7 +262,6 @@ class TeiDataRepositoryImpl(
                             ),
                             nameCategoryOptionCombo =
                             getCategoryComboFromOptionCombo(event.attributeOptionCombo())?.displayName(),
-                            displayOrgUnitName = true,
                         ),
                     )
                 }

diff --git a/app/src/test/java/org/dhis2/usescases/programEventDetail/ProgramEventMapperTest.kt b/app/src/test/java/org/dhis2/usescases/programEventDetail/ProgramEventMapperTest.kt
@@ -1,6 +1,5 @@
 package org.dhis2.usescases.programEventDetail
 
-import org.dhis2.commons.reporting.CrashReportController
 import org.dhis2.data.dhislogic.DhisPeriodUtils
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
@@ -25,11 +24,10 @@ class ProgramEventMapperTest {
 
     private val d2: D2 = Mockito.mock(D2::class.java, RETURNS_DEEP_STUBS)
     private val periodUtil: DhisPeriodUtils = mock()
-    private val crashReportController: CrashReportController = mock()
 
     @Before
     fun setUp() {
-        mapper = ProgramEventMapper(d2, periodUtil, crashReportController)
+        mapper = ProgramEventMapper(d2, periodUtil)
     }
 
     @Test

diff --git a/.../test/java/org/dhis2/usescases/programEventDetail/eventList/mapper/EventCardMapperTest.kt b/.../test/java/org/dhis2/usescases/programEventDetail/eventList/mapper/EventCardMapperTest.kt
@@ -47,6 +47,7 @@ class EventCardMapperTest {
         val result = mapper.map(
             event = model,
             editable = true,
+            displayOrgUnit = true,
             onSyncIconClick = {},
             onCardClick = {},
         )

diff --git a/app/src/test/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapperTest.kt b/app/src/test/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapperTest.kt
@@ -95,6 +95,7 @@ class TEICardMapperTest {
                 .aggregatedSyncState(State.SYNCED)
                 .build()
             enrolledOrgUnit = "OrgUnit"
+            displayOrgUnit = true
             setCurrentEnrollment(
                 Enrollment.builder()
                     .uid("EnrollmentUid")

diff --git a/commons/src/main/java/org/dhis2/commons/data/EventViewModel.kt b/commons/src/main/java/org/dhis2/commons/data/EventViewModel.kt
@@ -21,7 +21,6 @@ data class EventViewModel(
     val showBottomShadow: Boolean = false,
     val displayDate: String?,
     val nameCategoryOptionCombo: String?,
-    val displayOrgUnitName: Boolean,
 ) {
     fun toggleValueList() {
         this.valueListIsOpen = !valueListIsOpen
-Original file line number
+Diff line change
@@ Expand Up @@
                                 false,
                                 false,
                                 periodUtils.getPeriodUIString(stage.periodType(), event.eventDate() != null ? event.eventDate() : event.dueDate(), Locale.getDefault()),
-                                null,
-                                true
+                                null
                         ));
             }
@@ Expand Down Expand Up / @@ -704,8 +703,7 @@ public EventViewModel getEventInfo(String uid) { @@
                     false,
                     false,
                     periodUtils.getPeriodUIString(stage.periodType(), event.eventDate() != null ? event.eventDate() : event.dueDate(), Locale.getDefault()),
-                    null,
-                    true
+                    null
             );
         }
@@ Expand Down @@