teams: smoother courses handling (fixes #5747) (#11247)

Co-authored-by: Pavneet Singh Cheema <90737218+pavi38@users.noreply.github.com>
Co-authored-by: dogi <dogi@users.noreply.github.com>

Author: 3 people

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 4602
-        versionName = "0.46.2"
+        versionCode = 4603
+        versionName = "0.46.3"
         ndkVersion = '26.3.11579264'
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/java/org/ole/planet/myplanet/callback/OnTeamPageListener.kt

@@ -1,5 +1,6 @@
 package org.ole.planet.myplanet.callback
 
 interface OnTeamPageListener {
+    fun onAddCourse()
     fun onAddDocument()
 }

app/src/main/java/org/ole/planet/myplanet/model/RealmMyCourse.kt

@@ -277,5 +277,43 @@ open class RealmMyCourse : RealmObject() {
             }
             return ids
         }
+
+        @JvmStatic
+        fun serialize(course: RealmMyCourse, realm: Realm): JsonObject {
+            val obj = JsonObject()
+            obj.addProperty("_id", course.courseId)
+            obj.addProperty("_rev", course.courseRev)
+            obj.addProperty("courseTitle", course.courseTitle)
+            obj.addProperty("description", course.description)
+            obj.addProperty("languageOfInstruction", course.languageOfInstruction)
+            obj.addProperty("gradeLevel", course.gradeLevel)
+            obj.addProperty("subjectLevel", course.subjectLevel)
+            obj.addProperty("createdDate", course.createdDate)
+            obj.addProperty("method", course.method)
+            obj.addProperty("memberLimit", course.memberLimit)
+
+            val stepsArray = JsonArray()
+            course.courseSteps?.forEach { step ->
+                val stepObj = JsonObject()
+                stepObj.addProperty("stepTitle", step.stepTitle)
+                stepObj.addProperty("description", step.description)
+                stepObj.addProperty("id", step.id)
+
+                val resourcesArray = JsonArray()
+                val stepResources = realm.where(RealmMyLibrary::class.java)
+                    .equalTo("stepId", step.id)
+                    .equalTo("courseId", course.courseId)
+                    .findAll()
+
+                stepResources.forEach { resource ->
+                    resourcesArray.add(resource.serializeResource())
+                }
+                stepObj.add("resources", resourcesArray)
+                stepsArray.add(stepObj)
+            }
+            obj.add("steps", stepsArray)
+            obj.add("images", JsonArray())
+            return obj
+        }
     }
 }

app/src/main/java/org/ole/planet/myplanet/model/RealmMyTeam.kt

@@ -1,6 +1,7 @@
 package org.ole.planet.myplanet.model
 
 import android.content.SharedPreferences
+import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import io.realm.Realm
@@ -94,18 +95,36 @@ open class RealmMyTeam : RealmObject() {
             team.startDate = JsonUtils.getLong("startDate", doc)
             team.endDate = JsonUtils.getLong("endDate", doc)
             team.updatedDate = JsonUtils.getLong("updatedDate", doc)
-            team.updated = JsonUtils.getBoolean("updated", doc)
 
-            if (includeCourses) {
-                val coursesArray = JsonUtils.getJsonArray("courses", doc)
-                team.courses = RealmList()
-                for (e in coursesArray) {
+            val hadLocalChanges = team.updated
+            val localCourses = team.courses?.toList() ?: emptyList()
+
+            if (!hadLocalChanges) {
+                team.updated = JsonUtils.getBoolean("updated", doc)
+            }
+
+            val coursesArray = JsonUtils.getJsonArray("courses", doc)
+            val serverCourseIds = mutableListOf<String>()
+            for (e in coursesArray) {
+                try {
                     val id = e.asJsonObject["_id"].asString
-                    if (!team.courses!!.contains(id)) {
-                        team.courses!!.add(id)
+                    serverCourseIds.add(id)
+                } catch (ex: Exception) {
+                    if (e.isJsonPrimitive) {
+                        serverCourseIds.add(e.asString)
                     }
                 }
             }
+
+            if (hadLocalChanges) {
+                val mergedCourses = serverCourseIds.toMutableSet()
+                mergedCourses.addAll(localCourses)
+                team.courses = RealmList()
+                team.courses?.addAll(mergedCourses)
+            } else {
+                team.courses = RealmList()
+                team.courses?.addAll(serverCourseIds)
+            }
         }
 
         private fun processDescription(description: String?) {
@@ -305,6 +324,28 @@ open class RealmMyTeam : RealmObject() {
             return JsonParser.parseString(JsonUtils.gson.toJson(`object`)).asJsonObject
         }
 
+        @JvmStatic
+        fun serialize(team: RealmMyTeam, realm: Realm): JsonObject {
+            val `object` = serialize(team)
+
+            if (!team.courses.isNullOrEmpty()) {
+                val coursesArray = JsonArray()
+
+                team.courses?.forEach { courseId ->
+                    val course = realm.where(RealmMyCourse::class.java)
+                        .equalTo("courseId", courseId)
+                        .findFirst()
+
+                    if (course != null) {
+                        val courseJson = RealmMyCourse.serialize(course, realm)
+                        coursesArray.add(courseJson)
+                    }
+                }
+                `object`.add("courses", coursesArray)
+            }
+            return `object`
+        }
+
         fun getMyTeamsByUserId(mRealm: Realm, settings: SharedPreferences?): RealmResults<RealmMyTeam> {
             val userId = settings?.getString("userId", "--") ?: "--"
             val list = mRealm.where(RealmMyTeam::class.java)

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

@@ -9,6 +9,7 @@ import org.ole.planet.myplanet.model.RealmMyCourse
 import org.ole.planet.myplanet.model.RealmMyLibrary
 
 interface CoursesRepository {
+    suspend fun getAllCourses(): List<RealmMyCourse>
     fun getMyCourses(userId: String?, courses: List<RealmMyCourse>): List<RealmMyCourse>
     suspend fun getMyCourses(userId: String): List<RealmMyCourse>
     suspend fun getMyCoursesFlow(userId: String): Flow<List<RealmMyCourse>>

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

@@ -30,6 +30,10 @@ class CoursesRepositoryImpl @Inject constructor(
     private val progressRepository: ProgressRepository
 ) : RealmRepository(databaseService), CoursesRepository {
 
+    override suspend fun getAllCourses(): List<RealmMyCourse> {
+        return queryList(RealmMyCourse::class.java) {}
+    }
+
     override fun getMyCourses(userId: String?, courses: List<RealmMyCourse>): List<RealmMyCourse> {
         val myCourses: MutableList<RealmMyCourse> = ArrayList()
         if (userId == null) return myCourses

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

@@ -2,6 +2,7 @@ package org.ole.planet.myplanet.repository
 
 import com.google.gson.JsonObject
 import kotlinx.coroutines.flow.Flow
+import org.ole.planet.myplanet.model.RealmMyCourse
 import org.ole.planet.myplanet.model.RealmMyLibrary
 import org.ole.planet.myplanet.model.RealmMyTeam
 import org.ole.planet.myplanet.model.RealmTeamTask
@@ -35,6 +36,8 @@ interface TeamsRepository {
     suspend fun getShareableTeams(): List<RealmMyTeam>
     suspend fun getShareableEnterprises(): List<RealmMyTeam>
     suspend fun getTeamResources(teamId: String): List<RealmMyLibrary>
+    suspend fun getTeamCourses(teamId: String): List<RealmMyCourse>
+    suspend fun addCoursesToTeam(teamId: String, courseIds: List<String>)
     suspend fun getTeamByDocumentIdOrTeamId(id: String): RealmMyTeam?
     suspend fun getTeamByIdOrTeamId(id: String): RealmMyTeam?
     suspend fun getTeamLinks(): List<RealmMyTeam>

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

@@ -24,6 +24,7 @@ import org.ole.planet.myplanet.data.DatabaseService
 import org.ole.planet.myplanet.data.api.ApiClient.client
 import org.ole.planet.myplanet.data.api.ApiInterface
 import org.ole.planet.myplanet.di.AppPreferences
+import org.ole.planet.myplanet.model.RealmMyCourse
 import org.ole.planet.myplanet.model.RealmMyLibrary
 import org.ole.planet.myplanet.model.RealmMyTeam
 import org.ole.planet.myplanet.model.RealmTeamLog
@@ -162,6 +163,37 @@ class TeamsRepositoryImpl @Inject constructor(
         return (linkedResources + privateResources).distinctBy { it.id }
     }
 
+    override suspend fun getTeamCourses(teamId: String): List<RealmMyCourse> {
+        val team = findByField(RealmMyTeam::class.java, "_id", teamId) ?: return emptyList()
+        val courseIds = team.courses?.toList() ?: return emptyList()
+
+        if (courseIds.isEmpty()) return emptyList()
+        val courses = queryList(RealmMyCourse::class.java) {
+            `in`("courseId", courseIds.toTypedArray())
+        }
+        return courses
+    }
+
+    override suspend fun addCoursesToTeam(teamId: String, courseIds: List<String>) {
+        if (courseIds.isEmpty()) {
+            return
+        }
+        executeTransaction { realm ->
+            val team = realm.where(RealmMyTeam::class.java)
+                .equalTo("_id", teamId)
+                .findFirst()
+            if (team == null) {
+                return@executeTransaction
+            }
+            courseIds.forEach { courseId ->
+                if (team.courses?.contains(courseId) != true) {
+                    team.courses?.add(courseId)
+                }
+            }
+            team.updated = true
+        }
+    }
+
     override suspend fun getTeamByDocumentIdOrTeamId(id: String): RealmMyTeam? {
         if (id.isBlank()) return null
         return findByField(RealmMyTeam::class.java, "_id", id)

app/src/main/java/org/ole/planet/myplanet/services/UploadManager.kt

@@ -452,6 +452,8 @@ class UploadManager @Inject constructor(
 
         data class TeamData(
             val teamId: String?,
+            val teamName: String?,
+            val coursesCount: Int,
             val serialized: JsonObject
         )
 
@@ -461,8 +463,9 @@ class UploadManager @Inject constructor(
 
             teams.map { team ->
                 TeamData(
-                    teamId = team._id,
-                    serialized = RealmMyTeam.serialize(team)
+                    teamId = team._id, teamName = team.name,
+                    coursesCount = team.courses?.size ?: 0,
+                    serialized = RealmMyTeam.serialize(team, realm)
                 )
             }
         }
@@ -471,10 +474,12 @@ class UploadManager @Inject constructor(
             teamsToUpload.chunked(BATCH_SIZE).forEach { batch ->
                 batch.forEach { teamData ->
                     try {
-                        val `object` = apiInterface.postDoc(
+                        val response = apiInterface.postDoc(
                             UrlUtils.header, "application/json",
                             "${UrlUtils.getUrl()}/teams", teamData.serialized
-                        ).body()
+                        )
+
+                        val `object` = response.body()
 
                         if (`object` != null) {
                             val rev = getString("rev", `object`)
@@ -552,7 +557,6 @@ class UploadManager @Inject constructor(
             }
 
             uploadTeamActivitiesRefactored()
-
             listener.onSuccess("User activities sync completed successfully")
         } catch (e: Exception) {
             e.printStackTrace()
@@ -587,10 +591,8 @@ class UploadManager @Inject constructor(
         logsData.forEach { logData ->
             try {
                 val `object` = apiInterface.postDoc(
-                    UrlUtils.header,
-                    "application/json",
-                    "${UrlUtils.getUrl()}/team_activities",
-                    logData.serialized
+                    UrlUtils.header, "application/json",
+                    "${UrlUtils.getUrl()}/team_activities", logData.serialized
                 ).body()
 
                 if (`object` != null) {

app/src/main/java/org/ole/planet/myplanet/ui/teams/TeamDetailFragment.kt

@@ -11,8 +11,6 @@ import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -23,6 +21,7 @@ import org.ole.planet.myplanet.base.BaseTeamFragment
 import org.ole.planet.myplanet.callback.OnBaseRealtimeSyncListener
 import org.ole.planet.myplanet.callback.OnMemberChangeListener
 import org.ole.planet.myplanet.callback.OnSyncListener
+import org.ole.planet.myplanet.callback.OnTeamPageListener
 import org.ole.planet.myplanet.callback.OnTeamUpdateListener
 import org.ole.planet.myplanet.databinding.FragmentTeamDetailBinding
 import org.ole.planet.myplanet.model.RealmNews
@@ -48,8 +47,10 @@ import org.ole.planet.myplanet.ui.teams.TeamPageConfig.ResourcesPage
 import org.ole.planet.myplanet.ui.teams.TeamPageConfig.SurveyPage
 import org.ole.planet.myplanet.ui.teams.TeamPageConfig.TasksPage
 import org.ole.planet.myplanet.ui.teams.TeamPageConfig.TeamPage
+import org.ole.planet.myplanet.ui.teams.courses.TeamCoursesFragment
 import org.ole.planet.myplanet.utils.DialogUtils
 import org.ole.planet.myplanet.utils.Utilities
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class TeamDetailFragment : BaseTeamFragment(), OnMemberChangeListener, OnTeamUpdateListener {
@@ -294,18 +295,13 @@ class TeamDetailFragment : BaseTeamFragment(), OnMemberChangeListener, OnTeamUpd
 
         binding.viewPager2.adapter = null
         binding.viewPager2.adapter = TeamPagerAdapter(
-            requireActivity(),
-            pageConfigs,
-            team?._id,
-            this,
-            this
+            this, pageConfigs, team?._id, this, this
         )
         binding.tabLayout.tabMode = com.google.android.material.tabs.TabLayout.MODE_SCROLLABLE
         binding.tabLayout.isInlineLabel = true
 
         TabLayoutMediator(binding.tabLayout, binding.viewPager2) { tab, position ->
             val title = (binding.viewPager2.adapter as TeamPagerAdapter).getPageTitle(position)
-            val pageConfig = pageConfigs.getOrNull(position)
             tab.text = title
         }.attach()
 
@@ -321,6 +317,12 @@ class TeamDetailFragment : BaseTeamFragment(), OnMemberChangeListener, OnTeamUpd
                             teamLastPage[teamId] = it
                         }
                     }
+
+                    val fragmentTag = "f$position"
+                    val fragment = childFragmentManager.findFragmentByTag(fragmentTag)
+                    if (fragment is OnTeamPageListener) {
+                        MainApplication.listener = fragment
+                    }
                 }
             }
         )
@@ -388,9 +390,27 @@ class TeamDetailFragment : BaseTeamFragment(), OnMemberChangeListener, OnTeamUpd
 
         binding.btnAddDoc.setOnClickListener {
             MainApplication.showDownload = true
-            selectPage(DocumentsPage.id)
+            val coursesPageIndex = pageIndexById(CoursesPage.id)
+            val isAlreadyOnCoursesPage = coursesPageIndex != null && binding.viewPager2.currentItem == coursesPageIndex
+
+            selectPage(CoursesPage.id)
             MainApplication.showDownload = false
-            MainApplication.listener?.onAddDocument()
+
+            val delay = if (isAlreadyOnCoursesPage) 50L else 300L
+
+            binding.root.postDelayed({
+                val allFragments = childFragmentManager.fragments
+                val coursesFragment = allFragments.filterIsInstance<TeamCoursesFragment>().firstOrNull()
+
+                when {
+                    coursesFragment != null -> {
+                        coursesFragment.onAddCourse()
+                    }
+                    MainApplication.listener is TeamCoursesFragment -> {
+                        MainApplication.listener?.onAddCourse()
+                    }
+                }
+            }, delay)
         }
     }