Merge pull request #371 from simeunseok/feature/#348

슬라이스 수정, 삭제 오류 수정

Author: simeunseok

app/src/main/java/com/drunkenboys/calendarun/data/slice/local/SliceDao.kt

@@ -1,9 +1,6 @@
 package com.drunkenboys.calendarun.data.slice.local
 
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.Query
-import androidx.room.Update
+import androidx.room.*
 import com.drunkenboys.calendarun.data.slice.entity.Slice
 import kotlinx.coroutines.flow.Flow
 
@@ -19,7 +16,7 @@ interface SliceDao {
     @Query("SELECT * FROM `Slice` WHERE id == :id")
     suspend fun fetchSlice(id: Long): Slice
 
-    @Query("SELECT * FROM `Slice` WHERE calendarId == :calendarId")
+    @Query("SELECT * FROM `Slice` WHERE calendarId == :calendarId ORDER BY startDate ASC")
     fun fetchCalendarSliceList(calendarId: Long): Flow<List<Slice>>
 
     @Update
@@ -28,4 +25,10 @@ interface SliceDao {
     @Query("DELETE FROM `Slice` WHERE calendarId == :calendarId")
     suspend fun deleteSliceList(calendarId: Long)
 
+    @Delete
+    suspend fun deleteSlice(slice: Slice)
+
+    @Query("DELETE FROM `Slice` WHERE id == :id")
+    suspend fun deleteSliceById(id: Long)
+
 }

app/src/main/java/com/drunkenboys/calendarun/data/slice/local/SliceLocalDataSource.kt

@@ -16,4 +16,9 @@ interface SliceLocalDataSource {
     suspend fun updateSlice(slice: Slice)
 
     suspend fun deleteSliceList(calendarId: Long)
+
+    suspend fun deleteSlice(slice: Slice)
+
+    suspend fun deleteSliceById(id: Long)
+
 }

app/src/main/java/com/drunkenboys/calendarun/data/slice/local/SliceLocalDataSourceImpl.kt

@@ -32,4 +32,12 @@ class SliceLocalDataSourceImpl @Inject constructor(
     override suspend fun deleteSliceList(calendarId: Long) {
         sliceDao.deleteSliceList(calendarId)
     }
+
+    override suspend fun deleteSlice(slice: Slice) {
+        sliceDao.deleteSlice(slice)
+    }
+
+    override suspend fun deleteSliceById(id: Long) {
+        sliceDao.deleteSliceById(id)
+    }
 }

app/src/main/java/com/drunkenboys/calendarun/ui/maincalendar/MainCalendarViewModel.kt

@@ -67,7 +67,7 @@ class MainCalendarViewModel @Inject constructor(
                 scheduleList.map { schedule -> schedule.toCalendarScheduleObject() }
             }
     }.combine(holidayList) { scheduleList, holidayList ->
-        scheduleList + holidayList
+        holidayList + scheduleList
     }.stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
 
 

app/src/main/java/com/drunkenboys/calendarun/ui/savecalendar/SaveCalendarViewModel.kt

@@ -38,6 +38,8 @@ class SaveCalendarViewModel @Inject constructor(
     private val _blankTitleEvent = MutableSharedFlow<Unit>()
     val blankTitleEvent: SharedFlow<Unit> = _blankTitleEvent
 
+    private val deleteSliceIdList = mutableListOf<Long>()
+
     init {
         viewModelScope.launch {
             val calendar = calendarLocalDataSource.fetchCalendar(calendarId) ?: return@launch
@@ -84,8 +86,12 @@ class SaveCalendarViewModel @Inject constructor(
 
     fun deleteSliceItem(currentSliceItemList: List<SliceItem>) {
         viewModelScope.launch {
-            val newSliceItemList = currentSliceItemList.filter { sliceItem -> !sliceItem.check }
-            _sliceItemList.emit(newSliceItemList.toMutableList())
+            deleteSliceIdList.addAll(currentSliceItemList
+                .filter { sliceItem -> sliceItem.check }
+                .map { sliceItem -> sliceItem.id }
+            )
+
+            _sliceItemList.emit(currentSliceItemList.filter { sliceItem -> !sliceItem.check })
         }
     }
 
@@ -157,6 +163,8 @@ class SaveCalendarViewModel @Inject constructor(
             saveSlice(item, newCalendarId)
         }
 
+        deleteSlice()
+
         return true
     }
 
@@ -205,6 +213,14 @@ class SaveCalendarViewModel @Inject constructor(
         }
     }
 
+    private fun deleteSlice() {
+        viewModelScope.launch {
+            deleteSliceIdList.forEach { id ->
+                sliceLocalDataSource.deleteSliceById(id)
+            }
+        }
+    }
+
     private fun emitBlankSliceNameEvent(item: SliceItem) {
         viewModelScope.launch {
             item.isNameBlank.emit(Unit)