feat: cập nhật flip card status cho flashcard

- sửa lại response cập nhật starred - sửa đổi giao diện đẹp và logic hơn
pass-with-high-score · Oct 22, 2024 · b00068e · b00068e
1 parent 9e96f4c
commit b00068e
Show file tree

Hide file tree

Showing 23 changed files with 629 additions and 174 deletions.
diff --git a/app/src/main/java/com/pwhs/quickmem/core/data/FlipCardStatus.kt b/app/src/main/java/com/pwhs/quickmem/core/data/FlipCardStatus.kt
@@ -0,0 +1,5 @@
+package com.pwhs.quickmem.core.data
+
+enum class FlipCardStatus {
+    NONE, STILL_LEARNING, KNOW
+}
diff --git a/app/src/main/java/com/pwhs/quickmem/data/dto/flashcard/FlashCardResponseDto.kt b/app/src/main/java/com/pwhs/quickmem/data/dto/flashcard/FlashCardResponseDto.kt
@@ -1,6 +1,7 @@
 package com.pwhs.quickmem.data.dto.flashcard
 
 import com.google.gson.annotations.SerializedName
+import com.pwhs.quickmem.core.data.FlipCardStatus
 import com.pwhs.quickmem.core.data.Rating
 
 data class FlashCardResponseDto(
@@ -20,6 +21,8 @@ data class FlashCardResponseDto(
     val studySetId: String,
     @SerializedName("rating")
     val rating: String = Rating.NOT_STUDIED.name,
+    @SerializedName("flipStatus")
+    val flipStatus: String = FlipCardStatus.NONE.name,
     @SerializedName("isStarred")
     val isStarred: Boolean,
     @SerializedName("createdAt")

diff --git a/app/src/main/java/com/pwhs/quickmem/data/dto/flashcard/FlipFlashCardDto.kt b/app/src/main/java/com/pwhs/quickmem/data/dto/flashcard/FlipFlashCardDto.kt
@@ -0,0 +1,8 @@
+package com.pwhs.quickmem.data.dto.flashcard
+
+import com.google.gson.annotations.SerializedName
+
+data class FlipFlashCardDto(
+    @SerializedName("flipStatus")
+    val flipStatus: String
+)
diff --git a/app/src/main/java/com/pwhs/quickmem/data/dto/flashcard/StudySetFlashCardResponseDto.kt b/app/src/main/java/com/pwhs/quickmem/data/dto/flashcard/StudySetFlashCardResponseDto.kt
@@ -1,6 +1,7 @@
 package com.pwhs.quickmem.data.dto.flashcard
 
 import com.google.gson.annotations.SerializedName
+import com.pwhs.quickmem.core.data.FlipCardStatus
 import com.pwhs.quickmem.core.data.Rating
 
 data class StudySetFlashCardResponseDto(
@@ -18,6 +19,8 @@ data class StudySetFlashCardResponseDto(
     val explanation: String?,
     @SerializedName("rating")
     val rating: String = Rating.NOT_STUDIED.name,
+    @SerializedName("flipStatus")
+    val flipStatus: String = FlipCardStatus.NONE.name,
     @SerializedName("isStarred")
     val isStarred: Boolean,
     @SerializedName("createdAt")

diff --git a/app/src/main/java/com/pwhs/quickmem/data/dto/flashcard/UpdateFlashCardResponseDto.kt b/app/src/main/java/com/pwhs/quickmem/data/dto/flashcard/UpdateFlashCardResponseDto.kt
@@ -0,0 +1,18 @@
+package com.pwhs.quickmem.data.dto.flashcard
+
+import com.google.gson.annotations.SerializedName
+import com.pwhs.quickmem.core.data.FlipCardStatus
+import com.pwhs.quickmem.core.data.Rating
+
+data class UpdateFlashCardResponseDto(
+    @SerializedName("id")
+    val id: String,
+    @SerializedName("message")
+    val message: String,
+    @SerializedName("isStarred")
+    val isStarred: Boolean? = false,
+    @SerializedName("rating")
+    val rating: String? = Rating.NOT_STUDIED.name,
+    @SerializedName("flipStatus")
+    val flipStatus: String? = FlipCardStatus.NONE.name,
+)
diff --git a/app/src/main/java/com/pwhs/quickmem/data/mapper/flashcard/StudySetFlashCardResponseMapper.kt b/app/src/main/java/com/pwhs/quickmem/data/mapper/flashcard/StudySetFlashCardResponseMapper.kt
@@ -11,6 +11,7 @@ fun StudySetFlashCardResponseDto.toModel() = StudySetFlashCardResponseModel(
     hint = hint,
     explanation = explanation,
     rating = rating,
+    flipStatus = flipStatus,
     createdAt = createdAt,
     updatedAt = updatedAt,
     isStarred = isStarred
@@ -24,6 +25,7 @@ fun StudySetFlashCardResponseModel.toDto() = StudySetFlashCardResponseDto(
     hint = hint,
     explanation = explanation,
     rating = rating,
+    flipStatus = flipStatus,
     createdAt = createdAt,
     updatedAt = updatedAt,
     isStarred = isStarred

diff --git a/app/src/main/java/com/pwhs/quickmem/data/mapper/flashcard/UpdateFlashCardResponseModel.kt b/app/src/main/java/com/pwhs/quickmem/data/mapper/flashcard/UpdateFlashCardResponseModel.kt
@@ -0,0 +1,20 @@
+package com.pwhs.quickmem.data.mapper.flashcard
+
+import com.pwhs.quickmem.data.dto.flashcard.UpdateFlashCardResponseDto
+import com.pwhs.quickmem.domain.model.flashcard.UpdateFlashCardResponseModel
+
+fun UpdateFlashCardResponseDto.toModel() = UpdateFlashCardResponseModel(
+    id = id,
+    message = message,
+    isStarred = isStarred,
+    rating = rating,
+    flipStatus = flipStatus,
+)
+
+fun UpdateFlashCardResponseModel.toDto() = UpdateFlashCardResponseDto(
+    id = id,
+    message = message,
+    isStarred = isStarred,
+    rating = rating,
+    flipStatus = flipStatus,
+)
diff --git a/app/src/main/java/com/pwhs/quickmem/data/remote/ApiService.kt b/app/src/main/java/com/pwhs/quickmem/data/remote/ApiService.kt
@@ -10,7 +10,9 @@ import com.pwhs.quickmem.data.dto.auth.VerifyEmailRequestDto
 import com.pwhs.quickmem.data.dto.flashcard.CreateFlashCardDto
 import com.pwhs.quickmem.data.dto.flashcard.EditFlashCardDto
 import com.pwhs.quickmem.data.dto.flashcard.FlashCardResponseDto
+import com.pwhs.quickmem.data.dto.flashcard.FlipFlashCardDto
 import com.pwhs.quickmem.data.dto.flashcard.ToggleStarredFlashCardDto
+import com.pwhs.quickmem.data.dto.flashcard.UpdateFlashCardResponseDto
 import com.pwhs.quickmem.data.dto.study_set.CreateStudySetRequestDto
 import com.pwhs.quickmem.data.dto.study_set.CreateStudySetResponseDto
 import com.pwhs.quickmem.data.dto.study_set.GetStudySetResponseDto
@@ -123,5 +125,12 @@ interface ApiService {
         @Header("Authorization") token: String,
         @Path("id") id: String,
         @Body toggleStarredFlashCardDto: ToggleStarredFlashCardDto
-    ): FlashCardResponseDto
+    ): UpdateFlashCardResponseDto
+
+    @PATCH("flashcard/{id}/flip-status")
+    suspend fun updateFlipFlashCard(
+        @Header("Authorization") token: String,
+        @Path("id") id: String,
+        @Body flipFlashCardDto: FlipFlashCardDto
+    ): UpdateFlashCardResponseDto
 }
diff --git a/app/src/main/java/com/pwhs/quickmem/data/remote/repository/FlashCardRepositoryImpl.kt b/app/src/main/java/com/pwhs/quickmem/data/remote/repository/FlashCardRepositoryImpl.kt
@@ -1,13 +1,15 @@
 package com.pwhs.quickmem.data.remote.repository
 
 import com.pwhs.quickmem.core.utils.Resources
+import com.pwhs.quickmem.data.dto.flashcard.FlipFlashCardDto
 import com.pwhs.quickmem.data.dto.flashcard.ToggleStarredFlashCardDto
 import com.pwhs.quickmem.data.mapper.flashcard.toDto
 import com.pwhs.quickmem.data.mapper.flashcard.toModel
 import com.pwhs.quickmem.data.remote.ApiService
 import com.pwhs.quickmem.domain.model.flashcard.CreateFlashCardModel
 import com.pwhs.quickmem.domain.model.flashcard.EditFlashCardModel
 import com.pwhs.quickmem.domain.model.flashcard.FlashCardResponseModel
+import com.pwhs.quickmem.domain.model.flashcard.UpdateFlashCardResponseModel
 import com.pwhs.quickmem.domain.repository.FlashCardRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
@@ -60,7 +62,7 @@ class FlashCardRepositoryImpl @Inject constructor(
         token: String,
         id: String,
         isStarred: Boolean
-    ): Flow<Resources<Unit>> {
+    ): Flow<Resources<UpdateFlashCardResponseModel>> {
         return flow {
             emit(Resources.Loading(true))
             try {
@@ -69,7 +71,7 @@ class FlashCardRepositoryImpl @Inject constructor(
                     ToggleStarredFlashCardDto(isStarred)
                 )
                 Timber.d("toggleStarredFlashCard: $response")
-                emit(Resources.Success(Unit))
+                emit(Resources.Success(response.toModel()))
             } catch (e: HttpException) {
                 Timber.e(e)
                 emit(Resources.Error(e.toString()))
@@ -106,6 +108,27 @@ class FlashCardRepositoryImpl @Inject constructor(
         }
     }
 
+    override suspend fun updateFlipFlashCard(
+        token: String,
+        id: String,
+        flipStatus: String
+    ): Flow<Resources<UpdateFlashCardResponseModel>> {
+        return flow {
+            try {
+                val response =
+                    apiService.updateFlipFlashCard(token, id, FlipFlashCardDto(flipStatus))
+                Timber.d("updateFlipFlashCard: $response")
+                emit(Resources.Success(response.toModel()))
+            } catch (e: HttpException) {
+                Timber.e(e)
+                emit(Resources.Error(e.toString()))
+            } catch (e: IOException) {
+                Timber.e(e)
+                emit(Resources.Error(e.toString()))
+            }
+        }
+    }
+
     override suspend fun getFlashCardsByStudySetId(
         token: String,
         studySetId: String

diff --git a/app/src/main/java/com/pwhs/quickmem/domain/model/flashcard/FlashCardResponseModel.kt b/app/src/main/java/com/pwhs/quickmem/domain/model/flashcard/FlashCardResponseModel.kt
@@ -1,5 +1,6 @@
 package com.pwhs.quickmem.domain.model.flashcard
 
+import com.pwhs.quickmem.core.data.FlipCardStatus
 import com.pwhs.quickmem.core.data.Rating
 
 data class FlashCardResponseModel(
@@ -11,6 +12,7 @@ data class FlashCardResponseModel(
     val explanation: String?,
     val studySetId: String,
     val rating: String = Rating.NOT_STUDIED.name,
+    val flipStatus: String = FlipCardStatus.NONE.name,
     val isStarred: Boolean,
     val createdAt: String,
     val updatedAt: String

diff --git a/app/src/main/java/com/pwhs/quickmem/domain/model/flashcard/StudySetFlashCardResponseModel.kt b/app/src/main/java/com/pwhs/quickmem/domain/model/flashcard/StudySetFlashCardResponseModel.kt
@@ -1,5 +1,6 @@
 package com.pwhs.quickmem.domain.model.flashcard
 
+import com.pwhs.quickmem.core.data.FlipCardStatus
 import com.pwhs.quickmem.core.data.Rating
 
 data class StudySetFlashCardResponseModel(
@@ -10,6 +11,7 @@ data class StudySetFlashCardResponseModel(
     val hint: String? = null,
     val explanation: String? = null,
     val rating: String = Rating.NOT_STUDIED.name,
+    val flipStatus: String = FlipCardStatus.NONE.name,
     val isStarred: Boolean = false,
     val createdAt: String = "",
     val updatedAt: String = ""

diff --git a/app/src/main/java/com/pwhs/quickmem/domain/model/flashcard/UpdateFlashCardResponseDto.kt b/app/src/main/java/com/pwhs/quickmem/domain/model/flashcard/UpdateFlashCardResponseDto.kt
@@ -0,0 +1,12 @@
+package com.pwhs.quickmem.domain.model.flashcard
+
+import com.pwhs.quickmem.core.data.FlipCardStatus
+import com.pwhs.quickmem.core.data.Rating
+
+data class UpdateFlashCardResponseModel(
+    val id: String,
+    val message: String,
+    val isStarred: Boolean? = false,
+    val rating: String? = Rating.NOT_STUDIED.name,
+    val flipStatus: String? = FlipCardStatus.NONE.name,
+)
diff --git a/app/src/main/java/com/pwhs/quickmem/domain/repository/FlashCardRepository.kt b/app/src/main/java/com/pwhs/quickmem/domain/repository/FlashCardRepository.kt
@@ -1,9 +1,11 @@
 package com.pwhs.quickmem.domain.repository
 
 import com.pwhs.quickmem.core.utils.Resources
+import com.pwhs.quickmem.data.dto.flashcard.FlipFlashCardDto
 import com.pwhs.quickmem.domain.model.flashcard.CreateFlashCardModel
 import com.pwhs.quickmem.domain.model.flashcard.EditFlashCardModel
 import com.pwhs.quickmem.domain.model.flashcard.FlashCardResponseModel
+import com.pwhs.quickmem.domain.model.flashcard.UpdateFlashCardResponseModel
 import kotlinx.coroutines.flow.Flow
 
 interface FlashCardRepository {
@@ -21,14 +23,20 @@ interface FlashCardRepository {
         token: String,
         id: String,
         isStarred: Boolean
-    ): Flow<Resources<Unit>>
+    ): Flow<Resources<UpdateFlashCardResponseModel>>
 
     suspend fun updateFlashCard(
         token: String,
         id: String,
         editFlashCardModel: EditFlashCardModel
     ): Flow<Resources<FlashCardResponseModel>>
 
+    suspend fun updateFlipFlashCard(
+        token: String,
+        id: String,
+        flipStatus: String
+    ): Flow<Resources<UpdateFlashCardResponseModel>>
+
     suspend fun getFlashCardsByStudySetId(
         token: String,
         studySetId: String

diff --git a/.../main/java/com/pwhs/quickmem/presentation/app/study_set/detail/StudySetDetailViewModel.kt b/.../main/java/com/pwhs/quickmem/presentation/app/study_set/detail/StudySetDetailViewModel.kt
@@ -159,6 +159,7 @@ class StudySetDetailViewModel @Inject constructor(
                         }
 
                         is Resources.Success -> {
+                            Timber.d(resource.data?.message)
                             _uiEvent.send(StudySetDetailUiEvent.FlashCardStarred)
                         }