Prevent over claiming

app-sandbox/src/main/java/com/crisiscleanup/sandbox/SandboxApplication.kt

@@ -130,6 +130,10 @@ class AppSyncer @Inject constructor() : SyncPuller, SyncPusher {
 
     override suspend fun syncPullStatuses() = SyncResult.NotAttempted("")
 
+    override fun appPullAppConfig() {}
+
+    override suspend fun syncPullAppConfig() = SyncResult.NotAttempted("")
+
     override fun appPushWorksite(worksiteId: Long, scheduleMediaSync: Boolean) {}
 
     override suspend fun syncPushWorksitesAsync() = CompletableDeferred(SyncResult.NotAttempted(""))

app/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 
 android {
     defaultConfig {
-        val buildVersion = 277
+        val buildVersion = 281
         applicationId = "com.crisiscleanup"
         versionCode = buildVersion
         versionName = "0.9.${buildVersion - 168}"

app/src/main/java/com/crisiscleanup/MainActivityViewModel.kt

@@ -172,7 +172,7 @@ class MainActivityViewModel @Inject constructor(
                         syncFullWorksites = false,
                     )
                     accountDataRefresher.updateMyOrganization(true)
-                    accountDataRefresher.updateApprovedIncidents()
+                    accountDataRefresher.updateProfileIncidentsData()
 
                     logger.setAccountId(it.id.toString())
                 } else {
@@ -206,6 +206,7 @@ class MainActivityViewModel @Inject constructor(
 
         syncPuller.appPullLanguage()
         syncPuller.appPullStatuses()
+        syncPuller.appPullAppConfig()
 
         syncPusher.scheduleSyncMedia()
 

app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupNavHost.kt

@@ -7,6 +7,9 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
+import com.crisiscleanup.core.appnav.RouteConstant.ACCOUNT_RESET_PASSWORD_ROUTE
+import com.crisiscleanup.core.appnav.RouteConstant.ACCOUNT_TRANSFER_ORG_ROUTE
+import com.crisiscleanup.core.appnav.RouteConstant.CASES_FILTER_ROUTE
 import com.crisiscleanup.core.appnav.RouteConstant.CASES_GRAPH_ROUTE
 import com.crisiscleanup.core.appnav.RouteConstant.CASES_SEARCH_ROUTE
 import com.crisiscleanup.core.appnav.RouteConstant.CASE_ADD_FLAG_ROUTE
@@ -16,7 +19,15 @@ import com.crisiscleanup.core.appnav.RouteConstant.CASE_EDITOR_SEARCH_ADDRESS_RO
 import com.crisiscleanup.core.appnav.RouteConstant.CASE_HISTORY_ROUTE
 import com.crisiscleanup.core.appnav.RouteConstant.CASE_SHARE_ROUTE
 import com.crisiscleanup.core.appnav.RouteConstant.INCIDENT_WORKSITES_CACHE_ROUTE
+import com.crisiscleanup.core.appnav.RouteConstant.INVITE_TEAMMATE_ROUTE
+import com.crisiscleanup.core.appnav.RouteConstant.LISTS_ROUTE
+import com.crisiscleanup.core.appnav.RouteConstant.REQUEST_REDEPLOY_ROUTE
+import com.crisiscleanup.core.appnav.RouteConstant.USER_FEEDBACK_ROUTE
+import com.crisiscleanup.core.appnav.RouteConstant.VIEW_CASE_ROUTE
 import com.crisiscleanup.core.appnav.RouteConstant.VIEW_CASE_TRANSFER_WORK_TYPES_ROUTE
+import com.crisiscleanup.core.appnav.RouteConstant.VIEW_IMAGE_ROUTE
+import com.crisiscleanup.core.appnav.RouteConstant.VIEW_LIST_ROUTE
+import com.crisiscleanup.core.appnav.RouteConstant.VIEW_TEAM_ROUTE
 import com.crisiscleanup.core.appnav.RouteConstant.WORKSITE_IMAGES_ROUTE
 import com.crisiscleanup.core.appnav.navigateToExistingCase
 import com.crisiscleanup.core.data.model.ExistingWorksiteIdentifier
@@ -161,13 +172,17 @@ fun CrisisCleanupNavHost(
 
     val searchCasesOnBack = rememberBackOnRoute(navController, onBack, CASES_SEARCH_ROUTE)
 
+    val filterCasesOnBack = rememberBackOnRoute(navController, onBack, CASES_FILTER_ROUTE)
+
     val caseEditorOnBack = rememberBackStartingRoute(navController, onBack, CASE_EDITOR_ROUTE)
 
     val searchAddressOnBack =
         rememberBackOnRoute(navController, onBack, CASE_EDITOR_SEARCH_ADDRESS_ROUTE)
     val moveLocationOnBack =
         rememberBackOnRoute(navController, onBack, CASE_EDITOR_MAP_MOVE_LOCATION_ROUTE)
 
+    val viewCaseOnBack = rememberBackStartingRoute(navController, onBack, VIEW_CASE_ROUTE)
+
     val transferOnBack =
         rememberBackStartingRoute(navController, onBack, VIEW_CASE_TRANSFER_WORK_TYPES_ROUTE)
 
@@ -177,13 +192,25 @@ fun CrisisCleanupNavHost(
 
     val historyOnBack = rememberBackOnRoute(navController, onBack, CASE_HISTORY_ROUTE)
 
+    val viewTeamOnBack = rememberBackStartingRoute(navController, onBack, VIEW_TEAM_ROUTE)
+
+    val viewSingleImageOnBack = rememberBackStartingRoute(navController, onBack, VIEW_IMAGE_ROUTE)
     val worksiteImagesOnBack =
         rememberBackStartingRoute(navController, onBack, WORKSITE_IMAGES_ROUTE)
 
     val incidentWorksitesCacheOnBack =
         rememberBackOnRoute(navController, onBack, INCIDENT_WORKSITES_CACHE_ROUTE)
     val openIncidentCache = navController::navigateToIncidentWorksitesCache
 
+    val viewListsOnBack = rememberBackOnRoute(navController, onBack, LISTS_ROUTE)
+    val viewListOnBack = rememberBackStartingRoute(navController, onBack, VIEW_LIST_ROUTE)
+    val inviteTeammatesOnBack = rememberBackOnRoute(navController, onBack, INVITE_TEAMMATE_ROUTE)
+    val requestRedeployOnBack = rememberBackOnRoute(navController, onBack, REQUEST_REDEPLOY_ROUTE)
+    val userFeedbackOnBack = rememberBackOnRoute(navController, onBack, USER_FEEDBACK_ROUTE)
+
+    val resetPasswordOnBack = rememberBackOnRoute(navController, onBack, ACCOUNT_RESET_PASSWORD_ROUTE)
+    val requestAccessOnBack = rememberBackStartingRoute(navController, onBack, ACCOUNT_TRANSFER_ORG_ROUTE)
+
     NavHost(
         navController = navController,
         startDestination = startDestination,
@@ -193,11 +220,11 @@ fun CrisisCleanupNavHost(
             navController,
             nestedGraphs = {
                 casesSearchScreen(searchCasesOnBack, viewCase)
-                casesFilterScreen(onBack)
+                casesFilterScreen(filterCasesOnBack)
                 caseEditorScreen(navController, caseEditorOnBack)
                 caseEditSearchAddressScreen(navController, searchAddressOnBack)
                 caseEditMoveLocationOnMapScreen(moveLocationOnBack)
-                existingCaseScreen(navController, onBack)
+                existingCaseScreen(navController, viewCaseOnBack)
                 existingCaseTransferWorkTypesScreen(transferOnBack)
                 caseAddFlagScreen(addFlagOnBack, replaceRouteViewCase)
                 caseShareScreen(shareOnBack)
@@ -213,7 +240,7 @@ fun CrisisCleanupNavHost(
         dashboardScreen()
         teamsScreen(
             nestedGraphs = {
-                viewTeamScreen(onBack)
+                viewTeamScreen(viewTeamOnBack)
             },
             openAuthentication = openAuthentication,
             openViewTeam = navController::navigateToViewTeam,
@@ -229,29 +256,29 @@ fun CrisisCleanupNavHost(
             openSyncLogs = navController::navigateToSyncInsights,
         )
         incidentWorksitesCache(incidentWorksitesCacheOnBack)
-        viewSingleImageScreen(onBack)
+        viewSingleImageScreen(viewSingleImageOnBack)
         viewWorksiteImagesScreen(worksiteImagesOnBack)
-        inviteTeammateScreen(onBack)
-        requestRedeployScreen(onBack)
-        userFeedbackScreen(onBack)
-        listsScreen(navController, onBack)
+        inviteTeammateScreen(inviteTeammatesOnBack)
+        requestRedeployScreen(requestRedeployOnBack)
+        userFeedbackScreen(userFeedbackOnBack)
+        listsScreen(navController, viewListsOnBack)
         viewListScreen(
-            onBack,
+            viewListOnBack,
             openList = openList,
             openWorksite = openViewCase,
         )
         syncInsightsScreen(viewCase)
 
         resetPasswordScreen(
             isAuthenticated = true,
-            onBack = onBack,
-            closeResetPassword = onBack,
+            onBack = resetPasswordOnBack,
+            closeResetPassword = resetPasswordOnBack,
         )
 
         requestAccessScreen(
             true,
-            onBack = onBack,
-            closeRequestAccess = onBack,
+            onBack = requestAccessOnBack,
+            closeRequestAccess = requestAccessOnBack,
             openAuth = {},
             openForgotPassword = {},
         )

core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/GooglePlaceAddressSearchRepository.kt

@@ -18,8 +18,8 @@ import com.google.android.libraries.places.api.Places
 import com.google.android.libraries.places.api.model.AutocompletePrediction
 import com.google.android.libraries.places.api.model.AutocompleteSessionToken
 import com.google.android.libraries.places.api.model.Place
+import com.google.android.libraries.places.api.model.PlaceTypes
 import com.google.android.libraries.places.api.model.RectangularBounds
-import com.google.android.libraries.places.api.model.TypeFilter
 import com.google.android.libraries.places.api.net.FetchPlaceRequest
 import com.google.android.libraries.places.api.net.FindAutocompletePredictionsRequest
 import com.google.android.libraries.places.api.net.PlacesClient
@@ -143,15 +143,14 @@ class GooglePlaceAddressSearchRepository @Inject constructor(
         }
 
         val hasBounds = southwest != null && northeast != null
-        val bounds =
-            if (hasBounds) RectangularBounds.newInstance(southwest!!, northeast!!) else null
+        val bounds = if (hasBounds) RectangularBounds.newInstance(southwest, northeast) else null
         val request = FindAutocompletePredictionsRequest.builder()
             // Call either setLocationBias() OR setLocationRestriction().
             .setLocationBias(bounds)
             // .setLocationRestriction(bounds)
             .setOrigin(center)
             .setCountries(countryCodes)
-            .setTypesFilter(listOf(TypeFilter.ADDRESS.toString().lowercase()))
+            .setTypesFilter(listOf(PlaceTypes.ADDRESS))
             .setQuery(query)
             .setSessionToken(getSessionToken())
             .build()

core/common/src/main/java/com/crisiscleanup/core/common/sync/Syncer.kt

@@ -36,6 +36,9 @@ interface SyncPuller {
     fun appPullStatuses()
     suspend fun syncPullStatuses(): SyncResult
 
+    fun appPullAppConfig()
+    suspend fun syncPullAppConfig(): SyncResult
+
     fun appPullIncidents() = appPullIncidentData(
         cancelOngoing = true,
         forcePullIncidents = true,

core/data/build.gradle.kts

@@ -34,4 +34,5 @@ dependencies {
     testImplementation(projects.core.testing)
     testImplementation(projects.core.datastoreTest)
     testImplementation(libs.kotlinx.coroutines.test)
+    testImplementation(libs.mockk)
 }

core/data/src/main/java/com/crisiscleanup/core/data/WorkTypeAnalyzer.kt

@@ -0,0 +1,105 @@
+package com.crisiscleanup.core.data
+
+import com.crisiscleanup.core.database.dao.WorksiteChangeDao
+import com.crisiscleanup.core.model.data.closedWorkTypeStatuses
+import com.crisiscleanup.core.model.data.statusFromLiteral
+import com.crisiscleanup.core.network.worksitechange.WorkTypeSnapshot
+import com.crisiscleanup.core.network.worksitechange.WorksiteChange
+import kotlinx.serialization.json.Json
+import javax.inject.Inject
+
+interface WorkTypeAnalyzer {
+    fun countUnsyncedClaimCloseWork(
+        orgId: Long,
+        incidentId: Long,
+        ignoreWorksiteIds: Set<Long>,
+    ): ClaimCloseCounts
+}
+
+private val WorkTypeSnapshot.WorkType.isClosed: Boolean
+    get() {
+        val workTypeStatus = statusFromLiteral(status)
+        return closedWorkTypeStatuses.contains(workTypeStatus)
+    }
+
+class WorksiteChangeWorkTypeAnalyzer @Inject constructor(
+    private val worksiteChangeDao: WorksiteChangeDao,
+) : WorkTypeAnalyzer {
+    override fun countUnsyncedClaimCloseWork(
+        orgId: Long,
+        incidentId: Long,
+        ignoreWorksiteIds: Set<Long>,
+    ): ClaimCloseCounts {
+        val worksiteChangesLookup = mutableMapOf<Long, Pair<String, String?>>()
+        worksiteChangeDao.getOrgChanges(orgId)
+            .filter {
+                !ignoreWorksiteIds.contains(it.entity.worksiteId)
+            }
+            .onEach {
+                with(it.entity) {
+                    val entry = worksiteChangesLookup[worksiteId]
+                    worksiteChangesLookup[worksiteId] = if (entry == null) {
+                        Pair(changeData, null)
+                    } else {
+                        Pair(entry.first, changeData)
+                    }
+                }
+            }
+
+        val workTypeChanges =
+            mutableListOf<Pair<WorkTypeSnapshot.WorkType, WorkTypeSnapshot.WorkType?>>()
+
+        val json = Json {
+            ignoreUnknownKeys = true
+            explicitNulls = false
+        }
+        worksiteChangesLookup.forEach { entry ->
+            val (firstSerializedChange, lastSerializedChange) = entry.value
+            val firstChange = json.decodeFromString<WorksiteChange>(firstSerializedChange)
+            firstChange.start?.let { firstSnapshot ->
+                if (firstSnapshot.core.networkId > 0) {
+                    val lastSnapshot = lastSerializedChange?.let {
+                        json.decodeFromString<WorksiteChange>(lastSerializedChange).change
+                    } ?: firstChange.change
+                    if (lastSnapshot.core.incidentId == incidentId) {
+                        val startWorkLookup = firstSnapshot.workTypes.associateBy { it.localId }
+                        val lastWorkLookup = lastSnapshot.workTypes.associateBy { it.localId }
+                        for ((id, startWorkType) in startWorkLookup) {
+                            // TODO Test coverage on last work type is null
+                            val lastWorkType = lastWorkLookup[id]?.workType
+                            val change = Pair(startWorkType.workType, lastWorkType)
+                            workTypeChanges.add(change)
+                        }
+                    }
+                }
+            }
+        }
+
+        var claimCount = 0
+        var closeCount = 0
+        for ((startWorkType, lastWorkType) in workTypeChanges) {
+            val wasClaimed = startWorkType.orgClaim == orgId
+            val isClaimed = lastWorkType?.orgClaim == orgId
+            if (wasClaimed != isClaimed) {
+                claimCount += if (isClaimed) 1 else -1
+
+                if (isClaimed && lastWorkType.isClosed) {
+                    closeCount++
+                }
+            } else if (isClaimed) {
+                val wasClosed = startWorkType.isClosed
+                val isClosed = lastWorkType.isClosed
+                if (wasClosed != isClosed) {
+                    closeCount += if (isClosed) 1 else -1
+                }
+            }
+        }
+
+        return ClaimCloseCounts(claimCount = claimCount, closeCount = closeCount)
+    }
+}
+
+data class ClaimCloseCounts(
+    val claimCount: Int,
+    val closeCount: Int,
+)

core/data/src/main/java/com/crisiscleanup/core/data/di/DataModule.kt

@@ -6,8 +6,11 @@ import com.crisiscleanup.core.data.AppIncidentMapTracker
 import com.crisiscleanup.core.data.IncidentMapTracker
 import com.crisiscleanup.core.data.IncidentSelectManager
 import com.crisiscleanup.core.data.IncidentSelector
+import com.crisiscleanup.core.data.WorkTypeAnalyzer
+import com.crisiscleanup.core.data.WorksiteChangeWorkTypeAnalyzer
 import com.crisiscleanup.core.data.repository.AccountDataRepository
 import com.crisiscleanup.core.data.repository.AccountUpdateRepository
+import com.crisiscleanup.core.data.repository.AppConfigRepository
 import com.crisiscleanup.core.data.repository.AppDataManagementRepository
 import com.crisiscleanup.core.data.repository.AppEndOfLifeRepository
 import com.crisiscleanup.core.data.repository.AppMetricsRepository
@@ -16,8 +19,10 @@ import com.crisiscleanup.core.data.repository.CaseHistoryRepository
 import com.crisiscleanup.core.data.repository.CasesFilterRepository
 import com.crisiscleanup.core.data.repository.CrisisCleanupAccountDataRepository
 import com.crisiscleanup.core.data.repository.CrisisCleanupAccountUpdateRepository
+import com.crisiscleanup.core.data.repository.CrisisCleanupAppConfigRepository
 import com.crisiscleanup.core.data.repository.CrisisCleanupCasesFilterRepository
 import com.crisiscleanup.core.data.repository.CrisisCleanupDataManagementRepository
+import com.crisiscleanup.core.data.repository.CrisisCleanupIncidentClaimThresholdRepository
 import com.crisiscleanup.core.data.repository.CrisisCleanupListsRepository
 import com.crisiscleanup.core.data.repository.CrisisCleanupLocalImageRepository
 import com.crisiscleanup.core.data.repository.CrisisCleanupOrgVolunteerRepository
@@ -28,6 +33,7 @@ import com.crisiscleanup.core.data.repository.CrisisCleanupWorkTypeStatusReposit
 import com.crisiscleanup.core.data.repository.CrisisCleanupWorksiteChangeRepository
 import com.crisiscleanup.core.data.repository.EndOfLifeRepository
 import com.crisiscleanup.core.data.repository.IncidentCacheRepository
+import com.crisiscleanup.core.data.repository.IncidentClaimThresholdRepository
 import com.crisiscleanup.core.data.repository.IncidentWorksitesCacheRepository
 import com.crisiscleanup.core.data.repository.IncidentsRepository
 import com.crisiscleanup.core.data.repository.LanguageTranslationsRepository
@@ -215,4 +221,15 @@ interface DataModule {
     fun bindsIncidentCacheRepository(
         repository: IncidentWorksitesCacheRepository,
     ): IncidentCacheRepository
+
+    @Binds
+    fun bindsAppConfigRepository(repository: CrisisCleanupAppConfigRepository): AppConfigRepository
+
+    @Binds
+    fun bindsIncidentClaimThresholdRepository(
+        repository: CrisisCleanupIncidentClaimThresholdRepository,
+    ): IncidentClaimThresholdRepository
+
+    @Binds
+    fun bindsWorkTypeAnalyzer(analyzer: WorksiteChangeWorkTypeAnalyzer): WorkTypeAnalyzer
 }

core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkIncident.kt

@@ -20,6 +20,7 @@ fun NetworkIncident.asEntity() = IncidentEntity(
     turnOnRelease = turnOnRelease,
     isArchived = isArchived ?: false,
     type = type,
+    ignoreClaimingThresholds = ignoreClaimingThresholds ?: false,
 )
 
 fun NetworkIncident.locationsAsEntity(): List<IncidentLocationEntity> =