fix: 미션 조회 필터값 수정

Nexters · Oct 27, 2024 · 9d46b7f · 9d46b7f
1 parent 912bebd
commit 9d46b7f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -43,7 +43,7 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            isDebuggable = false
+            isDebuggable = true
         }
     }
     buildFeatures {

diff --git a/.../src/main/java/com/goalpanzi/mission_mate/core/data/onboarding/mapper/OnboardingMapper.kt b/.../src/main/java/com/goalpanzi/mission_mate/core/data/onboarding/mapper/OnboardingMapper.kt
@@ -22,7 +22,8 @@ fun CreateMissionBody.toRequest() : CreateMissionRequest {
 fun MissionResponse.toModel() : Mission {
     return Mission(
         missionId = missionId,
-        description = description
+        description = description,
+        missionStatus = missionStatus
     )
 }
 

diff --git a/...boarding/src/main/java/com/goalpanzi/mission_mate/core/domain/onboarding/model/Mission.kt b/...boarding/src/main/java/com/goalpanzi/mission_mate/core/domain/onboarding/model/Mission.kt
@@ -2,5 +2,6 @@ package com.goalpanzi.mission_mate.core.domain.onboarding.model
 
 data class Mission(
     val missionId : Long,
-    val description : String
+    val description : String,
+    val missionStatus : String
 )
diff --git a/...k/src/main/java/com/goalpanzi/mission_mate/core/network/model/response/MissionResponse.kt b/...k/src/main/java/com/goalpanzi/mission_mate/core/network/model/response/MissionResponse.kt
@@ -5,5 +5,6 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class MissionResponse(
     val missionId : Long,
-    val description : String
+    val description : String,
+    val missionStatus : String
 )
diff --git a/...etwork/src/main/java/com/goalpanzi/mission_mate/core/network/service/OnboardingService.kt b/...etwork/src/main/java/com/goalpanzi/mission_mate/core/network/service/OnboardingService.kt
@@ -28,6 +28,6 @@ interface OnboardingService {
 
     @GET("/api/mission-members/me")
     suspend fun getJoinedMissions(
-        @Query("filter") filter : String = "PENDING,ONGOING"
+        @Query("filter") filter : String = ""
     ) : Response<MissionsResponse>
-}
+}
diff --git a/...src/main/java/com/goalpanzi/mission_mate/feature/onboarding/screen/OnboardingViewModel.kt b/...src/main/java/com/goalpanzi/mission_mate/feature/onboarding/screen/OnboardingViewModel.kt
@@ -65,9 +65,10 @@ class OnboardingViewModel @Inject constructor(
                     when (result) {
                         is DomainResult.Success -> {
                             result.data.missions.let { missions ->
-                                if (missions.isNotEmpty() && isJoined != false) {
+                                val missionInProgress = missions.lastOrNull { it.missionStatus == "IN_PROGRESS" }
+                                if (missionInProgress != null) {
                                     _onboardingResultEvent.emit(
-                                        OnboardingResultEvent.SuccessWithJoinedMissions(missions.first())
+                                        OnboardingResultEvent.SuccessWithJoinedMissions(missionInProgress)
                                     )
                                 } else {
                                     _onboardingUiModel.emit(