refactor : EventDetail 코드 리팩토링

android/2023-emmsale/app/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
             android:name=".presentation.ui.onboarding.OnboardingActivity"
             android:exported="true" />
         <activity
-            android:name=".presentation.eventdetail.EventDetailActivity"
+            android:name=".presentation.ui.eventdetail.EventDetailActivity"
             android:exported="false" />
         <activity
             android:name=".presentation.ui.login.LoginActivity"

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventdetail/EventDetail.kt

@@ -1,12 +1,14 @@
 package com.emmsale.data.eventdetail
 
+import java.time.LocalDateTime
+
 data class EventDetail(
     val id: Long,
     val name: String,
     val status: String,
     val location: String,
-    val startDate: String,
-    val endDate: String,
+    val startDate: LocalDateTime,
+    val endDate: LocalDateTime,
     val informationUrl: String,
     val tags: List<String>,
     val imageUrl: String?,

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventdetail/EventDetailRepository.kt

@@ -3,5 +3,5 @@ package com.emmsale.data.eventdetail
 import com.emmsale.data.common.ApiResult
 
 interface EventDetailRepository {
-    suspend fun fetchEventDetail(eventId: Long): ApiResult<EventDetail>
+    suspend fun getEventDetail(eventId: Long): ApiResult<EventDetail>
 }

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventdetail/EventDetailRepositoryImpl.kt

@@ -8,9 +8,9 @@ class EventDetailRepositoryImpl(
     private val eventDetailService: EventDetailService,
 ) : EventDetailRepository {
 
-    override suspend fun fetchEventDetail(eventId: Long): ApiResult<EventDetail> {
+    override suspend fun getEventDetail(eventId: Long): ApiResult<EventDetail> {
         return handleApi(
-            execute = { eventDetailService.fetchEventDetail(eventId) },
+            execute = { eventDetailService.getEventDetail(eventId) },
             mapToDomain = EventDetailApiModel::toData,
         )
     }

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventdetail/EventDetailService.kt

@@ -7,7 +7,7 @@ import retrofit2.http.Path
 
 interface EventDetailService {
     @GET("events/{eventId}")
-    suspend fun fetchEventDetail(
+    suspend fun getEventDetail(
         @Path("eventId") eventId: Long,
     ): Response<EventDetailApiModel>
 }

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventdetail/dto/EventDetailApiModel.kt

@@ -3,6 +3,8 @@ package com.emmsale.data.eventdetail.dto
 import com.emmsale.data.eventdetail.EventDetail
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 
 @Serializable
 data class EventDetailApiModel(
@@ -34,12 +36,17 @@ data class EventDetailApiModel(
         name = name,
         status = status,
         location = location,
-        startDate = startDate,
-        endDate = endDate,
+        startDate = startDate.toLocalDateTime(),
+        endDate = endDate.toLocalDateTime(),
         informationUrl = informationUrl,
         tags = tags,
         imageUrl = imageUrl,
         remainingDays = remainingDays,
         type = type,
     )
+
+    private fun String.toLocalDateTime(): LocalDateTime {
+        val format = DateTimeFormatter.ofPattern("yyyy:MM:dd:HH:mm:ss")
+        return LocalDateTime.parse(this, format)
+    }
 }

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/eventdetail/EventDetailActivity.kt

@@ -1,16 +1,13 @@
-package com.emmsale.presentation.eventdetail
+package com.emmsale.presentation.ui.eventdetail
 
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import com.emmsale.R
 import com.emmsale.databinding.ActivityEventDetailBinding
 import com.emmsale.presentation.common.extension.showToast
-import com.emmsale.presentation.ui.eventdetail.EventDetailFragmentStateAdpater
-import com.emmsale.presentation.ui.eventdetail.EventDetailViewModel
-import com.emmsale.presentation.ui.eventdetail.EventTag
-import com.emmsale.presentation.ui.eventdetail.uistate.EventDetailUiState
 import com.google.android.material.tabs.TabLayoutMediator
 
 class EventDetailActivity : AppCompatActivity() {
@@ -24,28 +21,27 @@ class EventDetailActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setUpBinding()
         setUpEventDetail()
-        setBackPress()
+        onBackPressButtonClick()
         viewModel.fetchEventDetail(eventId)
     }
 
     private fun setUpBinding() {
         binding = ActivityEventDetailBinding.inflate(layoutInflater)
+        binding.lifecycleOwner = this
+        binding.vm = viewModel
         setContentView(binding.root)
     }
 
     private fun setUpEventDetail() {
         viewModel.eventDetail.observe(this) { eventDetailUiState ->
-            when (eventDetailUiState) {
-                is EventDetailUiState.Success -> {
-                    binding.eventDetail = eventDetailUiState
-                    addTag(eventDetailUiState.tags)
-                    initFragmentStateAdapter(
-                        eventDetailUiState.informationUrl,
-                        eventDetailUiState.imageUrl,
-                    )
-                }
-
-                else -> showToast("행사 받아오기 실패")
+            if (eventDetailUiState.isError) {
+                showToast(getString(R.string.eventdetail_fetch_eventdetail_error_message))
+            } else {
+                addTag(eventDetailUiState.tags)
+                initFragmentStateAdapter(
+                    eventDetailUiState.informationUrl,
+                    eventDetailUiState.imageUrl,
+                )
             }
         }
     }
@@ -55,9 +51,14 @@ class EventDetailActivity : AppCompatActivity() {
             EventDetailFragmentStateAdpater(this, eventId, informationUrl, imageUrl)
         TabLayoutMediator(binding.tablayoutEventdetail, binding.vpEventdetail) { tab, position ->
             when (position) {
-                INFORMATION_TAB_POSITION -> tab.text = "상세 정보"
-                COMMENT_TAB_POSITION -> tab.text = "댓글"
-                RECRUITMENT_TAB_POSITION -> tab.text = "같이가요"
+                INFORMATION_TAB_POSITION ->
+                    tab.text =
+                    getString(R.string.eventdetail_tab_infromation)
+
+                COMMENT_TAB_POSITION -> tab.text = getString(R.string.eventdetail_tab_comment)
+                RECRUITMENT_TAB_POSITION ->
+                    tab.text =
+                        getString(R.string.eventdetail_tab_recruitment)
             }
         }.attach()
         binding.vpEventdetail.isUserInputEnabled = false
@@ -71,7 +72,7 @@ class EventDetailActivity : AppCompatActivity() {
         text = tag
     }
 
-    private fun setBackPress() {
+    private fun onBackPressButtonClick() {
         binding.ivEventdetailBackpress.setOnClickListener {
             finish()
         }

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/eventdetail/EventDetailViewModel.kt

@@ -1,47 +1,58 @@
 package com.emmsale.presentation.ui.eventdetail
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.emmsale.data.common.ApiError
 import com.emmsale.data.common.ApiException
 import com.emmsale.data.common.ApiSuccess
+import com.emmsale.data.eventdetail.EventDetail
 import com.emmsale.data.eventdetail.EventDetailRepository
-import com.emmsale.data.member.MemberRepository
 import com.emmsale.presentation.KerdyApplication
 import com.emmsale.presentation.common.ViewModelFactory
+import com.emmsale.presentation.common.livedata.NotNullLiveData
+import com.emmsale.presentation.common.livedata.NotNullMutableLiveData
 import com.emmsale.presentation.ui.eventdetail.uistate.EventDetailUiState
 import kotlinx.coroutines.launch
 
 class EventDetailViewModel(
     private val eventDetailRepository: EventDetailRepository,
-    private val memberRepository: MemberRepository,
 ) : ViewModel() {
 
-    private val _eventDetail: MutableLiveData<EventDetailUiState> =
-        MutableLiveData<EventDetailUiState>()
-    val eventDetail: LiveData<EventDetailUiState>
+    private val _eventDetail: NotNullMutableLiveData<EventDetailUiState> =
+        NotNullMutableLiveData(EventDetailUiState())
+    val eventDetail: NotNullLiveData<EventDetailUiState>
         get() = _eventDetail
 
     fun fetchEventDetail(id: Long) {
+        setLoadingState(true)
         viewModelScope.launch {
-            when (val result = eventDetailRepository.fetchEventDetail(id)) {
-                is ApiSuccess -> _eventDetail.postValue(
-                    EventDetailUiState.from(result.data),
-                )
-
-                is ApiError -> _eventDetail.postValue(EventDetailUiState.Error)
-                is ApiException -> _eventDetail.postValue(EventDetailUiState.Error)
+            when (val result = eventDetailRepository.getEventDetail(id)) {
+                is ApiSuccess -> fetchSuccessEventDetail(result.data)
+                is ApiError -> changeToErrorState()
+                is ApiException -> changeToErrorState()
             }
         }
     }
 
+    private fun setLoadingState(state: Boolean) {
+        _eventDetail.value = _eventDetail.value.copy(isLoading = state)
+    }
+
+    private fun fetchSuccessEventDetail(eventDetail: EventDetail) {
+        _eventDetail.value = EventDetailUiState.from(eventDetail)
+    }
+
+    private fun changeToErrorState() {
+        _eventDetail.value = _eventDetail.value.copy(
+            isError = true,
+            isLoading = false,
+        )
+    }
+
     companion object {
         val factory = ViewModelFactory {
             EventDetailViewModel(
                 eventDetailRepository = KerdyApplication.repositoryContainer.eventDetailRepository,
-                memberRepository = KerdyApplication.repositoryContainer.memberRepository,
             )
         }
     }

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/eventdetail/uistate/EventDetailUiState.kt

@@ -1,30 +1,28 @@
 package com.emmsale.presentation.ui.eventdetail.uistate
 
 import com.emmsale.data.eventdetail.EventDetail
-import java.time.LocalDate
 import java.time.LocalDateTime
-import java.time.LocalTime
 import java.time.format.DateTimeFormatter
 
-sealed class EventDetailUiState {
-    data class Success(
-        val id: Long,
-        val name: String,
-        val status: String,
-        val location: String,
-        val startDate: String,
-        val endDate: String,
-        val informationUrl: String,
-        val tags: List<String>,
-        val imageUrl: String?,
-    ) : EventDetailUiState()
-
-    object Error : EventDetailUiState()
+data class EventDetailUiState(
+    val id: Long = DEFAULT_ID,
+    val name: String = "",
+    val status: String = "",
+    val location: String = "",
+    val startDate: String = "",
+    val endDate: String = "",
+    val informationUrl: String = "",
+    val tags: List<String> = listOf(),
+    val imageUrl: String? = "",
+    val isError: Boolean = false,
+    val isLoading: Boolean = false,
+) {
 
     companion object {
-        fun from(eventDetail: EventDetail): Success {
+        private const val DEFAULT_ID = -1L
+        fun from(eventDetail: EventDetail): EventDetailUiState {
             return with(eventDetail) {
-                Success(
+                EventDetailUiState(
                     id = id,
                     name = name,
                     status = status,
@@ -34,20 +32,15 @@ sealed class EventDetailUiState {
                     informationUrl = informationUrl,
                     tags = tags,
                     imageUrl = imageUrl,
+                    isError = false,
+                    isLoading = false,
                 )
             }
         }
 
-        private fun getGeneralDateFormat(dateString: String): String {
-            val formatter = DateTimeFormatter.ofPattern("yyyy:MM:dd:HH:mm:ss")
-            val dateTime = LocalDateTime.parse(dateString, formatter)
-
-            val targetDate = LocalDate.of(dateTime.year, dateTime.month, dateTime.dayOfMonth)
-            val targetTime = LocalTime.of(dateTime.hour, dateTime.minute)
-            val targetDateTime = LocalDateTime.of(targetDate, targetTime)
-
+        private fun getGeneralDateFormat(dateTime: LocalDateTime): String {
             val resultFormatter = DateTimeFormatter.ofPattern("yyyy.M.d HH:mm")
-            return targetDateTime.format(resultFormatter)
+            return dateTime.format(resultFormatter)
         }
     }
 }

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conference/ConferenceFragment.kt

@@ -12,7 +12,7 @@ import com.emmsale.presentation.common.extension.getParcelableExtraCompat
 import com.emmsale.presentation.common.extension.showToast
 import com.emmsale.presentation.common.views.FilterTag
 import com.emmsale.presentation.common.views.filterChipOf
-import com.emmsale.presentation.eventdetail.EventDetailActivity
+import com.emmsale.presentation.ui.eventdetail.EventDetailActivity
 import com.emmsale.presentation.ui.main.event.conference.recyclerview.ConferenceRecyclerViewAdapter
 import com.emmsale.presentation.ui.main.event.conference.recyclerview.ConferenceRecyclerViewDivider
 import com.emmsale.presentation.ui.main.event.conference.uistate.ConferencesUiState

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/NotificationBoxViewModel.kt

@@ -89,7 +89,7 @@ class NotificationBoxViewModel(
 
     private suspend fun getConferenceNameAsync(conferenceId: Long): Deferred<String?> =
         viewModelScope.async {
-            when (val conference = eventDetailRepository.fetchEventDetail(conferenceId)) {
+            when (val conference = eventDetailRepository.getEventDetail(conferenceId)) {
                 is ApiSuccess -> conference.data.name
                 is ApiException,
                 is ApiError,