teams: smoother repository resource modelling (fixes #13006) (#12879)

Author: dogi

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 5330
-        versionName = "0.53.30"
+        versionCode = 5331
+        versionName = "0.53.31"
         ndkVersion = '26.3.11579264'
         vectorDrawables.useSupportLibrary = true
     }

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

@@ -0,0 +1,6 @@
+package org.ole.planet.myplanet.model
+
+data class TeamResourceDto(
+    val resourceId: String,
+    val title: String?
+)

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

@@ -10,6 +10,7 @@ import org.ole.planet.myplanet.model.RealmMyTeam
 import org.ole.planet.myplanet.model.RealmTeamLog
 import org.ole.planet.myplanet.model.RealmTeamTask
 import org.ole.planet.myplanet.model.RealmUser
+import org.ole.planet.myplanet.model.TeamResourceDto
 import org.ole.planet.myplanet.model.TeamSummary
 import org.ole.planet.myplanet.model.Transaction
 
@@ -72,7 +73,7 @@ interface TeamsRepository {
     suspend fun requestToJoin(teamId: String, userId: String?, userPlanetCode: String?, teamType: String?)
     suspend fun leaveTeam(teamId: String, userId: String?)
     suspend fun removeMember(teamId: String, userId: String)
-    suspend fun addResourceLinks(teamId: String, resources: List<RealmMyLibrary>, user: RealmUser?)
+    suspend fun addResourceLinks(teamId: String, resources: List<TeamResourceDto>, userId: String?)
     suspend fun removeResourceLink(teamId: String, resourceId: String)
     suspend fun deleteTask(taskId: String)
     suspend fun upsertTask(task: RealmTeamTask)

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

@@ -30,6 +30,7 @@ import org.ole.planet.myplanet.model.RealmMyTeam
 import org.ole.planet.myplanet.model.RealmTeamLog
 import org.ole.planet.myplanet.model.RealmTeamTask
 import org.ole.planet.myplanet.model.RealmUser
+import org.ole.planet.myplanet.model.TeamResourceDto
 import org.ole.planet.myplanet.model.TeamSummary
 import org.ole.planet.myplanet.model.Transaction
 import org.ole.planet.myplanet.model.User
@@ -689,18 +690,22 @@ class TeamsRepositoryImpl @Inject constructor(
 
     override suspend fun addResourceLinks(
         teamId: String,
-        resources: List<RealmMyLibrary>,
-        user: RealmUser?,
+        resources: List<TeamResourceDto>,
+        userId: String?,
     ) {
-        if (teamId.isBlank() || resources.isEmpty() || user == null) return
+        if (teamId.isBlank() || resources.isEmpty() || userId.isNullOrBlank()) return
+
+        val user = findByField(RealmUser::class.java, "id", userId)
+            ?: findByField(RealmUser::class.java, "_id", userId)
+            ?: return
 
         val teamResources = resources.map { resource ->
             val teamResource = RealmMyTeam()
             teamResource._id = UUID.randomUUID().toString()
             teamResource.teamId = teamId
             teamResource.title = resource.title
             teamResource.status = user.parentCode
-            teamResource.resourceId = resource._id
+            teamResource.resourceId = resource.resourceId
             teamResource.docType = "resourceLink"
             teamResource.updated = true
             teamResource.teamType = "local"

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

@@ -27,6 +27,7 @@ import org.ole.planet.myplanet.databinding.FragmentTeamResourceBinding
 import org.ole.planet.myplanet.databinding.MyLibraryAlertdialogBinding
 import org.ole.planet.myplanet.model.RealmMyLibrary
 import org.ole.planet.myplanet.model.RealmNews
+import org.ole.planet.myplanet.model.TeamResourceDto
 import org.ole.planet.myplanet.ui.components.CheckboxAdapter
 import org.ole.planet.myplanet.ui.resources.AddResourceFragment
 
@@ -116,8 +117,12 @@ class TeamResourcesFragment : BaseTeamFragment(), OnTeamPageListener, OnResource
                 .setPositiveButton(R.string.add) { _: DialogInterface?, _: Int ->
                     val selectedResources = (myLibraryAlertdialogBinding.alertDialogListView.adapter as CheckboxAdapter).selectedItemsList
                         .map { index -> availableLibraries[index] }
+                        .mapNotNull {
+                            val id = it._id
+                            if (id != null) TeamResourceDto(id, it.title) else null
+                        }
                     viewLifecycleOwner.lifecycleScope.launch {
-                        teamsRepository.addResourceLinks(teamId, selectedResources, user)
+                        teamsRepository.addResourceLinks(teamId, selectedResources, user?.id)
                         showLibraryList()
                     }
                 }