refactor: 코드리뷰 반영

app/src/main/java/com/teamwss/websoso/data/mapper/UserMapper.kt

@@ -8,14 +8,14 @@ import com.teamwss.websoso.data.model.NovelPreferenceEntity
 import com.teamwss.websoso.data.model.UserInfoEntity
 import com.teamwss.websoso.data.model.UserNovelStatsEntity
 import com.teamwss.websoso.data.model.UserProfileStatusEntity
-import com.teamwss.websoso.data.remote.response.AttractivePointKeywordDto
 import com.teamwss.websoso.data.remote.response.BlockedUsersResponseDto
-import com.teamwss.websoso.data.remote.response.GenrePreferenceDto
+import com.teamwss.websoso.data.remote.response.GenrePreferenceResponseDto
 import com.teamwss.websoso.data.remote.response.MyProfileResponseDto
 import com.teamwss.websoso.data.remote.response.NovelPreferenceResponseDto
 import com.teamwss.websoso.data.remote.response.UserInfoResponseDto
 import com.teamwss.websoso.data.remote.response.UserNovelStatsResponseDto
 import com.teamwss.websoso.data.remote.response.UserProfileStatusResponseDto
+import com.teamwss.websoso.ui.main.myPage.myActivity.model.Genres
 
 fun UserInfoResponseDto.toData(): UserInfoEntity {
     return UserInfoEntity(
@@ -60,22 +60,23 @@ fun MyProfileResponseDto.toData(): MyProfileEntity {
     )
 }
 
-fun GenrePreferenceDto.toData(): GenrePreferenceEntity {
+fun GenrePreferenceResponseDto.GenrePreferenceDto.toData(): GenrePreferenceEntity {
+    val koreanGenreName = Genres.from(this.genreName)?.korean ?: this.genreName
     return GenrePreferenceEntity(
-        genreName = this.genreName,
+        genreName = koreanGenreName,
         genreImage = this.genreImage,
-        genreCount = this.genreCount,
+        genreCount = this.genreCount
     )
 }
 
 fun NovelPreferenceResponseDto.toData(): NovelPreferenceEntity {
     return NovelPreferenceEntity(
         attractivePoints = this.attractivePoints,
-        keywords = this.keywords.map { it.toData() }
+        keywords = this.keywords.map { it.toData() },
     )
 }
 
-fun AttractivePointKeywordDto.toData(): NovelPreferenceEntity.KeywordEntity {
+fun NovelPreferenceResponseDto.AttractivePointKeywordDto.toData(): NovelPreferenceEntity.KeywordEntity {
     return NovelPreferenceEntity.KeywordEntity(
         keywordName = this.keywordName,
         keywordCount = this.keywordCount,

app/src/main/java/com/teamwss/websoso/data/remote/response/GenrePreferenceResponseDto.kt

@@ -1,29 +1,20 @@
 package com.teamwss.websoso.data.remote.response
 
-import com.teamwss.websoso.data.model.GenrePreferenceEntity
-import com.teamwss.websoso.ui.main.myPage.myActivity.model.Genres
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+
 @Serializable
 data class GenrePreferenceResponseDto(
     @SerialName("genrePreferences")
     val genrePreferences: List<GenrePreferenceDto>,
-)
-@Serializable
-data class GenrePreferenceDto(
-    @SerialName("genreName")
-    val genreName: String,
-    @SerialName("genreImage")
-    val genreImage: String,
-    @SerialName("genreCount")
-    val genreCount: Int,
-){
-    fun toData(): GenrePreferenceEntity {
-        val koreanGenreName = Genres.from(genreName)?.korean ?: genreName
-        return GenrePreferenceEntity(
-            genreName = koreanGenreName,
-            genreImage = genreImage,
-            genreCount = genreCount,
-        )
-    }
+) {
+    @Serializable
+    data class GenrePreferenceDto(
+        @SerialName("genreName")
+        val genreName: String,
+        @SerialName("genreImage")
+        val genreImage: String,
+        @SerialName("genreCount")
+        val genreCount: Int,
+    )
 }

app/src/main/java/com/teamwss/websoso/data/remote/response/NovelPreferenceResponseDto.kt

@@ -9,12 +9,12 @@ data class NovelPreferenceResponseDto(
     val attractivePoints: List<String>,
     @SerialName("keywords")
     val keywords: List<AttractivePointKeywordDto>,
-)
-
-@Serializable
-data class AttractivePointKeywordDto(
-    @SerialName("keywordName")
-    val keywordName: String,
-    @SerialName("keywordCount")
-    val keywordCount: Int,
-)
+) {
+    @Serializable
+    data class AttractivePointKeywordDto(
+        @SerialName("keywordName")
+        val keywordName: String,
+        @SerialName("keywordCount")
+        val keywordCount: Int,
+    )
+}

app/src/main/java/com/teamwss/websoso/ui/main/myPage/MyPageViewModel.kt

@@ -1,6 +1,5 @@
 package com.teamwss.websoso.ui.main.myPage
 
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -13,7 +12,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class MyPageViewModel @Inject constructor(
-    private val userRepository: UserRepository
+    private val userRepository: UserRepository,
 ) : ViewModel() {
 
     private val _myProfile = MutableLiveData<MyProfileEntity>()
@@ -30,7 +29,6 @@ class MyPageViewModel @Inject constructor(
             }.onSuccess { myProfile ->
                 _myProfile.value = myProfile
             }.onFailure { exception ->
-                Log.e("MyPageViewModel", "Failed to load user profile", exception)
             }
         }
     }

app/src/main/java/com/teamwss/websoso/ui/main/myPage/myLibrary/MyLibraryViewModel.kt

@@ -1,6 +1,5 @@
 package com.teamwss.websoso.ui.main.myPage.myLibrary
 
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -16,23 +15,23 @@ import javax.inject.Inject
 
 @HiltViewModel
 class MyLibraryViewModel @Inject constructor(
-    private val userRepository: UserRepository
+    private val userRepository: UserRepository,
 ) :
     ViewModel() {
     private val _genres = MutableLiveData<List<GenrePreferenceEntity>>()
-    val genres: LiveData<List<GenrePreferenceEntity>> = _genres
+    val genres: LiveData<List<GenrePreferenceEntity>> get()= _genres
 
     private val _dominantGenres = MutableLiveData<List<GenrePreferenceEntity>>()
-    val topGenres: LiveData<List<GenrePreferenceEntity>> = _dominantGenres
+    val topGenres: LiveData<List<GenrePreferenceEntity>> get()= _dominantGenres
 
     private val _restGenres = MutableLiveData<List<GenrePreferenceEntity>>()
-    val restGenres: LiveData<List<GenrePreferenceEntity>> = _restGenres
+    val restGenres: LiveData<List<GenrePreferenceEntity>> get()= _restGenres
 
     private val _isGenreListVisible = MutableLiveData<Boolean>(false)
-    val isGenreListVisible: LiveData<Boolean> = _isGenreListVisible
+    val isGenreListVisible: LiveData<Boolean> get()= _isGenreListVisible
 
     private val _novelPreferences = MutableLiveData<NovelPreferenceEntity>()
-    val novelPreferences: LiveData<NovelPreferenceEntity> = _novelPreferences
+    val novelPreferences: LiveData<NovelPreferenceEntity> get()= _novelPreferences
 
     private val _attractivePointsText = MutableLiveData<String>()
     val attractivePointsText: LiveData<String> get() = _attractivePointsText
@@ -58,7 +57,6 @@ class MyLibraryViewModel @Inject constructor(
             }.onSuccess { novelStats ->
                 _novelStats.value = novelStats
             }.onFailure { exception ->
-                Log.e("NovelViewModel", "Failed to load novel counts", exception)
             }
         }
     }
@@ -73,7 +71,6 @@ class MyLibraryViewModel @Inject constructor(
                 _dominantGenres.value = sortedGenres.take(3)
                 _restGenres.value = sortedGenres.drop(3)
             }.onFailure { exception ->
-                Log.e("MyLibraryViewModel", "Failed to load genre preference", exception)
             }
         }
     }
@@ -94,7 +91,6 @@ class MyLibraryViewModel @Inject constructor(
                 _novelPreferences.value = novelPreferences
                 _translatedAttractivePoints.value = translateAttractivePoints(novelPreferences.attractivePoints)
             }.onFailure { exception ->
-                Log.e("MyLibraryViewModel", "Failed to load novel preferences", exception)
             }
         }
     }