Add submission count to card data (#3037)

google · Feb 7, 2025 · 648c8bc · 648c8bc
1 parent 8d453f3
commit 648c8bc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/...ain/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt b/...ain/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
@@ -53,7 +53,6 @@ import kotlinx.coroutines.flow.cancellable
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import timber.log.Timber
 
 /** Main app view, displaying the map and related controls (center cross-hairs, add button, etc). */
@@ -77,9 +76,8 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
     super.onCreate(savedInstanceState)
     mapContainerViewModel = getViewModel(HomeScreenMapContainerViewModel::class.java)
     homeScreenViewModel = getViewModel(HomeScreenViewModel::class.java)
-    jobMapComposables = JobMapComposables { loi ->
-      submissionRepository.getTotalSubmissionCount(loi)
-    }
+    jobMapComposables = JobMapComposables()
+    jobMapComposables.setSelectedFeature { mapContainerViewModel.selectLocationOfInterest(it) }
 
     launchWhenStarted {
       val canUserSubmitData = userRepository.canUserSubmitData()
@@ -104,7 +102,7 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
       // Bind data for cards
       mapContainerViewModel.processDataCollectionEntryPoints().launchWhenStartedAndCollect {
         (loiCard, jobCards) ->
-        runBlocking { jobMapComposables.updateData(canUserSubmitData, loiCard, jobCards) }
+        jobMapComposables.updateData(canUserSubmitData, loiCard, jobCards)
       }
     }
 
@@ -276,8 +274,6 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
 
   override fun onMapReady(map: MapFragment) {
     mapContainerViewModel.mapLoiFeatures.launchWhenStartedAndCollect { map.setFeatures(it) }
-
-    jobMapComposables.setSelectedFeature { mapContainerViewModel.selectLocationOfInterest(it) }
   }
 
   override fun getMapViewModel(): BaseMapViewModel = mapContainerViewModel

diff --git a/...in/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt b/...in/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
@@ -188,9 +188,13 @@ internal constructor(
     combine(loisInViewport, featureClicked, adHocLoiJobs) { loisInView, feature, jobs ->
       val loiCard =
         loisInView
-          .filter { it.geometry == feature?.geometry }
-          .firstOrNull()
-          ?.let { SelectedLoiSheetData(it) }
+          .firstOrNull { it.geometry == feature?.geometry }
+          ?.let {
+            SelectedLoiSheetData(
+              loi = it,
+              submissionCount = submissionRepository.getTotalSubmissionCount(it),
+            )
+          }
       if (loiCard == null && feature != null) {
         // The feature is not in view anymore.
         featureClicked.value = null

diff --git a/.../java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt b/.../java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt
@@ -22,6 +22,7 @@ import com.google.android.ground.model.locationofinterest.LocationOfInterest
 /** Data classes used to populate the data collection entry UI, like the LOI bottom sheet. */
 sealed interface DataCollectionEntryPointData
 
-data class SelectedLoiSheetData(val loi: LocationOfInterest) : DataCollectionEntryPointData
+data class SelectedLoiSheetData(val loi: LocationOfInterest, val submissionCount: Int) :
+  DataCollectionEntryPointData
 
 data class AdHocDataCollectionButtonData(val job: Job) : DataCollectionEntryPointData
diff --git a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapComposables.kt b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapComposables.kt
@@ -71,7 +71,7 @@ import com.google.android.ground.ui.common.LocationOfInterestHelper
 import kotlinx.coroutines.launch
 
 /** Manages a set of [Composable] components that renders [LocationOfInterest] cards and dialogs. */
-class JobMapComposables(private val getSubmissionCount: suspend (loi: LocationOfInterest) -> Int) {
+class JobMapComposables {
   private var collectDataListener: MutableState<(DataCollectionEntryPointData) -> Unit> =
     mutableStateOf({})
   private var canUserSubmitData = mutableStateOf(false)
@@ -98,7 +98,7 @@ class JobMapComposables(private val getSubmissionCount: suspend (loi: LocationOf
   }
 
   /** Overwrites existing cards. */
-  suspend fun updateData(
+  fun updateData(
     canUserSubmitData: Boolean,
     selectedLoi: SelectedLoiSheetData?,
     addLoiJobs: List<AdHocDataCollectionButtonData>,
@@ -108,7 +108,7 @@ class JobMapComposables(private val getSubmissionCount: suspend (loi: LocationOf
     newLoiJobs.clear()
     newLoiJobs.addAll(addLoiJobs)
     if (selectedLoi != null) {
-      submissionCount.intValue = getSubmissionCount(selectedLoi.loi)
+      submissionCount.intValue = selectedLoi.submissionCount
       jobCardOpened.value = true
       selectedFeatureListener(selectedLoi.loi.id)
     }

diff --git a/...ava/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModelTest.kt b/...ava/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModelTest.kt
@@ -84,7 +84,7 @@ class HomeScreenMapContainerViewModelTest : BaseHiltTest() {
   fun `renders the job card when zoomed into LOI and clicked on`() = runWithTestDispatcher {
     viewModel.onFeatureClicked(features = setOf(LOCATION_OF_INTEREST_FEATURE))
     val pair = viewModel.processDataCollectionEntryPoints().first()
-    assertThat(pair.first).isEqualTo(SelectedLoiSheetData(LOCATION_OF_INTEREST))
+    assertThat(pair.first).isEqualTo(SelectedLoiSheetData(LOCATION_OF_INTEREST, 0))
     assertThat(pair.second).isEqualTo(listOf(AdHocDataCollectionButtonData(ADHOC_JOB)))
   }