[chore] #98 코드리뷰 적용

TeamPINGLE · Jan 12, 2024 · e4db7be · e4db7be
1 parent b419ce8
commit e4db7be
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 28 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -67,7 +67,7 @@
             tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".presentation.ui.joingroup.JoinGroupCodeActivity"
-            android:exported="true"
+            android:exported="false"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity" />
         <activity

diff --git a/.../org/sopt/pingle/data/mapper/JoinGroup.kt → ...apper/RequestJoinGroupCodeEntityMapper.kt b/.../org/sopt/pingle/data/mapper/JoinGroup.kt → ...apper/RequestJoinGroupCodeEntityMapper.kt
diff --git a/app/src/main/java/org/sopt/pingle/data/model/remote/request/RequestJoinGroupCodeDto.kt b/app/src/main/java/org/sopt/pingle/data/model/remote/request/RequestJoinGroupCodeDto.kt
@@ -2,14 +2,9 @@ package org.sopt.pingle.data.model.remote.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import org.sopt.pingle.domain.model.RequestJoinGroupCodeEntity
 
 @Serializable
 data class RequestJoinGroupCodeDto(
     @SerialName("code")
     val code: String
-) {
-    fun toRequestJoinGroupCode() = RequestJoinGroupCodeEntity(
-        code = this.code
-    )
-}
+)
diff --git a/app/src/main/java/org/sopt/pingle/data/service/JoinGroupService.kt b/app/src/main/java/org/sopt/pingle/data/service/JoinGroupService.kt
@@ -18,7 +18,7 @@ interface JoinGroupService {
     @POST("$VERSION/$TEAMS/{$TEAM_ID}/$REGISTER")
     suspend fun postJoinGroupCode(
         @Path("$TEAM_ID") teamId: Int,
-        @Body code: RequestJoinGroupCodeDto
+        @Body requestJoinGroupCodeDto: RequestJoinGroupCodeDto
     ): BaseResponse<ResponseJoinGroupCodeDto>
 
     companion object {

diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/joingroup/JoinGroupCodeActivity.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/joingroup/JoinGroupCodeActivity.kt
@@ -23,6 +23,7 @@ class JoinGroupCodeActivity :
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        binding.joinViewModel = viewModel
 
         initLayout()
         addListeners()
@@ -31,13 +32,12 @@ class JoinGroupCodeActivity :
     }
 
     private fun initLayout() {
-        binding.joinViewModel = viewModel
-        viewModel.getJoinGroupInfo(TEAM_ID)
+        viewModel.joinGroupInfoState(TEAM_ID)
     }
 
     private fun addListeners() {
         binding.btnJoinGroupCodeNext.setOnClickListener {
-            viewModel.postJoinGroupCode(
+            viewModel.joinGroupCodeState(
                 TEAM_ID,
                 RequestJoinGroupCodeEntity(viewModel.joinGroupCodeEditText.value.toString())
             )
@@ -55,7 +55,7 @@ class JoinGroupCodeActivity :
     }
 
     private fun collectData() {
-        viewModel.joinGroupCodeState.flowWithLifecycle(lifecycle).onEach { uiState ->
+        viewModel.joinGroupInfoState.flowWithLifecycle(lifecycle).onEach { uiState ->
             when (uiState) {
                 is UiState.Success -> {
                     with(binding) {
@@ -82,15 +82,15 @@ class JoinGroupCodeActivity :
             }
         }.launchIn(lifecycleScope)
 
-        viewModel.joinGroupCode.flowWithLifecycle(lifecycle).onEach { uiState ->
+        viewModel.joinGroupCodeState.flowWithLifecycle(lifecycle).onEach { uiState ->
             when (uiState) {
                 is UiState.Success -> navigateToJoinGroupSuccess()
 
                 is UiState.Error -> {
                     PingleSnackbar.makeSnackbar(
                         binding.root,
                         getString(R.string.join_group_code_snackbar_message),
-                        97
+                        SNACKBAR_BOTTOM_MARGIN
                     )
                 }
 
@@ -114,5 +114,6 @@ class JoinGroupCodeActivity :
         const val LOADING = "Loding"
         const val EMPTY = "Empty"
         const val JOIN_GROUP_CODE_ACTIVITY = "JoinGroupCodeActivity"
+        const val SNACKBAR_BOTTOM_MARGIN = 97
     }
 }
diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/joingroup/JoinViewModel.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/joingroup/JoinViewModel.kt
@@ -29,16 +29,16 @@ class JoinViewModel @Inject constructor(
     private val _joinGroupSearchData = MutableStateFlow<List<JoinGroupSearchEntity>>(emptyList())
     val joinGroupSearchData get() = _joinGroupSearchData
 
-    private val _joinGroupCodeState =
+    private val _joinGroupInfoState =
         MutableStateFlow<UiState<JoinGroupInfoEntity>>(UiState.Empty)
-    val joinGroupCodeState get() = _joinGroupCodeState.asStateFlow()
+    val joinGroupInfoState get() = _joinGroupInfoState.asStateFlow()
 
     private var _isJoinGroupCodeBtn = MutableLiveData(false)
     val isJoinGroupCodeBtn get() = _isJoinGroupCodeBtn
 
-    private var _joinGroupCode =
+    private var _joinGroupCodeState =
         MutableStateFlow<UiState<ResponseJoinGroupCodeEntity>>(UiState.Empty)
-    val joinGroupCode get() = _joinGroupCode
+    val joinGroupCodeState get() = _joinGroupCodeState
 
     val joinGroupCodeEditText = MutableLiveData<String>()
 
@@ -72,34 +72,34 @@ class JoinViewModel @Inject constructor(
 
     private fun getIsSelected(position: Int) = _joinGroupSearchData.value[position].isSelected.get()
 
-    fun getJoinGroupInfo(teamId: Int) {
-        _joinGroupCodeState.value = UiState.Loading
+    fun joinGroupInfoState(teamId: Int) {
+        _joinGroupInfoState.value = UiState.Loading
         viewModelScope.launch {
-            _joinGroupCodeState.value = UiState.Loading
+            _joinGroupInfoState.value = UiState.Loading
             runCatching {
                 getJoinGroupInfoUseCase.invoke(teamId = teamId).collect { joinGroupInfo ->
-                    _joinGroupCodeState.value = UiState.Success(joinGroupInfo)
+                    _joinGroupInfoState.value = UiState.Success(joinGroupInfo)
                 }
             }.onFailure {
-                _joinGroupCodeState.value = UiState.Error(it.message)
+                _joinGroupInfoState.value = UiState.Error(it.message)
             }
         }
     }
 
-    fun postJoinGroupCode(teamId: Int, code: RequestJoinGroupCodeEntity) {
-        _joinGroupCode.value = UiState.Loading
+    fun joinGroupCodeState(teamId: Int, code: RequestJoinGroupCodeEntity) {
+        _joinGroupCodeState.value = UiState.Loading
         viewModelScope.launch {
             runCatching {
-                postJoinGroupCodeUseCase.invoke(teamId = teamId, code = code)
+                postJoinGroupCodeUseCase(teamId = teamId, code = code)
                     .collect { joinGroupCode ->
-                        _joinGroupCode.value = UiState.Success(joinGroupCode)
+                        _joinGroupCodeState.value = UiState.Success(joinGroupCode)
                         with(localStorage) {
                             groupId = joinGroupCode.id
                             groupName = joinGroupCode.name
                         }
                     }
             }.onFailure {
-                _joinGroupCode.value = UiState.Error(it.message)
+                _joinGroupCodeState.value = UiState.Error(it.message)
             }
         }
     }