Merge pull request #55 from YAPP-Github/feature/#52-home-api

Author: wjdrjs00

app/src/main/java/com/threegap/bitnagil/di/data/DataSourceModule.kt

@@ -12,6 +12,8 @@ import com.threegap.bitnagil.data.recommendroutine.datasource.RecommendRoutineDa
 import com.threegap.bitnagil.data.recommendroutine.datasourceImpl.RecommendRoutineDataSourceImpl
 import com.threegap.bitnagil.data.routine.datasource.RoutineRemoteDataSource
 import com.threegap.bitnagil.data.routine.datasourceImpl.RoutineRemoteDataSourceImpl
+import com.threegap.bitnagil.data.user.datasource.UserDataSource
+import com.threegap.bitnagil.data.user.datasourceImpl.UserDataSourceImpl
 import com.threegap.bitnagil.data.writeroutine.datasource.WriteRoutineDataSource
 import com.threegap.bitnagil.data.writeroutine.datasourceImpl.WriteRoutineDataSourceImpl
 import dagger.Binds
@@ -48,6 +50,10 @@ abstract class DataSourceModule {
     @Singleton
     abstract fun bindWriteRoutineDataSource(writeRoutineDataSourceImpl: WriteRoutineDataSourceImpl): WriteRoutineDataSource
 
+    @Binds
+    @Singleton
+    abstract fun bindUserDataSource(userDataSourceImpl: UserDataSourceImpl): UserDataSource
+
     @Binds
     @Singleton
     abstract fun bindRecommendRoutineDataSource(recommendRoutineDataSourceImpl: RecommendRoutineDataSourceImpl): RecommendRoutineDataSource

app/src/main/java/com/threegap/bitnagil/di/data/RepositoryModule.kt

@@ -5,12 +5,14 @@ import com.threegap.bitnagil.data.emotion.repositoryImpl.EmotionRepositoryImpl
 import com.threegap.bitnagil.data.onboarding.repositoryImpl.OnBoardingRepositoryImpl
 import com.threegap.bitnagil.data.recommendroutine.repositoryImpl.RecommendRoutineRepositoryImpl
 import com.threegap.bitnagil.data.routine.repositoryImpl.RoutineRepositoryImpl
+import com.threegap.bitnagil.data.user.repositoryImpl.UserRepositoryImpl
 import com.threegap.bitnagil.data.writeroutine.repositoryImpl.WriteRoutineRepositoryImpl
 import com.threegap.bitnagil.domain.auth.repository.AuthRepository
 import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository
 import com.threegap.bitnagil.domain.onboarding.repository.OnBoardingRepository
 import com.threegap.bitnagil.domain.recommendroutine.repository.RecommendRoutineRepository
 import com.threegap.bitnagil.domain.routine.repository.RoutineRepository
+import com.threegap.bitnagil.domain.user.repository.UserRepository
 import com.threegap.bitnagil.domain.writeroutine.repository.WriteRoutineRepository
 import dagger.Binds
 import dagger.Module
@@ -42,6 +44,10 @@ abstract class RepositoryModule {
     @Singleton
     abstract fun bindWriteRoutineRepository(writeRoutineRepositoryImpl: WriteRoutineRepositoryImpl): WriteRoutineRepository
 
+    @Binds
+    @Singleton
+    abstract fun bindUserRepository(userRepositoryImpl: UserRepositoryImpl): UserRepository
+
     @Binds
     @Singleton
     abstract fun bindRecommendRoutineRepository(recommendRoutineRepositoryImpl: RecommendRoutineRepositoryImpl): RecommendRoutineRepository

app/src/main/java/com/threegap/bitnagil/di/data/ServiceModule.kt

@@ -5,6 +5,7 @@ import com.threegap.bitnagil.data.emotion.service.EmotionService
 import com.threegap.bitnagil.data.onboarding.service.OnBoardingService
 import com.threegap.bitnagil.data.recommendroutine.service.RecommendRoutineService
 import com.threegap.bitnagil.data.routine.service.RoutineService
+import com.threegap.bitnagil.data.user.service.UserService
 import com.threegap.bitnagil.data.writeroutine.service.WriteRoutineService
 import com.threegap.bitnagil.di.core.Auth
 import com.threegap.bitnagil.di.core.NoneAuth
@@ -50,6 +51,11 @@ object ServiceModule {
     fun provideReissueService(@NoneAuth retrofit: Retrofit): ReissueService =
         retrofit.create(ReissueService::class.java)
 
+    @Provides
+    @Singleton
+    fun provideUserService(@Auth retrofit: Retrofit): UserService =
+        retrofit.create(UserService::class.java)
+
     @Provides
     @Singleton
     fun provideRecommendRoutineService(@Auth retrofit: Retrofit): RecommendRoutineService =

core/network/src/main/java/com/threegap/bitnagil/network/model/AuthToken.kt

@@ -9,6 +9,4 @@ data class AuthToken(
     val accessToken: String,
     @SerialName("refreshToken")
     val refreshToken: String,
-    @SerialName("role") // todo: 제거 예정
-    val role: String,
 )

data/src/main/java/com/threegap/bitnagil/data/emotion/datasource/EmotionDataSource.kt

@@ -1,9 +1,11 @@
 package com.threegap.bitnagil.data.emotion.datasource
 
 import com.threegap.bitnagil.data.emotion.model.response.GetEmotionsResponse
+import com.threegap.bitnagil.data.emotion.model.response.MyEmotionResponseDto
 import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
 
 interface EmotionDataSource {
     suspend fun getEmotions(): Result<GetEmotionsResponse>
     suspend fun registerEmotion(emotion: String): Result<RegisterEmotionResponse>
+    suspend fun getMyEmotionMarble(currentDate: String): Result<MyEmotionResponseDto>
 }

data/src/main/java/com/threegap/bitnagil/data/emotion/datasourceImpl/EmotionDataSourceImpl.kt

@@ -4,6 +4,7 @@ import com.threegap.bitnagil.data.common.safeApiCall
 import com.threegap.bitnagil.data.emotion.datasource.EmotionDataSource
 import com.threegap.bitnagil.data.emotion.model.request.RegisterEmotionRequest
 import com.threegap.bitnagil.data.emotion.model.response.GetEmotionsResponse
+import com.threegap.bitnagil.data.emotion.model.response.MyEmotionResponseDto
 import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
 import com.threegap.bitnagil.data.emotion.service.EmotionService
 import javax.inject.Inject
@@ -23,4 +24,9 @@ class EmotionDataSourceImpl @Inject constructor(
             emotionService.postEmotions(registerEmotionRequest)
         }
     }
+
+    override suspend fun getMyEmotionMarble(currentDate: String): Result<MyEmotionResponseDto> =
+        safeApiCall {
+            emotionService.getMyEmotionMarble(currentDate)
+        }
 }

data/src/main/java/com/threegap/bitnagil/data/emotion/model/response/MyEmotionResponseDto.kt

@@ -0,0 +1,23 @@
+package com.threegap.bitnagil.data.emotion.model.response
+
+import com.threegap.bitnagil.domain.emotion.model.Emotion
+import com.threegap.bitnagil.domain.emotion.model.MyEmotion
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MyEmotionResponseDto(
+    @SerialName("emotionMarbleType")
+    val emotionMarbleType: String?,
+    @SerialName("emotionMarbleName")
+    val emotionMarbleName: String?,
+    @SerialName("imageUrl")
+    val imageUrl: String?,
+)
+
+fun MyEmotionResponseDto.toDomain(): MyEmotion =
+    MyEmotion(
+        emotionMarbleType = emotionMarbleType?.let { Emotion.valueOf(it) },
+        emotionMarbleName = emotionMarbleName,
+        imageUrl = imageUrl,
+    )

data/src/main/java/com/threegap/bitnagil/data/emotion/repositoryImpl/EmotionRepositoryImpl.kt

@@ -1,7 +1,9 @@
 package com.threegap.bitnagil.data.emotion.repositoryImpl
 
 import com.threegap.bitnagil.data.emotion.datasource.EmotionDataSource
+import com.threegap.bitnagil.data.emotion.model.response.toDomain
 import com.threegap.bitnagil.domain.emotion.model.Emotion
+import com.threegap.bitnagil.domain.emotion.model.MyEmotion
 import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository
 import javax.inject.Inject
 
@@ -36,4 +38,7 @@ class EmotionRepositoryImpl @Inject constructor(
 
         return emotionDataSource.registerEmotion(selectedEmotion).map { _ -> }
     }
+
+    override suspend fun getMyEmotionMarble(currentDate: String): Result<MyEmotion> =
+        emotionDataSource.getMyEmotionMarble(currentDate).map { it.toDomain() }
 }

data/src/main/java/com/threegap/bitnagil/data/emotion/service/EmotionService.kt

@@ -2,11 +2,13 @@ package com.threegap.bitnagil.data.emotion.service
 
 import com.threegap.bitnagil.data.emotion.model.request.RegisterEmotionRequest
 import com.threegap.bitnagil.data.emotion.model.response.GetEmotionsResponse
+import com.threegap.bitnagil.data.emotion.model.response.MyEmotionResponseDto
 import com.threegap.bitnagil.data.emotion.model.response.RegisterEmotionResponse
 import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
+import retrofit2.http.Query
 
 interface EmotionService {
     @GET("/api/v1/emotion-marbles")
@@ -16,4 +18,9 @@ interface EmotionService {
     suspend fun postEmotions(
         @Body request: RegisterEmotionRequest,
     ): BaseResponse<RegisterEmotionResponse>
+
+    @GET("/api/v1/emotion-marbles/me")
+    suspend fun getMyEmotionMarble(
+        @Query("searchDate") date: String,
+    ): BaseResponse<MyEmotionResponseDto>
 }

data/src/main/java/com/threegap/bitnagil/data/routine/datasource/RoutineRemoteDataSource.kt

@@ -1,10 +1,12 @@
 package com.threegap.bitnagil.data.routine.datasource
 
+import com.threegap.bitnagil.data.routine.model.request.RoutineByDayDeletionRequestDto
 import com.threegap.bitnagil.data.routine.model.request.RoutineCompletionRequestDto
 import com.threegap.bitnagil.data.routine.model.response.RoutinesResponseDto
 
 interface RoutineRemoteDataSource {
     suspend fun fetchWeeklyRoutines(startDate: String, endDate: String): Result<RoutinesResponseDto>
     suspend fun syncRoutineCompletion(routineCompletionRequestDto: RoutineCompletionRequestDto): Result<Unit>
     suspend fun deleteRoutine(routineId: String): Result<Unit>
+    suspend fun deleteRoutineByDay(routineByDayDeletionRequestDto: RoutineByDayDeletionRequestDto): Result<Unit>
 }