Merge remote-tracking branch 'origin/develop' into feature/#76-happy-…

…user-routine-post-server # Conflicts: # app/src/main/java/com/sopetit/softie/di/RepositoryModule.kt # app/src/main/java/com/sopetit/softie/di/RetrofitServiceModule.kt
Team-Sopetit · Jan 17, 2024 · 21c7c05 · 21c7c05
2 parents 719be2a + fcfe197
commit 21c7c05
Show file tree

Hide file tree

Showing 28 changed files with 264 additions and 74 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,7 +22,6 @@ android {
         versionName = "1.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "BASE_URL", getApiKey("BASE_URL"))
-        buildConfigField("String", "ACCESS_TOKEN", getApiKey("ACCESS_TOKEN"))
         buildConfigField("String", "KAKAO_NATIVE_APP_KEY", getApiKey("KAKAO_NATIVE_APP_KEY"))
         manifestPlaceholders["KAKAO_REDIRECT_SCHEME"] = getApiKey("KAKAO_REDIRECT_SCHEME")
     }

diff --git a/app/src/main/java/com/sopetit/softie/data/entity/request/PostMemberRequest.kt b/app/src/main/java/com/sopetit/softie/data/entity/request/PostMemberRequest.kt
@@ -0,0 +1,14 @@
+package com.sopetit.softie.data.entity.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PostMemberRequest(
+    @SerialName("dollType")
+    val dollType: String,
+    @SerialName("name")
+    val name: String,
+    @SerialName("routines")
+    val routines: ArrayList<Int>
+)
diff --git a/app/src/main/java/com/sopetit/softie/data/repositoryImpl/AuthRepositoryImpl.kt b/app/src/main/java/com/sopetit/softie/data/repositoryImpl/AuthRepositoryImpl.kt
@@ -10,6 +10,8 @@ class AuthRepositoryImpl @Inject constructor(
     private val authDataSource: AuthDataSource,
     private val localDataSource: LocalDataSource
 ) : AuthRepository {
+    override suspend fun deleteAuth(): Result<Unit> = runCatching { authDataSource.deleteAuth() }
+
     override suspend fun postLogin(socialPlatform: String): Result<Token> =
         kotlin.runCatching { authDataSource.postLogin(socialPlatform) }.map { response ->
             requireNotNull(response.data).toToken()

diff --git a/app/src/main/java/com/sopetit/softie/data/repositoryImpl/MemberRepositoryImpl.kt b/app/src/main/java/com/sopetit/softie/data/repositoryImpl/MemberRepositoryImpl.kt
@@ -1,5 +1,6 @@
 package com.sopetit.softie.data.repositoryImpl
 
+import com.sopetit.softie.data.entity.request.PostMemberRequest
 import com.sopetit.softie.data.source.MemberDataSource
 import com.sopetit.softie.domain.entity.CottonCount
 import com.sopetit.softie.domain.entity.Home
@@ -18,4 +19,7 @@ class MemberRepositoryImpl @Inject constructor(
         runCatching { memberDataSource.patchCotton(cottonType) }.map { response ->
             requireNotNull(response.data).toCottonCount()
         }
+
+    override suspend fun postMember(request: PostMemberRequest): Result<Unit> =
+        runCatching { memberDataSource.postMember(request) }
 }
diff --git a/app/src/main/java/com/sopetit/softie/data/service/AuthService.kt b/app/src/main/java/com/sopetit/softie/data/service/AuthService.kt
@@ -4,11 +4,15 @@ import com.sopetit.softie.data.entity.BaseResponse
 import com.sopetit.softie.data.entity.request.LoginRequest
 import com.sopetit.softie.data.entity.response.LoginResponse
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.POST
 
 interface AuthService {
     @POST("api/v1/auth")
     suspend fun postLogin(
         @Body body: LoginRequest
     ): BaseResponse<LoginResponse>
+
+    @DELETE("/api/v1/auth")
+    suspend fun deleteAuth(): BaseResponse<Unit>
 }
diff --git a/app/src/main/java/com/sopetit/softie/data/service/MemberService.kt b/app/src/main/java/com/sopetit/softie/data/service/MemberService.kt
@@ -1,10 +1,13 @@
 package com.sopetit.softie.data.service
 
 import com.sopetit.softie.data.entity.BaseResponse
+import com.sopetit.softie.data.entity.request.PostMemberRequest
 import com.sopetit.softie.data.entity.response.CottonCountResponse
 import com.sopetit.softie.data.entity.response.HomeResponse
+import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.PATCH
+import retrofit2.http.POST
 import retrofit2.http.Path
 
 interface MemberService {
@@ -13,4 +16,7 @@ interface MemberService {
 
     @PATCH("api/v1/members/{cottonType}")
     suspend fun patchCotton(@Path("cottonType") cottonType: String): BaseResponse<CottonCountResponse>
+
+    @POST("/api/v1/members")
+    suspend fun postMember(@Body request: PostMemberRequest): BaseResponse<Unit>
 }
diff --git a/app/src/main/java/com/sopetit/softie/data/source/AuthDataSource.kt b/app/src/main/java/com/sopetit/softie/data/source/AuthDataSource.kt
@@ -9,6 +9,9 @@ import javax.inject.Inject
 class AuthDataSource @Inject constructor(
     private val authService: AuthService
 ) {
+
+    suspend fun deleteAuth(): BaseResponse<Unit> = authService.deleteAuth()
+
     suspend fun postLogin(socialType: String): BaseResponse<LoginResponse> =
         authService.postLogin(LoginRequest(socialType))
 }
diff --git a/app/src/main/java/com/sopetit/softie/data/source/MemberDataSource.kt b/app/src/main/java/com/sopetit/softie/data/source/MemberDataSource.kt
@@ -1,6 +1,7 @@
 package com.sopetit.softie.data.source
 
 import com.sopetit.softie.data.entity.BaseResponse
+import com.sopetit.softie.data.entity.request.PostMemberRequest
 import com.sopetit.softie.data.entity.response.CottonCountResponse
 import com.sopetit.softie.data.entity.response.HomeResponse
 import com.sopetit.softie.data.service.MemberService
@@ -12,4 +13,7 @@ class MemberDataSource @Inject constructor(
     suspend fun getHome(): BaseResponse<HomeResponse> = memberService.getHome()
     suspend fun patchCotton(cottonType: String): BaseResponse<CottonCountResponse> =
         memberService.patchCotton(cottonType)
+
+    suspend fun postMember(request: PostMemberRequest): BaseResponse<Unit> =
+        memberService.postMember(request)
 }
diff --git a/app/src/main/java/com/sopetit/softie/di/RepositoryModule.kt b/app/src/main/java/com/sopetit/softie/di/RepositoryModule.kt
@@ -27,12 +27,6 @@ abstract class RepositoryModule {
         memberRepositoryImpl: MemberRepositoryImpl
     ): MemberRepository
 
-    @Binds
-    @Singleton
-    abstract fun bindToAuthRepository(
-        authRepositoryImpl: AuthRepositoryImpl
-    ): AuthRepository
-
     @Binds
     @Singleton
     abstract fun bindToDailyRoutineRepository(
@@ -56,4 +50,10 @@ abstract class RepositoryModule {
     abstract fun bindToMemberHappinessRoutineRepository(
         memberHappinessRoutineRepositoryImpl: MemberHappinessRoutineRepositoryImpl
     ): MemberHappinessRoutineRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindToAuthRepository(
+        authRepositoryImpl: AuthRepositoryImpl
+    ): AuthRepository
 }
diff --git a/app/src/main/java/com/sopetit/softie/di/RetrofitServiceModule.kt b/app/src/main/java/com/sopetit/softie/di/RetrofitServiceModule.kt
@@ -19,10 +19,6 @@ object RetrofitServiceModule {
     fun providesMemberService(@RetrofitModule.SoftieType retrofit: Retrofit): MemberService =
         retrofit.create(MemberService::class.java)
 
-    @Provides
-    fun providesAuthService(@RetrofitModule.SoftieType retrofit: Retrofit): AuthService =
-        retrofit.create(AuthService::class.java)
-
     @Provides
     fun providesHappinessRoutineService(@RetrofitModule.SoftieType retrofit: Retrofit): HappinessRoutineService =
         retrofit.create(HappinessRoutineService::class.java)
@@ -35,6 +31,10 @@ object RetrofitServiceModule {
     fun providesDollService(@RetrofitModule.SoftieType retrofit: Retrofit): DollService =
         retrofit.create(DollService::class.java)
 
+    @Provides
+    fun providesAuthService(@RetrofitModule.SoftieType retrofit: Retrofit): AuthService =
+        retrofit.create(AuthService::class.java)
+
     @Provides
     fun providesMemberHappinessRoutineService(@RetrofitModule.SoftieType retrofit: Retrofit): MemberHappinessRoutineService =
         retrofit.create(MemberHappinessRoutineService::class.java)

diff --git a/app/src/main/java/com/sopetit/softie/domain/repository/AuthRepository.kt b/app/src/main/java/com/sopetit/softie/domain/repository/AuthRepository.kt
@@ -1,8 +1,9 @@
 package com.sopetit.softie.domain.repository
-
 import com.sopetit.softie.domain.entity.Token
 
 interface AuthRepository {
+
+    suspend fun deleteAuth(): Result<Unit>
     suspend fun postLogin(socialPlatform: String): Result<Token>
     fun getSignedUp(): Boolean
     fun initToken(accessToken: String, refreshToken: String)

diff --git a/app/src/main/java/com/sopetit/softie/domain/repository/MemberRepository.kt b/app/src/main/java/com/sopetit/softie/domain/repository/MemberRepository.kt
@@ -1,9 +1,12 @@
 package com.sopetit.softie.domain.repository
 
+import com.sopetit.softie.data.entity.request.PostMemberRequest
 import com.sopetit.softie.domain.entity.CottonCount
 import com.sopetit.softie.domain.entity.Home
 
 interface MemberRepository {
     suspend fun getHome(): Result<Home>
     suspend fun patchCotton(cottonType: String): Result<CottonCount>
+
+    suspend fun postMember(request: PostMemberRequest): Result<Unit>
 }
diff --git a/app/src/main/java/com/sopetit/softie/domain/usecase/auth/DeleteAuthUseCase.kt b/app/src/main/java/com/sopetit/softie/domain/usecase/auth/DeleteAuthUseCase.kt
@@ -0,0 +1,11 @@
+package com.sopetit.softie.domain.usecase.auth
+
+import com.sopetit.softie.domain.repository.AuthRepository
+import javax.inject.Inject
+
+class DeleteAuthUseCase @Inject constructor(
+    private val authRepository: AuthRepository
+) {
+
+    suspend operator fun invoke() = authRepository.deleteAuth()
+}
diff --git a/app/src/main/java/com/sopetit/softie/domain/usecase/member/PostMemberUseCase.kt b/app/src/main/java/com/sopetit/softie/domain/usecase/member/PostMemberUseCase.kt
@@ -0,0 +1,12 @@
+package com.sopetit.softie.domain.usecase.member
+
+import com.sopetit.softie.data.entity.request.PostMemberRequest
+import com.sopetit.softie.domain.repository.MemberRepository
+import javax.inject.Inject
+
+class PostMemberUseCase @Inject constructor(
+    private val memberRepository: MemberRepository
+) {
+
+    suspend operator fun invoke(request: PostMemberRequest) = memberRepository.postMember(request)
+}
diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyRoutineFragment.kt
@@ -10,6 +10,7 @@ import coil.load
 import com.sopetit.softie.R
 import com.sopetit.softie.databinding.FragmentHappyRoutineBinding
 import com.sopetit.softie.ui.happyroutine.list.HappyAddListActivity
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.BROWN
 import com.sopetit.softie.util.binding.BindingFragment
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -25,7 +26,7 @@ class HappyRoutineFragment :
 
         sharedPreferences =
             this.requireActivity().getSharedPreferences("user", Context.MODE_PRIVATE)
-        val bearType = sharedPreferences.getString("bearType", "BROWN")
+        val bearType = sharedPreferences.getString("bearType", BROWN)
 
         initSetBearFace(bearType)
         setCardEnter()

diff --git a/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyRoutineViewModel.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyRoutineViewModel.kt
@@ -5,6 +5,10 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.sopetit.softie.domain.usecase.doll.GetDollUseCase
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.BROWN
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.GRAY
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.RED
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.WHITE
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -21,11 +25,11 @@ class HappyRoutineViewModel @Inject constructor(
     fun setDollFace(type: String) {
         viewModelScope.launch {
             when (type) {
-                "BROWN" -> getDollUseCase.invoke(type)
-                "GRAY" -> getDollUseCase.invoke(type)
-                "PANDA" -> getDollUseCase.invoke(type)
-                "RED" -> getDollUseCase.invoke(type)
-                else -> getDollUseCase.invoke("BROWN")
+                BROWN -> getDollUseCase.invoke(type)
+                GRAY -> getDollUseCase.invoke(type)
+                WHITE -> getDollUseCase.invoke(type)
+                RED -> getDollUseCase.invoke(type)
+                else -> getDollUseCase.invoke(BROWN)
             }.onSuccess { response ->
                 _bearFace.value = response
                 Timber.d("곰돌이 서버 통신 성공 -> $response")

diff --git a/app/src/main/java/com/sopetit/softie/ui/main/home/HomeFragment.kt b/app/src/main/java/com/sopetit/softie/ui/main/home/HomeFragment.kt
@@ -9,6 +9,10 @@ import androidx.fragment.app.viewModels
 import com.sopetit.softie.R
 import com.sopetit.softie.databinding.FragmentHomeBinding
 import com.sopetit.softie.domain.entity.Cotton
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.BROWN
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.GRAY
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.RED
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.WHITE
 import com.sopetit.softie.ui.setting.SettingActivity
 import com.sopetit.softie.util.binding.BindingFragment
 import com.sopetit.softie.util.setStatusBarColor
@@ -41,16 +45,16 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(R.layout.fragment_home
         sharedPreferences =
             this.requireActivity().getSharedPreferences("user", Context.MODE_PRIVATE)
         sharedPreferences.edit()
-            .putString("bearType", viewModel.homeResponse.value?.dollType ?: "BROWN").commit()
+            .putString("bearType", viewModel.homeResponse.value?.dollType ?: BROWN).commit()
     }
 
     private fun setUserLottieList() {
         viewModel.getHome()
         userLottieList = when (viewModel.homeResponse.value?.dollType) {
-            "BROWN" -> brownBearLottieList
-            "GRAY" -> grayBearLottieList
-            "RED" -> redBearLottieList
-            "PANDA" -> pandaBearLottieList
+            BROWN -> brownBearLottieList
+            GRAY -> grayBearLottieList
+            RED -> redBearLottieList
+            WHITE -> pandaBearLottieList
             else -> brownBearLottieList
         }
     }

diff --git a/app/src/main/java/com/sopetit/softie/ui/onboarding/OnboardingViewModel.kt b/app/src/main/java/com/sopetit/softie/ui/onboarding/OnboardingViewModel.kt
@@ -47,8 +47,8 @@ class OnboardingViewModel @Inject constructor(
     val layoutTranslucent: LiveData<Boolean>
         get() = _layoutTranslucent
 
-    private val _selectedBearType: MutableLiveData<Int> = MutableLiveData()
-    val selectedBearType: LiveData<Int> get() = _selectedBearType
+    private val _selectedBearType: MutableLiveData<String> = MutableLiveData()
+    val selectedBearType: LiveData<String> get() = _selectedBearType
 
     private val _bearNickname: MutableLiveData<String> = MutableLiveData("")
     val bearNickname: LiveData<String> get() = _bearNickname
@@ -89,21 +89,21 @@ class OnboardingViewModel @Inject constructor(
         _layoutTranslucent.value = boolean
     }
 
-    fun setSelectedBearType(bearType: Int) {
+    fun setSelectedBearType(bearType: String) {
         _selectedBearType.value = bearType
     }
 
     fun setBearNickname(nickname: String) {
         _bearNickname.value = nickname
     }
 
-    fun setDollFace(type: Int) {
+    fun setDollFace(type: String) {
         viewModelScope.launch {
             when (type) {
-                BROWN_BEAR -> getDollUseCase.invoke(BROWN)
-                GRAY_BEAR -> getDollUseCase.invoke(GRAY)
-                PANDA_BEAR -> getDollUseCase.invoke(WHITE)
-                RED_BEAR -> getDollUseCase.invoke(RED)
+                BROWN -> getDollUseCase.invoke(BROWN)
+                GRAY -> getDollUseCase.invoke(GRAY)
+                WHITE -> getDollUseCase.invoke(WHITE)
+                RED -> getDollUseCase.invoke(RED)
                 else -> getDollUseCase.invoke(BROWN)
             }.onSuccess { response ->
                 _bearFace.value = response
@@ -115,12 +115,7 @@ class OnboardingViewModel @Inject constructor(
     }
 
     companion object {
-        const val NONE = 0
-        const val BROWN_BEAR = 1
-        const val GRAY_BEAR = 2
-        const val PANDA_BEAR = 3
-        const val RED_BEAR = 4
-
+        const val NONE = ""
         const val BROWN = "BROWN"
         const val GRAY = "GRAY"
         const val WHITE = "WHITE"

diff --git a/app/src/main/java/com/sopetit/softie/ui/onboarding/bearnaming/BearNamingFragment.kt b/app/src/main/java/com/sopetit/softie/ui/onboarding/bearnaming/BearNamingFragment.kt
@@ -7,11 +7,11 @@ import androidx.lifecycle.ViewModelProvider
 import com.sopetit.softie.R
 import com.sopetit.softie.databinding.FragmentOnboardingBearNamingBinding
 import com.sopetit.softie.ui.onboarding.OnboardingViewModel
-import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.BROWN_BEAR
-import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.GRAY_BEAR
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.BROWN
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.GRAY
 import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.NONE
-import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.PANDA_BEAR
-import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.RED_BEAR
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.RED
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.WHITE
 import com.sopetit.softie.util.binding.BindingFragment
 
 class BearNamingFragment :
@@ -34,10 +34,10 @@ class BearNamingFragment :
     private fun setLottieFile() {
         when (activityViewModel.selectedBearType.value) {
             NONE -> setLottieAnimation(R.raw.brown_hello)
-            BROWN_BEAR -> setLottieAnimation(R.raw.brown_hello)
-            GRAY_BEAR -> setLottieAnimation(R.raw.gray_hello)
-            RED_BEAR -> setLottieAnimation(R.raw.red_hello)
-            PANDA_BEAR -> setLottieAnimation(R.raw.panda_hello)
+            BROWN -> setLottieAnimation(R.raw.brown_hello)
+            GRAY -> setLottieAnimation(R.raw.gray_hello)
+            RED -> setLottieAnimation(R.raw.red_hello)
+            WHITE -> setLottieAnimation(R.raw.panda_hello)
         }
     }
 

diff --git a/app/src/main/java/com/sopetit/softie/ui/onboarding/bearselection/BearSelectionFragment.kt b/app/src/main/java/com/sopetit/softie/ui/onboarding/bearselection/BearSelectionFragment.kt
@@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.sopetit.softie.R
 import com.sopetit.softie.databinding.FragmentOnboardingBearSelectionBinding
 import com.sopetit.softie.ui.onboarding.OnboardingViewModel
-import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.BROWN_BEAR
+import com.sopetit.softie.ui.onboarding.OnboardingViewModel.Companion.BROWN
 import com.sopetit.softie.util.binding.BindingFragment
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -31,7 +31,7 @@ class BearSelectionFragment :
     private fun initChangeFragment() {
         binding.btnBearSelection.setOnClickListener {
             activityViewModel.changeBearNameChoiceView()
-            activityViewModel.setSelectedBearType(viewModel.selectedBearType.value ?: BROWN_BEAR)
+            activityViewModel.setSelectedBearType(viewModel.selectedBearType.value ?: BROWN)
 
             activityViewModel.selectedBearType.observe(viewLifecycleOwner) {
                 activityViewModel.setDollFace(it)

diff --git a/app/src/main/java/com/sopetit/softie/ui/onboarding/bearselection/BearSelectionViewModel.kt b/app/src/main/java/com/sopetit/softie/ui/onboarding/bearselection/BearSelectionViewModel.kt
@@ -9,10 +9,10 @@ import javax.inject.Inject
 
 @HiltViewModel
 class BearSelectionViewModel @Inject constructor() : ViewModel() {
-    private val _selectedBearType: MutableLiveData<Int> = MutableLiveData(NONE)
-    val selectedBearType: LiveData<Int> get() = _selectedBearType
+    private val _selectedBearType: MutableLiveData<String> = MutableLiveData(NONE)
+    val selectedBearType: LiveData<String> get() = _selectedBearType
 
-    fun selectBearType(dollType: Int) {
+    fun selectBearType(dollType: String) {
         val isSameBearSelected = _selectedBearType.value == dollType
 
         if (isSameBearSelected) _selectedBearType.value = NONE