Move shared favourite logic to interactor

Author: Terrance

core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordCommentSearchViewDataInteractor.kt

@@ -126,12 +126,8 @@ class RecordCommentSearchViewDataInteractor @Inject constructor(
     private suspend fun getFavouriteData(
         typeId: Long,
     ): List<ViewHolderType> {
-        val (included, excluded) = recordTypeToFavouriteCommentInteractor.getAll()
-            .partition { it.recordTypeId == typeId }
-        val includedComments = included.map { it.commentId }
-        val excludedComments = excluded.map { it.commentId }
-        return favouriteCommentInteractor.getAll()
-            .filter { includedComments.contains(it.id) || !excludedComments.contains(it.id) }
+        val comments = favouriteCommentInteractor.getAll()
+        return recordTypeToFavouriteCommentInteractor.filterFavourites(typeId, comments)
             .map { RecordCommentViewData.Favourite(it.comment) }
     }
 

domain/src/main/java/com/example/util/simpletimetracker/domain/favourite/interactor/FavouriteCommentInteractor.kt

@@ -2,11 +2,13 @@ package com.example.util.simpletimetracker.domain.favourite.interactor
 
 import com.example.util.simpletimetracker.domain.favourite.repo.FavouriteCommentRepo
 import com.example.util.simpletimetracker.domain.favourite.model.FavouriteComment
+import com.example.util.simpletimetracker.domain.favourite.repo.RecordTypeToFavouriteCommentRepo
 import java.util.Locale
 import javax.inject.Inject
 
 class FavouriteCommentInteractor @Inject constructor(
     private val repo: FavouriteCommentRepo,
+    private val recordTypeRepo: RecordTypeToFavouriteCommentRepo,
 ) {
 
     suspend fun getAll(): List<FavouriteComment> {
@@ -23,6 +25,7 @@ class FavouriteCommentInteractor @Inject constructor(
 
     suspend fun remove(id: Long) {
         repo.remove(id)
+        recordTypeRepo.removeAll(id)
     }
 
     fun sort(

domain/src/main/java/com/example/util/simpletimetracker/domain/favourite/interactor/RecordTypeToFavouriteCommentInteractor.kt

@@ -1,5 +1,6 @@
 package com.example.util.simpletimetracker.domain.favourite.interactor
 
+import com.example.util.simpletimetracker.domain.favourite.model.FavouriteComment
 import com.example.util.simpletimetracker.domain.favourite.model.RecordTypeToFavouriteComment
 import com.example.util.simpletimetracker.domain.favourite.repo.RecordTypeToFavouriteCommentRepo
 import javax.inject.Inject
@@ -31,4 +32,11 @@ class RecordTypeToFavouriteCommentInteractor @Inject constructor(
     suspend fun removeTypes(commentId: Long, typeIds: List<Long>) {
         repo.removeTypes(commentId, typeIds)
     }
+
+    suspend fun filterFavourites(typeId: Long, comments: List<FavouriteComment>): List<FavouriteComment> {
+        val (included, excluded) = getAll().partition { it.recordTypeId == typeId }
+        val includedIds = included.map { it.commentId }
+        val excludedIds = excluded.map { it.commentId }
+        return comments.filter { includedIds.contains(it.id) || !excludedIds.contains(it.id) }
+    }
 }

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/interactor/ChangeRecordViewDataInteractor.kt

@@ -66,16 +66,9 @@ class ChangeRecordViewDataInteractor @Inject constructor(
         val isDarkTheme = prefsInteractor.getDarkMode()
 
         val favouriteComment = favouriteCommentInteractor.get(comment)
-        val isFavourite = if (favouriteComment == null) false else {
-            val (included, excluded) = recordTypeToFavouriteCommentInteractor.getAll()
-                .partition { it.recordTypeId == typeId }
-            val includedComments = included.map { it.commentId }
-            val excludedComments = excluded.map { it.commentId }
-            (
-                includedComments.contains(favouriteComment.id) ||
-                !excludedComments.contains(favouriteComment.id)
-            )
-        }
+        val isFavourite = if (favouriteComment == null) false else
+            recordTypeToFavouriteCommentInteractor
+                .filterFavourites(typeId, listOf(favouriteComment)).isNotEmpty()
 
         ChangeRecordCommentFieldViewData(
             // Only one at the time.