Merge branch 'master' into feature-optimize-adapter-courses-diffutil

Author: dogi

.github/workflows/android-build.yml

@@ -5,8 +5,10 @@ on:
     branches:
       - '*'
       - '!master'
-      - 'dependabot/**'
+      - 'claude/**'
       - 'codex/**'
+      - 'dependabot/**'
+      - 'jules/**'
       - '*-codex/**'
 
 jobs:

app/src/main/java/org/ole/planet/myplanet/base/BaseResourceFragment.kt

@@ -489,9 +489,6 @@ abstract class BaseResourceFragment : Fragment() {
     }
 
     override fun onDestroy() {
-        if (::profileDbHandler.isInitialized) {
-            profileDbHandler.onDestroy()
-        }
         cleanupRealm()
         super.onDestroy()
     }

app/src/main/java/org/ole/planet/myplanet/datamanager/ApiClient.kt

@@ -11,6 +11,7 @@ import retrofit2.Retrofit
 object ApiClient {
     lateinit var client: Retrofit
 
+    @Deprecated("This function blocks the calling thread. Use a coroutine with executeWithRetryAndWrap instead.")
     fun <T> executeWithRetry(operation: () -> Response<T>?): Response<T>? = runBlocking {
         RetryUtils.retry(
             maxAttempts = 3,
@@ -20,6 +21,15 @@ object ApiClient {
         )
     }
 
+    suspend fun <T> executeWithRetryAndWrap(operation: suspend () -> Response<T>?): Response<T>? {
+        return RetryUtils.retry(
+            maxAttempts = 3,
+            delayMs = 2000L,
+            shouldRetry = { resp -> resp == null || !resp.isSuccessful },
+            block = { operation() },
+        )
+    }
+
     suspend fun <T> executeWithResult(operation: suspend () -> Response<T>?): NetworkResult<T> {
         var retryCount = 0
         var lastException: Exception? = null

app/src/main/java/org/ole/planet/myplanet/repository/NewsRepositoryImpl.kt

@@ -7,6 +7,7 @@ import io.realm.Sort
 import java.util.HashMap
 import javax.inject.Inject
 import org.ole.planet.myplanet.datamanager.DatabaseService
+import org.ole.planet.myplanet.datamanager.findCopyByField
 import org.ole.planet.myplanet.model.RealmNews
 import org.ole.planet.myplanet.model.RealmNews.Companion.createNews
 import org.ole.planet.myplanet.model.RealmUserModel
@@ -17,12 +18,15 @@ class NewsRepositoryImpl @Inject constructor(
 ) : RealmRepository(databaseService), NewsRepository {
 
     override suspend fun getNewsWithReplies(newsId: String): Pair<RealmNews?, List<RealmNews>> {
-        val news = findByField(RealmNews::class.java, "id", newsId)
-        val replies = queryList(RealmNews::class.java) {
-            equalTo("replyTo", newsId, Case.INSENSITIVE)
-            sort("time", Sort.DESCENDING)
+        return withRealm(ensureLatest = true) { realm ->
+            val news = realm.findCopyByField(RealmNews::class.java, "id", newsId)
+            val replies = realm.where(RealmNews::class.java)
+                .equalTo("replyTo", newsId, Case.INSENSITIVE)
+                .sort("time", Sort.DESCENDING)
+                .findAll()
+                .let { realm.copyFromRealm(it) }
+            news to replies
         }
-        return news to replies
     }
 
     override suspend fun getCommunityVisibleNews(userIdentifier: String): List<RealmNews> {

app/src/main/java/org/ole/planet/myplanet/repository/RealmRepository.kt

@@ -18,16 +18,28 @@ open class RealmRepository(private val databaseService: DatabaseService) {
     protected suspend fun <T : RealmObject> queryList(
         clazz: Class<T>,
         builder: RealmQuery<T>.() -> Unit = {},
+    ): List<T> = queryList(clazz, false, builder)
+
+    protected suspend fun <T : RealmObject> queryList(
+        clazz: Class<T>,
+        ensureLatest: Boolean,
+        builder: RealmQuery<T>.() -> Unit = {},
     ): List<T> =
-        databaseService.withRealmAsync { realm ->
+        withRealm(ensureLatest) { realm ->
             realm.queryList(clazz, builder)
         }
 
     protected suspend fun <T : RealmObject> count(
         clazz: Class<T>,
         builder: RealmQuery<T>.() -> Unit = {},
+    ): Long = count(clazz, false, builder)
+
+    protected suspend fun <T : RealmObject> count(
+        clazz: Class<T>,
+        ensureLatest: Boolean,
+        builder: RealmQuery<T>.() -> Unit = {},
     ): Long =
-        databaseService.withRealmAsync { realm ->
+        withRealm(ensureLatest) { realm ->
             realm.where(clazz).apply(builder).count()
         }
 
@@ -54,8 +66,15 @@ open class RealmRepository(private val databaseService: DatabaseService) {
         clazz: Class<T>,
         fieldName: String,
         value: V,
+    ): T? = findByField(clazz, fieldName, value, false)
+
+    protected suspend fun <T : RealmObject, V : Any> findByField(
+        clazz: Class<T>,
+        fieldName: String,
+        value: V,
+        ensureLatest: Boolean,
     ): T? =
-        databaseService.withRealmAsync { realm ->
+        withRealm(ensureLatest) { realm ->
             realm.findCopyByField(clazz, fieldName, value)
         }
 
@@ -90,8 +109,20 @@ open class RealmRepository(private val databaseService: DatabaseService) {
         }
     }
 
+    protected suspend fun <T> withRealm(
+        ensureLatest: Boolean = false,
+        operation: (Realm) -> T,
+    ): T {
+        return databaseService.withRealmAsync { realm ->
+            if (ensureLatest) {
+                realm.refresh()
+            }
+            operation(realm)
+        }
+    }
+
     protected suspend fun <T> withRealmAsync(operation: (Realm) -> T): T {
-        return databaseService.withRealmAsync(operation)
+        return withRealm(false, operation)
     }
 
     protected fun <T> withRealmFlow(

app/src/main/java/org/ole/planet/myplanet/repository/SurveyRepository.kt

@@ -1,9 +1,16 @@
 package org.ole.planet.myplanet.repository
 
 import org.ole.planet.myplanet.model.RealmStepExam
+import org.ole.planet.myplanet.ui.survey.SurveyInfo
 
 interface SurveyRepository {
     suspend fun getTeamOwnedSurveys(teamId: String?): List<RealmStepExam>
     suspend fun getAdoptableTeamSurveys(teamId: String?): List<RealmStepExam>
     suspend fun getIndividualSurveys(): List<RealmStepExam>
+    suspend fun getSurveyInfos(
+        isTeam: Boolean,
+        teamId: String?,
+        userId: String?,
+        surveys: List<RealmStepExam>
+    ): Map<String, SurveyInfo>
 }

app/src/main/java/org/ole/planet/myplanet/repository/SurveyRepositoryImpl.kt

@@ -1,13 +1,21 @@
 package org.ole.planet.myplanet.repository
 
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.realm.Sort
 import javax.inject.Inject
 import org.json.JSONException
 import org.json.JSONObject
+import org.ole.planet.myplanet.R
 import org.ole.planet.myplanet.datamanager.DatabaseService
 import org.ole.planet.myplanet.model.RealmStepExam
 import org.ole.planet.myplanet.model.RealmSubmission
+import org.ole.planet.myplanet.ui.survey.SurveyInfo
+import org.ole.planet.myplanet.utilities.TimeUtils.formatDate
+import org.ole.planet.myplanet.utilities.TimeUtils.getFormattedDateWithTime
 
 class SurveyRepositoryImpl @Inject constructor(
+    @ApplicationContext private val context: Context,
     databaseService: DatabaseService
 ) : RealmRepository(databaseService), SurveyRepository {
 
@@ -77,4 +85,44 @@ class SurveyRepositoryImpl @Inject constructor(
             null
         }
     }
+
+    override suspend fun getSurveyInfos(
+        isTeam: Boolean,
+        teamId: String?,
+        userId: String?,
+        surveys: List<RealmStepExam>
+    ): Map<String, SurveyInfo> {
+        val surveyIds = surveys.map { it.id }
+        val submissions = queryList(RealmSubmission::class.java) {
+            `in`("parentId", surveyIds.toTypedArray())
+        }
+        val surveyInfos = mutableMapOf<String, SurveyInfo>()
+        for (survey in surveys) {
+            val surveyId = survey.id ?: continue
+            val submissionCount = if (isTeam) {
+                submissions.count { it.parentId == surveyId && it.membershipDoc?.teamId == teamId }.toString()
+            } else {
+                submissions.count { it.parentId == surveyId && it.userId == userId }.toString()
+            }
+            val lastSubmissionDate = if (isTeam) {
+                submissions.filter { it.parentId == surveyId && it.membershipDoc?.teamId == teamId }
+                    .maxByOrNull { it.startTime }?.startTime?.let { getFormattedDateWithTime(it) } ?: ""
+            } else {
+                submissions.filter { it.parentId == surveyId && it.userId == userId }
+                    .maxByOrNull { it.startTime }?.startTime?.let { getFormattedDateWithTime(it) } ?: ""
+            }
+            val creationDate = survey.createdDate.let { formatDate(it, "MMM dd, yyyy") } ?: ""
+            surveyInfos[surveyId] = SurveyInfo(
+                surveyId = surveyId,
+                submissionCount = context.resources.getQuantityString(
+                    R.plurals.survey_taken_count,
+                    submissionCount.toInt(),
+                    submissionCount.toInt()
+                ),
+                lastSubmissionDate = lastSubmissionDate,
+                creationDate = creationDate
+            )
+        }
+        return surveyInfos
+    }
 }

app/src/main/java/org/ole/planet/myplanet/repository/TeamRepository.kt

@@ -7,6 +7,12 @@ import org.ole.planet.myplanet.model.RealmMyTeam
 import org.ole.planet.myplanet.model.RealmTeamTask
 import org.ole.planet.myplanet.model.RealmUserModel
 
+data class TeamMemberStatus(
+    val isMember: Boolean,
+    val isLeader: Boolean,
+    val hasPendingRequest: Boolean
+)
+
 interface TeamRepository {
     suspend fun getShareableTeams(): List<RealmMyTeam>
     suspend fun getShareableEnterprises(): List<RealmMyTeam>
@@ -17,6 +23,7 @@ interface TeamRepository {
     suspend fun isMember(userId: String?, teamId: String): Boolean
     suspend fun isTeamLeader(teamId: String, userId: String?): Boolean
     suspend fun hasPendingRequest(teamId: String, userId: String?): Boolean
+    suspend fun getTeamMemberStatuses(userId: String?, teamIds: Collection<String>): Map<String, TeamMemberStatus>
     suspend fun getRecentVisitCounts(teamIds: Collection<String>): Map<String, Long>
     suspend fun requestToJoin(teamId: String, userId: String?, userPlanetCode: String?, teamType: String?)
     suspend fun leaveTeam(teamId: String, userId: String?)

app/src/main/java/org/ole/planet/myplanet/repository/TeamRepositoryImpl.kt

@@ -199,6 +199,46 @@ class TeamRepositoryImpl @Inject constructor(
         } > 0
     }
 
+    override suspend fun getTeamMemberStatuses(userId: String?, teamIds: Collection<String>): Map<String, TeamMemberStatus> {
+        if (userId.isNullOrBlank() || teamIds.isEmpty()) return emptyMap()
+
+        val validIds = teamIds.filter { it.isNotBlank() }.distinct()
+        if (validIds.isEmpty()) return emptyMap()
+
+        val memberships = queryList(RealmMyTeam::class.java) {
+            equalTo("userId", userId)
+            equalTo("docType", "membership")
+            `in`("teamId", validIds.toTypedArray())
+        }
+
+        val pendingRequests = queryList(RealmMyTeam::class.java) {
+            equalTo("userId", userId)
+            equalTo("docType", "request")
+            `in`("teamId", validIds.toTypedArray())
+        }
+
+        val membershipMap = memberships
+            .mapNotNull { it.teamId }
+            .toSet()
+
+        val leaderMap = memberships
+            .filter { it.isLeader }
+            .mapNotNull { it.teamId }
+            .toSet()
+
+        val pendingRequestMap = pendingRequests
+            .mapNotNull { it.teamId }
+            .toSet()
+
+        return validIds.associateWith { teamId ->
+            TeamMemberStatus(
+                isMember = teamId in membershipMap,
+                isLeader = teamId in leaderMap,
+                hasPendingRequest = teamId in pendingRequestMap
+            )
+        }
+    }
+
     override suspend fun getRecentVisitCounts(teamIds: Collection<String>): Map<String, Long> {
         if (teamIds.isEmpty()) return emptyMap()