feat: getMissionHistories 추가

eshc123 · eshc123 · commit bc6ddc61b698 · 2025-02-16T15:58:57.000+09:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -61,6 +61,7 @@ dependencies {
     implementation(project(":core:data:onboarding"))
     implementation(project(":core:data:setting"))
     implementation(project(":core:data:user"))
+    implementation(project(":core:data:history"))
     implementation(project(":core:push"))
     implementation(project(":core:notification"))
 }
diff --git a/build-logic/src/main/kotlin/missionmate.android.feature.gradle.kts b/build-logic/src/main/kotlin/missionmate.android.feature.gradle.kts
@@ -29,6 +29,7 @@ dependencies {
     implementation(project(":core:domain:common"))
     implementation(project(":core:domain:auth"))
     implementation(project(":core:domain:onboarding"))
+    implementation(project(":core:domain:history"))
     implementation(project(":core:ui"))
 
 }
diff --git a/core/data/history/build.gradle.kts b/core/data/history/build.gradle.kts
@@ -46,8 +46,10 @@ dependencies {
     implementation(libs.hilt.android)
 
     implementation(project(":core:data:common"))
+    implementation(project(":core:data:mission"))
     implementation(project(":core:domain:common"))
     implementation(project(":core:domain:history"))
+    implementation(project(":core:domain:mission"))
     implementation(project(":core:network"))
     implementation(project(":core:datastore"))
 }
diff --git a/core/data/history/src/androidTest/java/com/goalpanzi/mission_mate/core/data/history/ExampleInstrumentedTest.kt b/core/data/history/src/androidTest/java/com/goalpanzi/mission_mate/core/data/history/ExampleInstrumentedTest.kt
diff --git a/core/data/history/src/main/java/com/goalpanzi/mission_mate/core/data/history/di/HistoryDataModule.kt b/core/data/history/src/main/java/com/goalpanzi/mission_mate/core/data/history/di/HistoryDataModule.kt
@@ -0,0 +1,16 @@
+package com.goalpanzi.mission_mate.core.data.history.di
+
+import com.goalpanzi.mission_mate.core.data.history.repository.HistoryRepositoryImpl
+import com.goalpanzi.mission_mate.core.domain.history.repository.HistoryRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal abstract class HistoryDataModule {
+
+    @Binds
+    abstract fun bindHistoryRepository(impl: HistoryRepositoryImpl): HistoryRepository
+}
diff --git a/core/data/history/src/main/java/com/goalpanzi/mission_mate/core/data/history/mapper/HistoryMapper.kt b/core/data/history/src/main/java/com/goalpanzi/mission_mate/core/data/history/mapper/HistoryMapper.kt
@@ -0,0 +1,29 @@
+package com.goalpanzi.mission_mate.core.data.history.mapper
+
+import com.goalpanzi.mission_mate.core.domain.history.model.MissionHistories
+import com.goalpanzi.mission_mate.core.domain.history.model.MissionHistory
+import com.goalpanzi.mission_mate.core.mission.mapper.toModel
+import com.goalpanzi.mission_mate.core.network.model.response.MissionHistoriesResponse
+import com.goalpanzi.mission_mate.core.network.model.response.MissionHistoryResponse
+
+fun MissionHistoryResponse.toModel(): MissionHistory = MissionHistory(
+    missionId = missionId,
+    description = description,
+    missionStartDate = missionStartDate,
+    missionEndDate = missionEndDate,
+    myVerificationCount = myVerificationCount,
+    totalVerificationCount = totalVerificationCount,
+    rank = rank,
+    randomImageUrlList = randomImageUrlList,
+    memberCount = memberCount,
+    missionMembers = missionMembers.map {
+        it.toModel()
+    }
+)
+
+fun MissionHistoriesResponse.toModel(): MissionHistories = MissionHistories(
+    hasNext = hasNext,
+    resultList = resultList.map {
+        it.toModel()
+    }
+)
diff --git a/core/data/history/src/main/java/com/goalpanzi/mission_mate/core/data/history/repository/HistoryRepositoryImpl.kt b/core/data/history/src/main/java/com/goalpanzi/mission_mate/core/data/history/repository/HistoryRepositoryImpl.kt
@@ -0,0 +1,22 @@
+package com.goalpanzi.mission_mate.core.data.history.repository
+
+import com.goalpanzi.mission_mate.core.data.common.handleResult
+import com.goalpanzi.mission_mate.core.data.history.mapper.toModel
+import com.goalpanzi.mission_mate.core.domain.common.DomainResult
+import com.goalpanzi.mission_mate.core.domain.common.convert
+import com.goalpanzi.mission_mate.core.domain.history.model.MissionHistories
+import com.goalpanzi.mission_mate.core.domain.history.repository.HistoryRepository
+import com.goalpanzi.mission_mate.core.network.service.HistoryService
+import javax.inject.Inject
+
+class HistoryRepositoryImpl @Inject constructor(
+    private val historyService: HistoryService
+) : HistoryRepository {
+    override suspend fun getMissionHistories(page: Int): DomainResult<MissionHistories> =
+        handleResult {
+            historyService.getMyMissionHistories(page)
+        }.convert {
+            it.toModel()
+        }
+
+}
diff --git a/core/data/mission/src/main/java/com/goalpanzi/mission_mate/core/mission/mapper/MissionMapper.kt b/core/data/mission/src/main/java/com/goalpanzi/mission_mate/core/mission/mapper/MissionMapper.kt
@@ -3,14 +3,14 @@ package com.goalpanzi.mission_mate.core.mission.mapper
 import com.goalpanzi.mission_mate.core.data.common.mapper.toModel
 import com.goalpanzi.mission_mate.core.domain.mission.model.BoardReward
 import com.goalpanzi.mission_mate.core.domain.mission.model.MissionBoard
-import com.goalpanzi.mission_mate.core.domain.mission.model.MissionBoardMembers
+import com.goalpanzi.mission_mate.core.domain.mission.model.MissionBoardMember
 import com.goalpanzi.mission_mate.core.domain.mission.model.MissionBoards
 import com.goalpanzi.mission_mate.core.domain.mission.model.MissionDetail
 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.network.model.response.BoardRewardResponse
-import com.goalpanzi.mission_mate.core.network.model.response.MissionBoardMembersResponse
+import com.goalpanzi.mission_mate.core.network.model.response.MissionBoardMemberResponse
 import com.goalpanzi.mission_mate.core.network.model.response.MissionBoardResponse
 import com.goalpanzi.mission_mate.core.network.model.response.MissionBoardsResponse
 import com.goalpanzi.mission_mate.core.network.model.response.MissionDetailResponse
@@ -41,8 +41,8 @@ fun MissionBoardResponse.toModel() : MissionBoard {
     )
 }
 
-fun MissionBoardMembersResponse.toModel() : MissionBoardMembers {
-    return MissionBoardMembers(
+fun MissionBoardMemberResponse.toModel() : MissionBoardMember {
+    return MissionBoardMember(
         memberId = memberId,
         nickname = nickname,
         characterType = characterType.toModel()
diff --git a/core/data/onboarding/src/main/java/com/goalpanzi/mission_mate/core/data/onboarding/repository/OnboardingRepositoryImpl.kt b/core/data/onboarding/src/main/java/com/goalpanzi/mission_mate/core/data/onboarding/repository/OnboardingRepositoryImpl.kt
@@ -1,6 +1,5 @@
 package com.goalpanzi.mission_mate.core.data.onboarding.repository
 
-import com.goalpanzi.mission_mate.core.mission.mapper.toModel
 import com.goalpanzi.mission_mate.core.data.common.handleResult
 import com.goalpanzi.mission_mate.core.data.onboarding.mapper.toModel
 import com.goalpanzi.mission_mate.core.data.onboarding.mapper.toRequest
@@ -10,6 +9,7 @@ import com.goalpanzi.mission_mate.core.domain.mission.model.MissionDetail
 import com.goalpanzi.mission_mate.core.domain.onboarding.model.CreateMissionBody
 import com.goalpanzi.mission_mate.core.domain.onboarding.model.Missions
 import com.goalpanzi.mission_mate.core.domain.onboarding.repository.OnboardingRepository
+import com.goalpanzi.mission_mate.core.mission.mapper.toModel
 import com.goalpanzi.mission_mate.core.network.model.request.JoinMissionRequest
 import com.goalpanzi.mission_mate.core.network.service.OnboardingService
 import javax.inject.Inject
diff --git a/core/domain/history/build.gradle.kts b/core/domain/history/build.gradle.kts
@@ -24,4 +24,5 @@ dependencies {
     ksp(libs.hilt.compiler)
 
     implementation(project(":core:domain:common"))
+    implementation(project(":core:domain:mission"))
 }
diff --git a/core/domain/history/src/main/java/com/goalpanzi/mission_mate/core/domain/history/MyClass.kt b/core/domain/history/src/main/java/com/goalpanzi/mission_mate/core/domain/history/MyClass.kt
diff --git a/core/domain/history/src/main/java/com/goalpanzi/mission_mate/core/domain/history/model/MissionHistories.kt b/core/domain/history/src/main/java/com/goalpanzi/mission_mate/core/domain/history/model/MissionHistories.kt
@@ -0,0 +1,6 @@
+package com.goalpanzi.mission_mate.core.domain.history.model
+
+data class MissionHistories(
+    val hasNext: Boolean,
+    val resultList: List<MissionHistory>
+)
diff --git a/core/domain/history/src/main/java/com/goalpanzi/mission_mate/core/domain/history/model/MissionHistory.kt b/core/domain/history/src/main/java/com/goalpanzi/mission_mate/core/domain/history/model/MissionHistory.kt
@@ -0,0 +1,16 @@
+package com.goalpanzi.mission_mate.core.domain.history.model
+
+import com.goalpanzi.mission_mate.core.domain.mission.model.MissionBoardMember
+
+data class MissionHistory(
+    val missionId: Long,
+    val description: String,
+    val missionStartDate: String,
+    val missionEndDate: String,
+    val myVerificationCount: Int,
+    val totalVerificationCount: Int,
+    val rank: Int,
+    val randomImageUrlList: List<String>,
+    val memberCount: Int,
+    val missionMembers: List<MissionBoardMember>
+)
diff --git a/core/domain/history/src/main/java/com/goalpanzi/mission_mate/core/domain/history/repository/HistoryRepository.kt b/core/domain/history/src/main/java/com/goalpanzi/mission_mate/core/domain/history/repository/HistoryRepository.kt
@@ -0,0 +1,8 @@
+package com.goalpanzi.mission_mate.core.domain.history.repository
+
+import com.goalpanzi.mission_mate.core.domain.common.DomainResult
+import com.goalpanzi.mission_mate.core.domain.history.model.MissionHistories
+
+interface HistoryRepository {
+    suspend fun getMissionHistories(page: Int) : DomainResult<MissionHistories>
+}
diff --git a/core/domain/history/src/main/java/com/goalpanzi/mission_mate/core/domain/history/usecase/GetMissionHistoriesUseCase.kt b/core/domain/history/src/main/java/com/goalpanzi/mission_mate/core/domain/history/usecase/GetMissionHistoriesUseCase.kt
@@ -0,0 +1,17 @@
+package com.goalpanzi.mission_mate.core.domain.history.usecase
+
+import com.goalpanzi.mission_mate.core.domain.common.DomainResult
+import com.goalpanzi.mission_mate.core.domain.history.model.MissionHistories
+import com.goalpanzi.mission_mate.core.domain.history.repository.HistoryRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import javax.inject.Inject
+
+class GetMissionHistoriesUseCase @Inject constructor(
+    private val historyRepository: HistoryRepository
+) {
+    operator fun invoke(page: Int) : Flow<DomainResult<MissionHistories>> = flow {
+        emit(historyRepository.getMissionHistories(page))
+    }
+}
+
diff --git a/core/domain/mission/src/main/java/com/goalpanzi/mission_mate/core/domain/mission/model/MissionBoard.kt b/core/domain/mission/src/main/java/com/goalpanzi/mission_mate/core/domain/mission/model/MissionBoard.kt
@@ -4,5 +4,5 @@ data class MissionBoard(
     val number : Int,
     val reward : BoardReward = BoardReward.NONE,
     val isMyPosition : Boolean = false,
-    val missionBoardMembers : List<MissionBoardMembers>
+    val missionBoardMembers : List<MissionBoardMember>
 )
diff --git a/core/domain/mission/src/main/java/com/goalpanzi/mission_mate/core/domain/mission/model/MissionBoardMember.kt b/core/domain/mission/src/main/java/com/goalpanzi/mission_mate/core/domain/mission/model/MissionBoardMember.kt
@@ -2,7 +2,7 @@ package com.goalpanzi.mission_mate.core.domain.mission.model
 
 import com.goalpanzi.mission_mate.core.domain.common.model.user.CharacterType
 
-data class MissionBoardMembers(
+data class MissionBoardMember(
     val memberId : Long,
     val nickname : String,
     val characterType : CharacterType = CharacterType.RABBIT
diff --git a/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/di/ServiceModule.kt b/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/di/ServiceModule.kt
@@ -1,5 +1,6 @@
 package com.goalpanzi.mission_mate.core.network.di
 
+import com.goalpanzi.mission_mate.core.network.service.HistoryService
 import com.goalpanzi.mission_mate.core.network.service.LoginService
 import com.goalpanzi.mission_mate.core.network.service.MissionService
 import com.goalpanzi.mission_mate.core.network.service.OnboardingService
@@ -55,4 +56,12 @@ object ServiceModule {
     ) : TokenService {
         return retrofit.create(TokenService::class.java)
     }
+
+    @Provides
+    @Singleton
+    fun provideHistoryService(
+        @TokenRetrofit retrofit: Retrofit
+    ) : HistoryService {
+        return retrofit.create(HistoryService::class.java)
+    }
 }
diff --git a/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/model/response/MissionBoardMemberResponse.kt b/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/model/response/MissionBoardMemberResponse.kt
@@ -3,7 +3,7 @@ package com.goalpanzi.mission_mate.core.network.model.response
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class MissionBoardMembersResponse(
+data class MissionBoardMemberResponse(
     val memberId : Long,
     val nickname : String,
     val characterType : CharacterTypeResponse = CharacterTypeResponse.RABBIT
diff --git a/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/model/response/MissionBoardResponse.kt b/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/model/response/MissionBoardResponse.kt
@@ -7,5 +7,5 @@ data class MissionBoardResponse(
     val number : Int,
     val reward : BoardRewardResponse = BoardRewardResponse.NONE,
     val isMyPosition : Boolean = false,
-    val missionBoardMembers : List<MissionBoardMembersResponse>
+    val missionBoardMembers : List<MissionBoardMemberResponse>
 )
diff --git a/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/model/response/MissionHistoriesResponse.kt b/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/model/response/MissionHistoriesResponse.kt
@@ -0,0 +1,9 @@
+package com.goalpanzi.mission_mate.core.network.model.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MissionHistoriesResponse(
+    val hasNext: Boolean,
+    val resultList: List<MissionHistoryResponse>
+)
diff --git a/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/model/response/MissionHistoryResponse.kt b/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/model/response/MissionHistoryResponse.kt
@@ -0,0 +1,17 @@
+package com.goalpanzi.mission_mate.core.network.model.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MissionHistoryResponse(
+    val missionId: Long,
+    val description: String,
+    val missionStartDate: String,
+    val missionEndDate: String,
+    val myVerificationCount: Int,
+    val totalVerificationCount: Int,
+    val rank: Int,
+    val randomImageUrlList: List<String>,
+    val memberCount: Int,
+    val missionMembers: List<MissionBoardMemberResponse>,
+)
diff --git a/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/service/HistoryService.kt b/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/service/HistoryService.kt
@@ -0,0 +1,14 @@
+package com.goalpanzi.mission_mate.core.network.service
+
+import com.goalpanzi.mission_mate.core.network.model.response.MissionHistoriesResponse
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface HistoryService {
+    @GET("/api/missions/histories/me")
+    suspend fun getMyMissionHistories(
+        @Query("page") page: Int,
+        @Query("pageSize") pageSize: Int = 30,
+    ): Response<MissionHistoriesResponse>
+}
diff --git a/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/model/MissionBoardMemberUiModel.kt b/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/model/MissionBoardMemberUiModel.kt
@@ -1,14 +1,14 @@
 package com.goalpanzi.mission_mate.feature.board.model
 
-import com.goalpanzi.mission_mate.core.domain.mission.model.MissionBoardMembers
+import com.goalpanzi.mission_mate.core.domain.mission.model.MissionBoardMember
 
 data class MissionBoardMemberUiModel(
     val nickname : String,
     val characterUiModel : CharacterUiModel,
  //   val memberId : Long
 )
 
-fun MissionBoardMembers.toModel() : MissionBoardMemberUiModel {
+fun MissionBoardMember.toModel() : MissionBoardMemberUiModel {
     return MissionBoardMemberUiModel(
         nickname = nickname,
         characterUiModel = characterType.toCharacterUiModel(),

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ dependencies {`
`61`	`61`	`implementation(project(":core:data:onboarding"))`
`62`	`62`	`implementation(project(":core:data:setting"))`
`63`	`63`	`implementation(project(":core:data:user"))`
	`64`	`+ implementation(project(":core:data:history"))`
`64`	`65`	`implementation(project(":core:push"))`
`65`	`66`	`implementation(project(":core:notification"))`
`66`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ dependencies {`
`29`	`29`	`implementation(project(":core:domain:common"))`
`30`	`30`	`implementation(project(":core:domain:auth"))`
`31`	`31`	`implementation(project(":core:domain:onboarding"))`
	`32`	`+ implementation(project(":core:domain:history"))`
`32`	`33`	`implementation(project(":core:ui"))`
`33`	`34`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,5 @@ dependencies {`
`24`	`24`	`ksp(libs.hilt.compiler)`
`25`	`25`
`26`	`26`	`implementation(project(":core:domain:common"))`
	`27`	`+ implementation(project(":core:domain:mission"))`
`27`	`28`	`}`