Merge pull request #284 from wisemuji/feature/#271

[세션] 2024 세션 데이터 반영
droidknights · May 9, 2024 · 0fe4de2 · 0fe4de2
2 parents fd733e7 + 92773fe
commit 0fe4de2
Show file tree

Hide file tree

Showing 52 changed files with 179 additions and 315 deletions.
diff --git a/core/data/src/main/assets/sessions.json b/core/data/src/main/assets/sessions.json
diff --git a/core/data/src/main/java/com/droidknights/app/core/data/api/model/LevelResponse.kt b/core/data/src/main/java/com/droidknights/app/core/data/api/model/LevelResponse.kt
diff --git a/core/data/src/main/java/com/droidknights/app/core/data/api/model/SessionResponse.kt b/core/data/src/main/java/com/droidknights/app/core/data/api/model/SessionResponse.kt
@@ -9,7 +9,6 @@ internal data class SessionResponse(
     val title: String,
     val content: String,
     val speakers: List<SpeakerResponse>,
-    val level: LevelResponse,
     val tags: List<String>,
     val room: RoomResponse?,
     val startTime: LocalDateTime,

diff --git a/core/data/src/main/java/com/droidknights/app/core/data/mapper/SessionMapper.kt b/core/data/src/main/java/com/droidknights/app/core/data/mapper/SessionMapper.kt
@@ -1,10 +1,8 @@
 package com.droidknights.app.core.data.mapper
 
-import com.droidknights.app.core.data.api.model.LevelResponse
 import com.droidknights.app.core.data.api.model.RoomResponse
 import com.droidknights.app.core.data.api.model.SessionResponse
 import com.droidknights.app.core.data.api.model.SpeakerResponse
-import com.droidknights.app.core.model.Level
 import com.droidknights.app.core.model.Room
 import com.droidknights.app.core.model.Session
 import com.droidknights.app.core.model.Speaker
@@ -15,21 +13,13 @@ internal fun SessionResponse.toData(): Session = Session(
     title = this.title,
     content = this.content,
     speakers = this.speakers.map { it.toData() },
-    level = this.level.toData(),
     tags = this.tags.map { Tag(it) },
     room = this.room?.toData() ?: Room.ETC,
     startTime = this.startTime,
     endTime = this.endTime,
     isBookmarked = false
 )
 
-internal fun LevelResponse.toData(): Level = when (this) {
-    LevelResponse.ETC -> Level.ETC
-    LevelResponse.BASIC -> Level.BASIC
-    LevelResponse.INTERMEDIATE -> Level.INTERMEDIATE
-    LevelResponse.ADVANCED -> Level.ADVANCED
-}
-
 internal fun RoomResponse.toData(): Room = when (this) {
     RoomResponse.ETC -> Room.ETC
     RoomResponse.TRACK1 -> Room.TRACK1

diff --git a/...a/src/test/java/com/droidknights/app/core/data/repository/DefaultSessionRepositoryTest.kt b/...a/src/test/java/com/droidknights/app/core/data/repository/DefaultSessionRepositoryTest.kt
@@ -3,7 +3,6 @@ package com.droidknights.app.core.data.repository
 import app.cash.turbine.test
 import com.droidknights.app.core.data.api.fake.FakeGithubRawApi
 import com.droidknights.app.core.data.datastore.fake.FakeSessionPreferencesDataSource
-import com.droidknights.app.core.model.Level
 import com.droidknights.app.core.model.Room
 import com.droidknights.app.core.model.Session
 import io.kotest.core.spec.style.StringSpec
@@ -20,14 +19,13 @@ internal class DefaultSessionRepositoryTest : StringSpec() {
         "역직렬화 테스트" {
             val expected = Session(
                 id = "1",
-                title = "Keynote",
+                title = "키노트",
                 content = "",
                 speakers = emptyList(),
-                level = Level.ETC,
                 tags = emptyList(),
                 room = Room.ETC,
-                startTime = LocalDateTime(2023, 9, 12, 10, 45),
-                endTime = LocalDateTime(2023, 9, 12, 11, 0),
+                startTime = LocalDateTime(2024, 6, 11, 10, 40),
+                endTime = LocalDateTime(2024, 6, 11, 11, 0),
                 isBookmarked = false
             )
             val actual = repository.getSessions()

diff --git a/...signsystem/src/main/java/com/droidknights/app/core/designsystem/component/NetworkImage.kt b/...signsystem/src/main/java/com/droidknights/app/core/designsystem/component/NetworkImage.kt
@@ -4,10 +4,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.ColorPainter
 import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.skydoves.landscapist.ImageOptions
 import com.skydoves.landscapist.coil.CoilImage
@@ -42,6 +41,6 @@ fun NetworkImage(
 private fun NetworkImagePreview() {
     NetworkImage(
         imageUrl = "",
-        placeholder = painterResource(id = Color(0xFFFFFFFF).toArgb()),
+        placeholder = ColorPainter(Color(0xFF000000)),
     )
 }
diff --git a/core/designsystem/src/main/java/com/droidknights/app/core/designsystem/theme/Theme.kt b/core/designsystem/src/main/java/com/droidknights/app/core/designsystem/theme/Theme.kt
@@ -2,7 +2,6 @@ package com.droidknights.app.core.designsystem.theme
 
 import android.app.Activity
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
@@ -73,10 +72,6 @@ private val LightColorScheme = lightColorScheme(
 
 val LocalDarkTheme = compositionLocalOf { true }
 
-val ColorScheme.surfaceDim
-    @Composable
-    get() = if (LocalDarkTheme.current) Black else PaleGray
-
 @Composable
 fun KnightsTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),

diff --git a/...rc/test/java/com/droidknights/app/core/domain/usecase/GetBookmarkedSessionsUseCaseTest.kt b/...rc/test/java/com/droidknights/app/core/domain/usecase/GetBookmarkedSessionsUseCaseTest.kt
@@ -1,6 +1,5 @@
 package com.droidknights.app.core.domain.usecase
 
-import com.droidknights.app.core.model.Level
 import com.droidknights.app.core.model.Room
 import com.droidknights.app.core.model.Session
 import com.droidknights.app.core.model.Speaker
@@ -55,7 +54,6 @@ internal class GetBookmarkedSessionsUseCaseTest : BehaviorSpec() {
                 title = "Item3 Title",
                 content = "Item3 Content",
                 speakers = listOf(Speaker(name = "철수", introduction = "", imageUrl = "")),
-                level = Level.BASIC,
                 tags = listOf(Tag(name = "Architecture")),
                 room = Room.TRACK1,
                 startTime = LocalDateTime(2023, 10, 5, 11, 0),
@@ -67,7 +65,6 @@ internal class GetBookmarkedSessionsUseCaseTest : BehaviorSpec() {
                 title = "Item1 Title",
                 content = "Item1 Content",
                 speakers = listOf(Speaker(name = "영희", introduction = "", imageUrl = "")),
-                level = Level.BASIC,
                 tags = listOf(Tag(name = "Architecture")),
                 room = Room.TRACK1,
                 startTime = LocalDateTime(2023, 10, 5, 9, 0),
@@ -79,7 +76,6 @@ internal class GetBookmarkedSessionsUseCaseTest : BehaviorSpec() {
                 title = "Item2 Title",
                 content = "Item2 Content",
                 speakers = listOf(Speaker(name = "민수", introduction = "", imageUrl = "")),
-                level = Level.BASIC,
                 tags = listOf(Tag(name = "Architecture")),
                 room = Room.TRACK1,
                 startTime = LocalDateTime(2023, 10, 5, 10, 0),

diff --git a/core/model/src/main/java/com/droidknights/app/core/model/Level.kt b/core/model/src/main/java/com/droidknights/app/core/model/Level.kt
diff --git a/core/model/src/main/java/com/droidknights/app/core/model/Session.kt b/core/model/src/main/java/com/droidknights/app/core/model/Session.kt
@@ -7,7 +7,6 @@ data class Session(
     val title: String,
     val content: String,
     val speakers: List<Speaker>,
-    val level: Level,
     val tags: List<Tag>,
     val room: Room,
     val startTime: LocalDateTime,

diff --git a/feature/session/src/main/java/com/droidknights/app/feature/session/SessionCard.kt b/feature/session/src/main/java/com/droidknights/app/feature/session/SessionCard.kt
@@ -28,7 +28,6 @@ import com.droidknights.app.core.designsystem.component.TextChip
 import com.droidknights.app.core.designsystem.theme.DarkGray
 import com.droidknights.app.core.designsystem.theme.KnightsTheme
 import com.droidknights.app.core.designsystem.theme.LightGray
-import com.droidknights.app.core.model.Level
 import com.droidknights.app.core.model.Room
 import com.droidknights.app.core.model.Session
 import com.droidknights.app.core.model.Speaker
@@ -204,7 +203,6 @@ private fun SessionCardPreview() {
                 imageUrl = "https://picsum.photos/200",
             ),
         ),
-        level = Level.BASIC,
         tags = listOf(
             Tag("효율적인 코드베이스")
         ),

diff --git a/feature/session/src/main/java/com/droidknights/app/feature/session/SessionDetailScreen.kt b/feature/session/src/main/java/com/droidknights/app/feature/session/SessionDetailScreen.kt
@@ -45,7 +45,6 @@ import com.droidknights.app.core.designsystem.component.TopAppBarNavigationType
 import com.droidknights.app.core.designsystem.theme.DarkGray
 import com.droidknights.app.core.designsystem.theme.KnightsTheme
 import com.droidknights.app.core.designsystem.theme.LightGray
-import com.droidknights.app.core.model.Level
 import com.droidknights.app.core.model.Room
 import com.droidknights.app.core.model.Session
 import com.droidknights.app.core.model.Speaker
@@ -284,7 +283,6 @@ private val SampleSessionHasContent = Session(
             imageUrl = "",
         ),
     ),
-    level = Level.ADVANCED,
     tags = listOf(Tag("Dev Environment")),
     room = Room.TRACK1,
     startTime = LocalDateTime.parse("2023-09-12T11:00:00.000"),
@@ -303,7 +301,6 @@ private val SampleSessionNoContent = Session(
             imageUrl = "",
         ),
     ),
-    level = Level.ADVANCED,
     tags = listOf(Tag("Dev Environment")),
     room = Room.TRACK1,
     startTime = LocalDateTime.parse("2023-09-12T11:00:00.000"),

diff --git a/.../session/src/test/java/com/droidknights/app/feature/session/SessionDetailViewModelTest.kt b/.../session/src/test/java/com/droidknights/app/feature/session/SessionDetailViewModelTest.kt
@@ -4,7 +4,6 @@ import app.cash.turbine.test
 import com.droidknights.app.core.domain.usecase.BookmarkSessionUseCase
 import com.droidknights.app.core.domain.usecase.GetBookmarkedSessionIdsUseCase
 import com.droidknights.app.core.domain.usecase.GetSessionUseCase
-import com.droidknights.app.core.model.Level
 import com.droidknights.app.core.model.Room
 import com.droidknights.app.core.model.Session
 import com.droidknights.app.core.testing.rule.MainDispatcherRule
@@ -35,7 +34,6 @@ class SessionDetailViewModelTest {
         title = "title",
         content = "content",
         speakers = emptyList(),
-        level = Level.BASIC,
         tags = emptyList(),
         room = Room.TRACK1,
         startTime = LocalDateTime(2023, 9, 12, 13, 0, 0),

diff --git a/feature/session/src/test/java/com/droidknights/app/feature/session/SessionViewModelTest.kt b/feature/session/src/test/java/com/droidknights/app/feature/session/SessionViewModelTest.kt
@@ -3,7 +3,6 @@ package com.droidknights.app.feature.session
 import app.cash.turbine.test
 import com.droidknights.app.core.domain.usecase.GetBookmarkedSessionIdsUseCase
 import com.droidknights.app.core.domain.usecase.GetSessionsUseCase
-import com.droidknights.app.core.model.Level
 import com.droidknights.app.core.model.Room
 import com.droidknights.app.core.model.Session
 import com.droidknights.app.core.testing.rule.MainDispatcherRule
@@ -30,7 +29,6 @@ internal class SessionViewModelTest {
         title = "title",
         content = "content",
         speakers = emptyList(),
-        level = Level.BASIC,
         tags = emptyList(),
         room = Room.TRACK1,
         startTime = LocalDateTime(2023, 9, 12, 13, 0, 0),

diff --git a/storage/speaker/Ayushi_Gupta.jpeg b/storage/speaker/Ayushi_Gupta.jpeg
diff --git a/storage/speaker/Enrique_Lopez_Manas.jpeg b/storage/speaker/Enrique_Lopez_Manas.jpeg
diff --git a/storage/speaker/Marton_Braun.png b/storage/speaker/Marton_Braun.png
diff --git a/storage/speaker/권대원.png b/storage/speaker/권대원.png
diff --git a/storage/speaker/권태환.jpg b/storage/speaker/권태환.jpg
diff --git a/storage/speaker/김민구.png b/storage/speaker/김민구.png
diff --git a/storage/speaker/김수현.png b/storage/speaker/김수현.png
diff --git a/storage/speaker/김용욱.jpg b/storage/speaker/김용욱.jpg
diff --git a/storage/speaker/김준비.jpg b/storage/speaker/김준비.jpg
diff --git a/storage/speaker/김태성.png b/storage/speaker/김태성.png
diff --git a/storage/speaker/노현석.jpg b/storage/speaker/노현석.jpg
diff --git a/storage/speaker/류기민.jpeg b/storage/speaker/류기민.jpeg
diff --git a/storage/speaker/모진섭.png b/storage/speaker/모진섭.png
diff --git a/storage/speaker/문예지.png b/storage/speaker/문예지.png
diff --git a/storage/speaker/문종락.png b/storage/speaker/문종락.png
diff --git a/storage/speaker/박동후.png b/storage/speaker/박동후.png
diff --git a/storage/speaker/박상권.png b/storage/speaker/박상권.png
diff --git a/storage/speaker/박재성.jpeg b/storage/speaker/박재성.jpeg
diff --git a/storage/speaker/박종혁.JPG b/storage/speaker/박종혁.JPG
diff --git a/storage/speaker/박주형.jpeg b/storage/speaker/박주형.jpeg
diff --git a/storage/speaker/배필주.png b/storage/speaker/배필주.png
diff --git a/storage/speaker/신현성.png b/storage/speaker/신현성.png
diff --git a/storage/speaker/안성용.jpg b/storage/speaker/안성용.jpg
diff --git a/storage/speaker/양찬석.png b/storage/speaker/양찬석.png
diff --git a/storage/speaker/엄재웅.png b/storage/speaker/엄재웅.png
diff --git a/storage/speaker/운혁.png b/storage/speaker/운혁.png
diff --git a/storage/speaker/윤영직.png b/storage/speaker/윤영직.png
diff --git a/storage/speaker/이상훈.jpeg b/storage/speaker/이상훈.jpeg
diff --git a/storage/speaker/이상훈.png b/storage/speaker/이상훈.png
diff --git a/storage/speaker/이현우.png b/storage/speaker/이현우.png
diff --git a/storage/speaker/정동진.jpeg b/storage/speaker/정동진.jpeg
diff --git a/storage/speaker/정동진.png b/storage/speaker/정동진.png
diff --git a/storage/speaker/정정환.jpg b/storage/speaker/정정환.jpg
diff --git a/storage/speaker/정태훈.jpeg b/storage/speaker/정태훈.jpeg
diff --git a/storage/speaker/차영호.png b/storage/speaker/차영호.png
diff --git a/storage/speaker/최우성.png b/storage/speaker/최우성.png
diff --git a/storage/speaker/최재웅.png b/storage/speaker/최재웅.png
diff --git a/storage/speaker/히카맹.png b/storage/speaker/히카맹.png