Request the questions belonging to answers to get the title

kozmi55 · kozmi55 · commit 1f5c587387ee · 2017-07-28T10:44:48.000+02:00
diff --git a/app/src/main/java/com/example/tamaskozmer/kotlinrxexample/di/modules/ApplicationModule.kt b/app/src/main/java/com/example/tamaskozmer/kotlinrxexample/di/modules/ApplicationModule.kt
@@ -2,6 +2,7 @@ package com.example.tamaskozmer.kotlinrxexample.di.modules
 
 import com.example.tamaskozmer.kotlinrxexample.CustomApplication
 import com.example.tamaskozmer.kotlinrxexample.model.UserRepository
+import com.example.tamaskozmer.kotlinrxexample.model.services.QuestionService
 import com.example.tamaskozmer.kotlinrxexample.model.services.UserService
 import com.google.gson.Gson
 import dagger.Module
@@ -30,5 +31,6 @@ class ApplicationModule(val application: CustomApplication) {
     @Singleton
     fun provideUserRepository(retrofit: Retrofit) =
             UserRepository(
-                    retrofit.create(UserService::class.java))
+                    retrofit.create(UserService::class.java),
+                    retrofit.create(QuestionService::class.java))
 }
diff --git a/app/src/main/java/com/example/tamaskozmer/kotlinrxexample/model/UserRepository.kt b/app/src/main/java/com/example/tamaskozmer/kotlinrxexample/model/UserRepository.kt
@@ -1,9 +1,7 @@
 package com.example.tamaskozmer.kotlinrxexample.model
 
-import com.example.tamaskozmer.kotlinrxexample.model.entities.AnswerListModel
-import com.example.tamaskozmer.kotlinrxexample.model.entities.AnswerViewModel
-import com.example.tamaskozmer.kotlinrxexample.model.entities.DetailsModel
-import com.example.tamaskozmer.kotlinrxexample.model.entities.QuestionListModel
+import com.example.tamaskozmer.kotlinrxexample.model.entities.*
+import com.example.tamaskozmer.kotlinrxexample.model.services.QuestionService
 import com.example.tamaskozmer.kotlinrxexample.model.services.UserService
 import io.reactivex.Single
 import io.reactivex.functions.Function3
@@ -12,32 +10,57 @@ import io.reactivex.functions.Function3
  * Created by Tamas_Kozmer on 7/4/2017.
  */
 class UserRepository(
-        private val userService: UserService) {
+        private val userService: UserService,
+        private val questionService: QuestionService) {
 
     fun getUsers(page: Int) = userService.getUsers(page)
 
     fun getDetails(userId: Long) : Single<DetailsModel> {
         return Single.zip(
                 userService.getQuestionsByUser(userId),
-                userService.getAnswersByUser(userId),
+                getAnswers(userId),
                 userService.getFavoritesByUser(userId),
-                Function3<QuestionListModel, AnswerListModel, QuestionListModel, DetailsModel>
+                Function3<QuestionListModel, List<AnswerViewModel>, QuestionListModel, DetailsModel>
                 { questions, answers, favorites ->
                     createDetailsModel(questions, answers, favorites) })
     }
 
-    private fun createDetailsModel(questionsModel: QuestionListModel, answersModel: AnswerListModel,
+    private fun getAnswers(userId: Long) : Single<List<AnswerViewModel>> {
+        return userService.getAnswersByUser(userId)
+                .flatMap { answerListModel: AnswerListModel ->
+                    mapAnswersToAnswerViewModels(answerListModel.items) }
+    }
+
+    private fun mapAnswersToAnswerViewModels(answers: List<Answer>): Single<List<AnswerViewModel>> {
+        val ids = answers
+                .map { it.questionId.toString() }
+                .joinToString(separator = ";")
+
+        val questionsListModel = questionService.getQuestionById(ids)
+
+        return questionsListModel
+                .map { questionListModel: QuestionListModel? ->
+                    addTitlesToAnswers(answers, questionListModel?.items ?: emptyList()) }
+    }
+
+    private fun addTitlesToAnswers(answers: List<Answer>, questions: List<Question>) : List<AnswerViewModel> {
+        return answers.map { (answerId, questionId, score, accepted) ->
+            val question = questions.find { it.questionId == questionId }
+            AnswerViewModel(answerId, score, accepted, question?.title ?: "Unknown")
+        }
+    }
+
+    private fun createDetailsModel(questionsModel: QuestionListModel, answersModel: List<AnswerViewModel>,
                                    favoritesModel: QuestionListModel): DetailsModel {
         val questions = questionsModel.items
                 .take(3)
 
         val favorites = favoritesModel.items
                 .take(3)
 
-        val answers = answersModel.items
+        val answers = answersModel
                 .filter { it.accepted }
                 .take(3)
-                .map { AnswerViewModel(it.answerId, it.score, it.accepted, "TODO") }
 
         return DetailsModel(questions, answers, favorites)
     }
