default theme 개념 제거 (#232)

wafflestudio · Mar 2, 2024 · 8ca58a4 · 8ca58a4
1 parent a97cdfb
commit 8ca58a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/core/src/main/kotlin/timetables/repository/TimetableThemeRepository.kt b/core/src/main/kotlin/timetables/repository/TimetableThemeRepository.kt
@@ -8,7 +8,7 @@ interface TimetableThemeRepository : CoroutineCrudRepository<TimetableTheme, Str
 
     suspend fun findByUserIdAndIsDefaultTrue(userId: String): TimetableTheme?
 
-    suspend fun findByUserIdAndIsCustomTrueOrderByCreatedAtDesc(userId: String): List<TimetableTheme>
+    suspend fun findByUserIdAndIsCustomTrueOrderByUpdatedAtDesc(userId: String): List<TimetableTheme>
 
     suspend fun existsByUserIdAndName(userId: String, name: String): Boolean
 }
diff --git a/core/src/main/kotlin/timetables/service/TimetableThemeService.kt b/core/src/main/kotlin/timetables/service/TimetableThemeService.kt
@@ -1,7 +1,6 @@
 package com.wafflestudio.snu4t.timetables.service
 
 import com.wafflestudio.snu4t.common.enum.BasicThemeType
-import com.wafflestudio.snu4t.common.exception.DefaultThemeDeleteErrorException
 import com.wafflestudio.snu4t.common.exception.DuplicateThemeNameException
 import com.wafflestudio.snu4t.common.exception.InvalidThemeColorCountException
 import com.wafflestudio.snu4t.common.exception.InvalidThemeTypeException
@@ -49,7 +48,7 @@ class TimetableThemeServiceImpl(
     }
 
     override suspend fun getThemes(userId: String): List<TimetableTheme> {
-        val customThemes = timetableThemeRepository.findByUserIdAndIsCustomTrueOrderByCreatedAtDesc(userId)
+        val customThemes = timetableThemeRepository.findByUserIdAndIsCustomTrueOrderByUpdatedAtDesc(userId)
         val defaultTheme = getDefaultTheme(userId)
 
         val basicThemes = BasicThemeType.values().map {
@@ -111,7 +110,6 @@ class TimetableThemeServiceImpl(
 
     override suspend fun deleteTheme(userId: String, themeId: String) {
         val theme = getCustomTheme(userId, themeId)
-        if (theme.isDefault) throw DefaultThemeDeleteErrorException
 
         val timetables = timetableRepository.findByUserIdAndThemeId(userId, themeId)
 
@@ -192,7 +190,8 @@ class TimetableThemeServiceImpl(
     }
 
     override suspend fun getDefaultTheme(userId: String): TimetableTheme? {
-        return timetableThemeRepository.findByUserIdAndIsDefaultTrue(userId)
+        val customThemes = timetableThemeRepository.findByUserIdAndIsCustomTrueOrderByUpdatedAtDesc(userId)
+        return customThemes.firstOrNull() ?: buildTimetableTheme(userId, BasicThemeType.SNUTT, isDefault = true)
     }
 
     override suspend fun getTheme(userId: String, themeId: String?, basicThemeType: BasicThemeType?): TimetableTheme {