미션 상태 - 인원 미달, 종료 대기 대응

core/data/mission/src/main/java/com/goalpanzi/mission_mate/core/board/repository/MissionRepositoryImpl.kt

@@ -12,6 +12,7 @@ import com.goalpanzi.mission_mate.core.domain.mission.model.MissionRank
 import com.goalpanzi.mission_mate.core.domain.mission.model.MissionVerification
 import com.goalpanzi.mission_mate.core.domain.mission.model.MissionVerifications
 import com.goalpanzi.mission_mate.core.domain.mission.repository.MissionRepository
+import com.goalpanzi.mission_mate.core.network.model.request.CompleteMissionRequest
 import com.goalpanzi.mission_mate.core.network.service.MissionService
 import kotlinx.coroutines.flow.Flow
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -78,6 +79,12 @@ class MissionRepositoryImpl @Inject constructor(
         it.toModel()
     }
 
+    override suspend fun completeMission(missionId: Long): DomainResult<Unit>  = handleResult {
+        missionService.completeMission(
+            CompleteMissionRequest(missionId)
+        )
+    }
+
     override fun clearMissionData(): Flow<Unit> = missionDataSource.clearMissionData()
 
     override fun setIsMissionJoined(data: Boolean): Flow<Unit> = missionDataSource.setIsMissionJoined(data)

core/data/onboarding/src/main/java/com/goalpanzi/mission_mate/core/data/onboarding/mapper/OnboardingMapper.kt

@@ -1,11 +1,13 @@
 package com.goalpanzi.mission_mate.core.data.onboarding.mapper
 
 import com.goalpanzi.mission_mate.core.data.common.mapper.toModel
+import com.goalpanzi.mission_mate.core.domain.common.model.mission.MissionStatus
 import com.goalpanzi.mission_mate.core.domain.onboarding.model.CreateMissionBody
 import com.goalpanzi.mission_mate.core.domain.onboarding.model.Mission
 import com.goalpanzi.mission_mate.core.domain.onboarding.model.Missions
 import com.goalpanzi.mission_mate.core.network.model.request.CreateMissionRequest
 import com.goalpanzi.mission_mate.core.network.model.response.MissionResponse
+import com.goalpanzi.mission_mate.core.network.model.response.MissionStatusResponse
 import com.goalpanzi.mission_mate.core.network.model.response.MissionsResponse
 
 fun CreateMissionBody.toRequest() : CreateMissionRequest {
@@ -23,7 +25,7 @@ fun MissionResponse.toModel() : Mission {
     return Mission(
         missionId = missionId,
         description = description,
-        missionStatus = missionStatus
+        missionStatus = missionStatus.toModel()
     )
 }
 
@@ -36,3 +38,11 @@ fun MissionsResponse.toModel() : Missions {
         }
     )
 }
+
+fun MissionStatusResponse.toModel() : MissionStatus {
+    return try{
+        MissionStatus.valueOf(this.name)
+    }catch (e : Exception){
+        MissionStatus.COMPLETED
+    }
+}

core/data/onboarding/src/main/java/com/goalpanzi/mission_mate/core/data/onboarding/repository/OnboardingRepositoryImpl.kt

@@ -34,7 +34,7 @@ class OnboardingRepositoryImpl @Inject constructor(
             onboardingService.joinMission(JoinMissionRequest(invitationCode))
         }
 
-    override suspend fun getJoinedMissions(): DomainResult<Missions> = handleResult {
-        onboardingService.getJoinedMissions()
+    override suspend fun getJoinedMissions(filter : String): DomainResult<Missions> = handleResult {
+        onboardingService.getJoinedMissions(filter)
     }.convert { it.toModel() }
 }

core/domain/common/src/main/java/com/goalpanzi/mission_mate/core/domain/common/model/mission/MissionStatus.kt

@@ -0,0 +1,17 @@
+package com.goalpanzi.mission_mate.core.domain.common.model.mission
+
+enum class MissionStatus {
+    CREATED,
+    CANCELED,
+    IN_PROGRESS,
+    DELETED,
+    PENDING_COMPLETION,
+    COMPLETED;
+
+    companion object {
+        val statusString: String = listOf(CREATED, CANCELED, IN_PROGRESS, PENDING_COMPLETION)
+            .joinToString(",") { it.name }
+    }
+}
+
+

core/domain/mission/src/main/java/com/goalpanzi/mission_mate/core/domain/mission/repository/MissionRepository.kt

@@ -24,6 +24,8 @@ interface MissionRepository  {
 
     suspend fun getMyMissionVerification(missionId: Long, number : Int) : DomainResult<MissionVerification>
 
+    suspend fun completeMission(missionId : Long) : DomainResult<Unit>
+
     fun clearMissionData() : Flow<Unit>
     fun setIsMissionJoined(data: Boolean) : Flow<Unit>
     fun getIsMissionJoined() : Flow<Boolean?>

core/domain/mission/src/main/java/com/goalpanzi/mission_mate/core/domain/mission/usecase/CompleteMissionUseCase.kt

@@ -0,0 +1,16 @@
+package com.goalpanzi.mission_mate.core.domain.mission.usecase
+
+import com.goalpanzi.mission_mate.core.domain.common.DomainResult
+import com.goalpanzi.mission_mate.core.domain.mission.repository.MissionRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import javax.inject.Inject
+
+class CompleteMissionUseCase @Inject constructor(
+    private val missionRepository: MissionRepository
+) {
+    operator fun invoke(missionId: Long) : Flow<DomainResult<Unit>> = flow {
+        emit(missionRepository.completeMission(missionId))
+    }
+}
+

core/domain/onboarding/src/main/java/com/goalpanzi/mission_mate/core/domain/onboarding/model/Mission.kt

@@ -1,7 +1,9 @@
 package com.goalpanzi.mission_mate.core.domain.onboarding.model
 
+import com.goalpanzi.mission_mate.core.domain.common.model.mission.MissionStatus
+
 data class Mission(
     val missionId : Long,
     val description : String,
-    val missionStatus : String
+    val missionStatus : MissionStatus
 )

core/domain/onboarding/src/main/java/com/goalpanzi/mission_mate/core/domain/onboarding/repository/OnboardingRepository.kt

@@ -18,5 +18,5 @@ interface OnboardingRepository  {
         invitationCode: String
     ) : DomainResult<Unit>
 
-    suspend fun getJoinedMissions() : DomainResult<Missions>
+    suspend fun getJoinedMissions(filter : String) : DomainResult<Missions>
 }

core/domain/onboarding/src/main/java/com/goalpanzi/mission_mate/core/domain/onboarding/usecase/GetJoinedMissionsUseCase.kt

@@ -10,7 +10,7 @@ import javax.inject.Inject
 class GetJoinedMissionsUseCase @Inject constructor(
     private val onboardingRepository: OnboardingRepository
 ) {
-    operator fun invoke(): Flow<DomainResult<Missions>> = flow {
-        emit(onboardingRepository.getJoinedMissions())
+    operator fun invoke(filter : String): Flow<DomainResult<Missions>> = flow {
+        emit(onboardingRepository.getJoinedMissions(filter))
     }
 }

core/network/src/main/java/com/goalpanzi/mission_mate/core/network/model/request/CompleteMissionRequest.kt

@@ -0,0 +1,8 @@
+package com.goalpanzi.mission_mate.core.network.model.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CompleteMissionRequest(
+    val missionId : Long
+)

core/network/src/main/java/com/goalpanzi/mission_mate/core/network/model/response/MissionResponse.kt

@@ -6,5 +6,5 @@ import kotlinx.serialization.Serializable
 data class MissionResponse(
     val missionId : Long,
     val description : String,
-    val missionStatus : String
+    val missionStatus : MissionStatusResponse
 )

core/network/src/main/java/com/goalpanzi/mission_mate/core/network/model/response/MissionStatusResponse.kt

@@ -0,0 +1,10 @@
+package com.goalpanzi.mission_mate.core.network.model.response
+
+enum class MissionStatusResponse {
+    CREATED,
+    CANCELED,
+    IN_PROGRESS,
+    DELETED,
+    PENDING_COMPLETION,
+    COMPLETED
+}

core/network/src/main/java/com/goalpanzi/mission_mate/core/network/service/MissionService.kt

@@ -1,12 +1,14 @@
 package com.goalpanzi.mission_mate.core.network.service
 
+import com.goalpanzi.mission_mate.core.network.model.request.CompleteMissionRequest
 import com.goalpanzi.mission_mate.core.network.model.response.MissionBoardsResponse
 import com.goalpanzi.mission_mate.core.network.model.response.MissionDetailResponse
 import com.goalpanzi.mission_mate.core.network.model.response.MissionRankResponse
 import com.goalpanzi.mission_mate.core.network.model.response.MissionVerificationResponse
 import com.goalpanzi.mission_mate.core.network.model.response.MissionVerificationsResponse
 import okhttp3.MultipartBody
 import retrofit2.Response
+import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.Multipart
@@ -54,4 +56,9 @@ interface MissionService {
         @Path("missionId") missionId: Long,
         @Path("number") number: Int
     ) : Response<MissionVerificationResponse>
+
+    @POST("/api/mission-members/complete")
+    suspend fun completeMission(
+        @Body request: CompleteMissionRequest
+    ): Response<Unit>
 }

feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/BoardNavigation.kt

@@ -101,8 +101,8 @@ fun NavGraphBuilder.boardFinishNavGraph(
         arguments = listOf(navArgument(missionIdArg) { type = NavType.LongType })
     ) {
         BoardFinishRoute(
-            onClickSetting = onClickSetting,
-            onClickOk = onClickOk
+            onSettingClick = onClickSetting,
+            onOkClick = onClickOk
         )
     }
 }