Feat/add image data deletion in account deletion

app/src/androidTest/java/com/android/streetworkapp/ui/profile/SettingsTest.kt

@@ -14,6 +14,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.android.sample.R
 import com.android.streetworkapp.model.event.EventRepository
 import com.android.streetworkapp.model.event.EventViewModel
+import com.android.streetworkapp.model.image.ImageRepository
+import com.android.streetworkapp.model.image.ImageViewModel
 import com.android.streetworkapp.model.park.ParkRepository
 import com.android.streetworkapp.model.park.ParkViewModel
 import com.android.streetworkapp.model.preferences.PreferencesRepository
@@ -30,13 +32,15 @@ import com.android.streetworkapp.ui.navigation.Route
 import com.android.streetworkapp.utils.GoogleAuthService
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseUser
+import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.RETURNS_DEFAULTS
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
+import org.mockito.kotlin.any
 import org.mockito.kotlin.whenever
 
 @RunWith(AndroidJUnit4::class)
@@ -56,6 +60,8 @@ class SettingsTest {
   private val workoutRepository = mock(WorkoutRepository::class.java)
   private val workoutViewModel = WorkoutViewModel(workoutRepository)
   private val preferencesViewModel = PreferencesViewModel(mock(PreferencesRepository::class.java))
+  private val imageRepository = mock(ImageRepository::class.java)
+  private val imageViewModel = ImageViewModel(imageRepository)
 
   @Test
   fun isSettingsContentDisplayedForNullUser() {
@@ -75,6 +81,7 @@ class SettingsTest {
           progressionViewModel,
           workoutViewModel,
           preferencesViewModel,
+          imageViewModel,
           authService,
           showSettingDialog)
       context = LocalContext.current
@@ -121,6 +128,7 @@ class SettingsTest {
           progressionViewModel,
           workoutViewModel,
           preferencesViewModel,
+          imageViewModel,
           authService,
           showSettingDialog)
       context = LocalContext.current
@@ -161,6 +169,7 @@ class SettingsTest {
           progressionViewModel,
           workoutViewModel,
           preferencesViewModel,
+          imageViewModel,
           authService,
           showSettingDialog)
       context = LocalContext.current
@@ -175,14 +184,15 @@ class SettingsTest {
   }
 
   @Test
-  fun testDeleteAccountButtonNavigatesToAuthScreen() {
+  fun testDeleteAccountButtonNavigatesToAuthScreen() = runTest {
     val showSettingDialog = mutableStateOf(false)
     var context: Context? = null
     val alice = User("uid-alice", "Alice", "alice@gmail.com", 42, emptyList(), "")
     userViewModel.setCurrentUser(alice)
     val firebaseAuth = mock(FirebaseAuth::class.java, RETURNS_DEFAULTS)
     val currentUser = mock(FirebaseUser::class.java)
     whenever(firebaseAuth.currentUser).thenReturn(currentUser)
+    whenever(imageRepository.deleteAllDataFromUser(any())).thenReturn(true)
 
     composeTestRule.setContent {
       val authService =
@@ -197,6 +207,7 @@ class SettingsTest {
           progressionViewModel,
           workoutViewModel,
           preferencesViewModel,
+          imageViewModel,
           authService,
           showSettingDialog)
       context = LocalContext.current
@@ -235,6 +246,7 @@ class SettingsTest {
           progressionViewModel,
           workoutViewModel,
           preferencesViewModel,
+          imageViewModel,
           authService,
           showSettingDialog)
       context = LocalContext.current

app/src/main/java/com/android/streetworkapp/MainActivity.kt

@@ -434,6 +434,7 @@ fun StreetWorkApp(
                         progressionViewModel,
                         workoutViewModel,
                         preferencesViewModel,
+                        imageViewModel,
                         authService,
                         showSettingsDialog)
                   },

app/src/main/java/com/android/streetworkapp/model/image/ImageRepositoryFirestore.kt

@@ -256,9 +256,9 @@ class ImageRepositoryFirestore(
   }
 
   /**
-   * Deletes all the images related to a user
+   * Deletes all the images related to a user, this includes his uploaded images and ratings.
    *
-   * @param userId The user id to whom we delete all the data from. (pictures uploaded and ratings)
+   * @param userId The user id to whom we delete all the data from.
    */
   override suspend fun deleteAllDataFromUser(userId: String): Boolean {
     require(userId.isNotEmpty()) { "Empty userId." }
@@ -270,21 +270,12 @@ class ImageRepositoryFirestore(
       for (document in querySnapshot.documents) {
         val collection = document.toObject(ParkImageCollection::class.java)
         collection?.let {
-          val (imagesUploadedByUser, imagesNotUploadedByUser) =
-              collection.images.partition { it.userId == userId }
-          if (imagesUploadedByUser.isNotEmpty())
-              document.reference
-                  .update("images", FieldValue.arrayRemove(imagesUploadedByUser))
-                  .await()
-
-          imagesUploadedByUser.forEach {
-            val imageKey = this.storageClient.extractKeyFromUrl(it.imageUrl) ?: return false
-            if (!this.storageClient.deleteObjectFromKey(imageKey)) return false
-          }
-
-          // remove any potential votes the user has done
-          for (image in imagesNotUploadedByUser) {
-            if (image.rating.positiveVotesUids.contains(userId) ||
+          for (image in collection.images) {
+            if (image.userId == userId) {
+              document.reference.update("images", FieldValue.arrayRemove(image)).await()
+              val imageKey = storageClient.extractKeyFromUrl(image.imageUrl) ?: return false
+              if (!this.storageClient.deleteObjectFromKey(imageKey)) return false
+            } else if (image.rating.positiveVotesUids.contains(userId) ||
                 image.rating.negativeVotesUids.contains(userId)) {
               if (!this.retractImageVote(collection.id, image.imageUrl, userId)) {
                 return false

app/src/main/java/com/android/streetworkapp/ui/profile/Settings.kt

@@ -21,6 +21,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import com.android.sample.R
 import com.android.streetworkapp.model.event.EventViewModel
+import com.android.streetworkapp.model.image.ImageViewModel
 import com.android.streetworkapp.model.park.ParkViewModel
 import com.android.streetworkapp.model.preferences.PreferencesViewModel
 import com.android.streetworkapp.model.progression.ProgressionViewModel
@@ -45,6 +46,7 @@ fun SettingsContent(
     progressionViewModel: ProgressionViewModel,
     workoutViewModel: WorkoutViewModel,
     preferencesViewModel: PreferencesViewModel,
+    imageViewModel: ImageViewModel,
     authService: GoogleAuthService,
     showParentDialog: MutableState<Boolean>
 ) {
@@ -120,7 +122,8 @@ fun SettingsContent(
                 parkViewModel,
                 eventViewModel,
                 progressionViewModel,
-                workoutViewModel)
+                workoutViewModel,
+                imageViewModel)
 
         if (deletionSucceed) {
           logout(authService, userViewModel, preferencesViewModel)
@@ -181,7 +184,8 @@ fun deleteAccount(
     parkViewModel: ParkViewModel,
     eventViewModel: EventViewModel,
     progressionViewModel: ProgressionViewModel,
-    workoutViewModel: WorkoutViewModel
+    workoutViewModel: WorkoutViewModel,
+    imageViewModel: ImageViewModel
 ): Boolean {
   // Get the current UID and abort if it is empty
   val currentUserUid = userViewModel.currentUser.value?.uid ?: ""
@@ -211,6 +215,7 @@ fun deleteAccount(
   parkViewModel.deleteRatingFromAllParks(currentUserUid)
   progressionViewModel.deleteProgressionByUid(currentUserUid)
   workoutViewModel.deleteWorkoutDataByUid(currentUserUid)
+  imageViewModel.deleteAllDataFromUser(currentUserUid, {}, {})
 
   return true
 }

app/src/test/java/com/android/streetworkapp/model/image/ImageRepositoryFirestoreTest.kt

@@ -384,8 +384,8 @@ class ImageRepositoryFirestoreTest {
         val elementsField =
             capturedValue.javaClass.getDeclaredField("elements").apply { isAccessible = true }
         elementsField.isAccessible = true
-        val elements = elementsField.get(capturedValue) as List<List<ParkImage>>
-        assert(elements[0][0] == imageToBeDeleted)
+        val elements = elementsField.get(capturedValue) as List<ParkImage>
+        assert(elements[0] == imageToBeDeleted)
 
         verify(storageClient).deleteObjectFromKey(imageToDeleteKey)
         verify(spyImageRepositoryFirestore)

app/src/test/java/com/android/streetworkapp/ui/profile/SettingsTest.kt

@@ -2,6 +2,7 @@ package com.android.streetworkapp.ui.profile
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.android.streetworkapp.model.event.EventViewModel
+import com.android.streetworkapp.model.image.ImageViewModel
 import com.android.streetworkapp.model.park.ParkViewModel
 import com.android.streetworkapp.model.progression.ProgressionViewModel
 import com.android.streetworkapp.model.user.User
@@ -30,6 +31,7 @@ class SettingsTest {
   private lateinit var eventViewModel: EventViewModel
   private lateinit var progressionViewModel: ProgressionViewModel
   private lateinit var workoutViewModel: WorkoutViewModel
+  private lateinit var imageViewModel: ImageViewModel
   private lateinit var currentUser: User
 
   @Before
@@ -40,6 +42,7 @@ class SettingsTest {
     eventViewModel = mock(EventViewModel::class.java)
     progressionViewModel = mock(ProgressionViewModel::class.java)
     workoutViewModel = mock(WorkoutViewModel::class.java)
+    imageViewModel = mock(ImageViewModel::class.java)
     currentUser = User("uid-alice", "Alice", "alice@gmail.com", 42, emptyList(), "")
 
     whenever(userViewModel.currentUser).thenReturn(MutableStateFlow(currentUser))
@@ -56,7 +59,8 @@ class SettingsTest {
             parkViewModel,
             eventViewModel,
             progressionViewModel,
-            workoutViewModel)
+            workoutViewModel,
+            imageViewModel)
 
     assertTrue(result)
     verify(authService).deleteAuthUser()
@@ -76,7 +80,8 @@ class SettingsTest {
             parkViewModel,
             eventViewModel,
             progressionViewModel,
-            workoutViewModel)
+            workoutViewModel,
+            imageViewModel)
 
     assertFalse(result)
     verify(authService, never()).deleteAuthUser()
@@ -98,7 +103,8 @@ class SettingsTest {
             parkViewModel,
             eventViewModel,
             progressionViewModel,
-            workoutViewModel)
+            workoutViewModel,
+            imageViewModel)
 
     assertFalse(result)
     verify(authService, never()).deleteAuthUser()