refactor: 카테고리, 일시 선택 순서 변경 및 리팩터링 (스타카토 생성/수정) #564

android/Staccato_AN/app/build.gradle.kts

@@ -98,6 +98,7 @@ dependencies {
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
     testImplementation(libs.junit)
+    testImplementation(libs.androidx.arch.core)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
 
@@ -139,9 +140,15 @@ dependencies {
     // Fragment
     implementation(libs.androidx.fragment.ktx)
 
+    // Coroutines Test
+    testImplementation(libs.kotlinx.coroutines.test)
+
     // Mockk
-    testImplementation(libs.mockk.android)
+    testImplementation(libs.junitparams)
+    testImplementation(libs.mockk)
     testImplementation(libs.mockk.agent)
+    androidTestImplementation(libs.mockk.agent)
+    androidTestImplementation(libs.mockk.android)
 
     // Navigation
     implementation(libs.androidx.navigation.fragment.ktx)

android/Staccato_AN/app/src/main/java/com/on/staccato/domain/model/MemoryCandidate.kt

@@ -1,16 +1,37 @@
 package com.on.staccato.domain.model
 
 import java.time.LocalDate
+import java.time.LocalDateTime
 import java.time.YearMonth
 
-data class MemoryCandidates(val memoryCandidate: List<MemoryCandidate>)
-
 data class MemoryCandidate(
     val memoryId: Long,
     val memoryTitle: String,
     val startAt: LocalDate?,
     val endAt: LocalDate?,
 ) {
+    fun getClosestDateTime(date: LocalDateTime): LocalDateTime {
+        if (startAt == null || endAt == null) return date
+
+        val startDateTime = startAt.atStartOfDay()
+        val endDateTime = endAt.atTime(23, 59)
+
+        return when {
+            date.isBefore(startDateTime) ->
+                startDateTime.toLocalDate()
+                    .atTime(12, 0)
+            date.isAfter(endDateTime) ->
+                endDateTime.toLocalDate()
+                    .atTime(12, 0)
+            else -> date
+        }
+    }
+
+    fun isDateWithinPeriod(date: LocalDate): Boolean {
+        if (startAt == null || endAt == null) return true
+        return date in startAt..endAt
+    }
+
     companion object {
         fun buildNumberPickerDates(
             startAt: LocalDate?,

android/Staccato_AN/app/src/main/java/com/on/staccato/domain/model/MemoryCandidates.kt

@@ -0,0 +1,9 @@
+package com.on.staccato.domain.model
+
+import java.time.LocalDate
+
+data class MemoryCandidates(val memoryCandidate: List<MemoryCandidate>) {
+    fun filterCandidatesBy(date: LocalDate): List<MemoryCandidate> = memoryCandidate.filter { it.isDateWithinPeriod(date) }
+
+    fun filterCandidatesBy(memoryId: Long): List<MemoryCandidate> = memoryCandidate.filter { it.memoryId == memoryId }
+}

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/bindingadapter/TextBindingAdapter.kt

@@ -17,39 +17,31 @@ fun TextView.setSelectedMemory(
     memoryCandidates: MemoryCandidates?,
 ) {
     if (memoryCandidates?.memoryCandidate?.isEmpty() == true) {
-        text = resources.getString(R.string.staccato_creation_no_memory_hint)
+        text = resources.getString(R.string.staccato_creation_no_memory)
         setTextColor(resources.getColor(R.color.gray3, null))
         isClickable = false
         isFocusable = false
     } else if (selectedMemory == null) {
-        text = resources.getString(R.string.staccato_creation_memory_selection_hint)
-        setTextColor(resources.getColor(R.color.gray3, null))
-        isClickable = true
-        isFocusable = true
-    } else {
-        text = selectedMemory.memoryTitle
-        setTextColor(resources.getColor(R.color.staccato_black, null))
-    }
-}
-
-@BindingAdapter(value = ["dateTimeWithAmPm", "memoryCandidates"])
-fun TextView.setDateTimeWithAmPm(
-    dateTime: LocalDateTime?,
-    memoryCandidates: MemoryCandidates?,
-) {
-    if (memoryCandidates?.memoryCandidate?.isEmpty() == true) {
-        text = resources.getString(R.string.staccato_creation_memory_selection_hint)
+        text = resources.getString(R.string.staccato_creation_no_memory_in_this_date)
         setTextColor(resources.getColor(R.color.gray3, null))
         isClickable = false
         isFocusable = false
     } else {
-        text = dateTime?.let(::getFormattedLocalDateTime) ?: EMPTY_TEXT
-        setTextColor(resources.getColor(R.color.staccato_black, null))
+        text = selectedMemory.memoryTitle
         isClickable = true
         isFocusable = true
+        setTextColor(resources.getColor(R.color.staccato_black, null))
     }
 }
 
+@BindingAdapter("dateTimeWithAmPm")
+fun TextView.setDateTimeWithAmPm(dateTime: LocalDateTime?) {
+    text = dateTime?.let(::getFormattedLocalDateTime) ?: EMPTY_TEXT
+    setTextColor(resources.getColor(R.color.staccato_black, null))
+    isClickable = true
+    isFocusable = true
+}
+
 @BindingAdapter(
     value = ["startDate", "endDate"],
 )
@@ -73,11 +65,6 @@ fun TextView.setIsMemoryCandidatesEmptyVisibility(memoryCandidates: MemoryCandid
     isGone = !memoryCandidates?.memoryCandidate.isNullOrEmpty()
 }
 
-@BindingAdapter("isMemoryEmpty")
-fun TextView.setIsMemoryEmptyVisibility(items: List<Int>?) {
-    isGone = !items.isNullOrEmpty()
-}
-
 @BindingAdapter("visitedAtHistory")
 fun TextView.formatVisitedAtHistory(visitedAt: LocalDateTime?) {
     text = visitedAt?.let {

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/staccatocreation/StaccatoCreationActivity.kt

@@ -45,7 +45,6 @@ import com.on.staccato.presentation.util.showToast
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import java.time.LocalDate
 import java.time.LocalDateTime
 
 @AndroidEntryPoint
@@ -87,7 +86,7 @@ class StaccatoCreationActivity :
     private var currentSnackBar: Snackbar? = null
 
     override fun initStartView(savedInstanceState: Bundle?) {
-        viewModel.fetchMemoryCandidates(memoryId)
+        viewModel.fetchMemoryCandidates()
         setupPermissionRequestLauncher()
         setupFusedLocationProviderClient()
         initBinding()
@@ -269,10 +268,6 @@ class StaccatoCreationActivity :
 
     private fun initMemorySelectionFragment() {
         memorySelectionFragment.setOnMemorySelected { selectedMemory ->
-            val startAt = selectedMemory.startAt ?: LocalDate.now()
-            val initializedDateTime =
-                LocalDateTime.of(startAt.year, startAt.month, startAt.dayOfMonth, 0, 0, 0)
-            viewModel.selectedVisitedAt(initializedDateTime)
             viewModel.selectMemory(selectedMemory)
         }
     }
@@ -302,18 +297,32 @@ class StaccatoCreationActivity :
             )
         }
         viewModel.memoryCandidates.observe(this) {
-            memorySelectionFragment.setItems(it.memoryCandidate)
+            it?.let {
+                viewModel.initMemoryAndVisitedAt(memoryId, LocalDateTime.now())
+            }
+        }
+        viewModel.selectableMemories.observe(this) {
+            it?.let {
+                memorySelectionFragment.setItems(it)
+            }
         }
-        viewModel.selectedMemory.observe(this) { selectedMemory ->
-            val startAt = selectedMemory.startAt ?: LocalDate.now()
-            val initializedDateTime =
-                LocalDateTime.of(startAt.year, startAt.month, startAt.dayOfMonth, 0, 0, 0)
-            memorySelectionFragment.updateKeyMemory(selectedMemory)
-            visitedAtSelectionFragment.initDateCandidates(selectedMemory, initializedDateTime)
+        viewModel.selectedMemory.observe(this) { it ->
+            it?.let {
+                memorySelectionFragment.updateKeyMemory(it)
+                if (memoryId != 0L) {
+                    visitedAtSelectionFragment.setVisitedAtPeriod(
+                        it.startAt,
+                        it.endAt,
+                    )
+                }
+            }
         }
-        viewModel.selectedVisitedAt.observe(this) { selectedVisitedAt ->
-            if (selectedVisitedAt != null) {
-                visitedAtSelectionFragment.initKeyWithSelectedValues(selectedVisitedAt)
+        viewModel.selectedVisitedAt.observe(this) {
+            it?.let {
+                visitedAtSelectionFragment.updateSelectedVisitedAt(it)
+                if (memoryId == 0L) {
+                    updateMemoryCandidateAndVisitedAt(it)
+                }
             }
         }
         viewModel.createdStaccatoId.observe(this) { createdStaccatoId ->
@@ -328,6 +337,14 @@ class StaccatoCreationActivity :
         }
     }
 
+    private fun updateMemoryCandidateAndVisitedAt(visitedAt: LocalDateTime) {
+        viewModel.setMemoryCandidateByVisitedAt(visitedAt)
+        visitedAtSelectionFragment.setVisitedAtPeriod(
+            visitedAt.toLocalDate().minusYears(10),
+            visitedAt.toLocalDate().plusYears(10),
+        )
+    }
+
     private fun fetchAddress(location: Location) {
         lifecycleScope.launch {
             val defaultDelayJob =