Merge pull request #224 from wafflestudio/develop

Release
wafflestudio · Feb 3, 2024 · 4e6a06d · 4e6a06d
2 parents 4b809a5 + 1649592
commit 4e6a06d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/core/src/main/kotlin/timetables/dto/TimetableThemeDto.kt b/core/src/main/kotlin/timetables/dto/TimetableThemeDto.kt
@@ -17,7 +17,7 @@ data class TimetableThemeDto(
 fun TimetableThemeDto(timetableTheme: TimetableTheme) =
     with(timetableTheme) {
         TimetableThemeDto(
-            id = id,
+            id = if (isCustom) id else null,
             theme = toBasicThemeType(),
             name = name,
             colors = colors,

diff --git a/core/src/main/kotlin/timetables/service/TimetableThemeService.kt b/core/src/main/kotlin/timetables/service/TimetableThemeService.kt
@@ -52,10 +52,18 @@ class TimetableThemeServiceImpl(
         val customThemes = timetableThemeRepository.findByUserIdAndIsCustomTrueOrderByCreatedAtDesc(userId)
         val defaultTheme = getDefaultTheme(userId)
 
-        return (
-            BasicThemeType.values().map { buildTimetableTheme(userId, it, isDefault = it.displayName == defaultTheme?.name) } +
-                customThemes
+        val basicThemes = BasicThemeType.values().map {
+            buildTimetableTheme(
+                userId,
+                it,
+                isDefault = (
+                    it.displayName == defaultTheme?.name ||
+                        (defaultTheme == null && it == BasicThemeType.SNUTT)
+                    )
             )
+        }
+
+        return basicThemes + customThemes
     }
 
     override suspend fun addTheme(userId: String, name: String, colors: List<ColorSet>): TimetableTheme {
@@ -194,7 +202,14 @@ class TimetableThemeServiceImpl(
 
         return themeId?.let {
             timetableThemeRepository.findByIdAndUserId(it, userId) ?: throw ThemeNotFoundException
-        } ?: buildTimetableTheme(userId, basicThemeType!!, isDefault = basicThemeType.displayName == defaultTheme?.name)
+        } ?: buildTimetableTheme(
+            userId,
+            basicThemeType!!,
+            isDefault = (
+                basicThemeType.displayName == defaultTheme?.name ||
+                    (defaultTheme == null && basicThemeType == BasicThemeType.SNUTT)
+                ),
+        )
     }
 
     private suspend fun getCustomTheme(userId: String, themeId: String): TimetableTheme {