feat: 장르/작품 선호 api 연결

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

@@ -2,12 +2,17 @@ package com.teamwss.websoso.data.mapper
 
 import com.teamwss.websoso.data.model.BlockedUsersEntity
 import com.teamwss.websoso.data.model.BlockedUsersEntity.BlockedUserEntity
+import com.teamwss.websoso.data.model.GenrePreferenceEntity
 import com.teamwss.websoso.data.model.MyProfileEntity
+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.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
@@ -54,3 +59,26 @@ fun MyProfileResponseDto.toData(): MyProfileEntity {
         genrePreferences = this.genrePreferences
     )
 }
+
+fun GenrePreferenceDto.toData(): GenrePreferenceEntity {
+    return GenrePreferenceEntity(
+        genreName = this.genreName,
+        genreImage = this.genreImage,
+        genreCount = this.genreCount
+    )
+}
+
+fun NovelPreferenceResponseDto.toData(): NovelPreferenceEntity {
+    return NovelPreferenceEntity(
+        attractivePoints = this.attractivePoints,
+        keywords = this.keywords.map { it.toData() }
+    )
+}
+
+fun AttractivePointKeywordDto.toData(): NovelPreferenceEntity.KeywordEntity {
+    return NovelPreferenceEntity.KeywordEntity(
+        keywordName = this.keywordName,
+        keywordCount = this.keywordCount
+    )
+}
+

app/src/main/java/com/teamwss/websoso/data/model/GenrePreferenceEntity.kt

@@ -1,7 +1,7 @@
 package com.teamwss.websoso.data.model
 
 data class GenrePreferenceEntity(
-    val genreIcon: String,
+    val genreImage: String,
     val genreName: String,
     val genreCount: Int,
 )

app/src/main/java/com/teamwss/websoso/data/model/NovelPreferenceEntity.kt

@@ -1,11 +1,11 @@
 package com.teamwss.websoso.data.model
 
 data class NovelPreferenceEntity(
-    val attractivePoint: Array<String>,
-    val keywords: Array<KeywordEntity>,
-) {
+    val attractivePoints: List<String>,
+    val keywords: List<KeywordEntity>
+){
     data class KeywordEntity(
         val keywordName: String,
-        val keywordCount: Int,
+        val keywordCount: Int
     )
 }

app/src/main/java/com/teamwss/websoso/data/remote/api/UserApi.kt

@@ -3,7 +3,9 @@ package com.teamwss.websoso.data.remote.api
 import com.teamwss.websoso.data.remote.request.UserInfoRequestDto
 import com.teamwss.websoso.data.remote.request.UserProfileStatusRequestDto
 import com.teamwss.websoso.data.remote.response.BlockedUsersResponseDto
+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
@@ -44,5 +46,16 @@ interface UserApi {
     )
 
     @GET("users/my-profile")
-    suspend fun getMyProfile():MyProfileResponseDto
+    suspend fun getMyProfile(): MyProfileResponseDto
+
+    @GET("users/{userId}/preferences/genres")
+    suspend fun getGenrePreference(
+        @Path("userId") userId: Long
+    ): GenrePreferenceResponseDto
+
+    @GET("users/{userId}/preferences/attractive-points")
+    suspend fun getNovelPreferences(
+        @Path("userId") userId: Long
+    ): NovelPreferenceResponseDto
+
 }

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

@@ -0,0 +1,29 @@
+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
+        )
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.teamwss.websoso.data.remote.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NovelPreferenceResponseDto(
+    @SerialName("attractivePoints")
+    val attractivePoints: List<String>,
+    @SerialName("keywords")
+    val keywords: List<AttractivePointKeywordDto>
+)
+
+@Serializable
+data class AttractivePointKeywordDto(
+    @SerialName("keywordName")
+    val keywordName: String,
+    @SerialName("keywordCount")
+    val keywordCount: Int
+)

app/src/main/java/com/teamwss/websoso/data/repository/UserRepository.kt

@@ -2,14 +2,15 @@ package com.teamwss.websoso.data.repository
 
 import com.teamwss.websoso.data.mapper.toData
 import com.teamwss.websoso.data.model.BlockedUsersEntity
+import com.teamwss.websoso.data.model.GenrePreferenceEntity
 import com.teamwss.websoso.data.model.MyProfileEntity
+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.api.UserApi
 import com.teamwss.websoso.data.remote.request.UserInfoRequestDto
 import com.teamwss.websoso.data.remote.request.UserProfileStatusRequestDto
-import com.teamwss.websoso.data.remote.response.MyProfileResponseDto
 import javax.inject.Inject
 
 class UserRepository @Inject constructor(
@@ -44,7 +45,15 @@ class UserRepository @Inject constructor(
         userApi.putUserInfo(UserInfoRequestDto(gender, birthYear))
     }
 
-    suspend fun fetchMyProfile(): MyProfileEntity{
+    suspend fun fetchMyProfile(): MyProfileEntity {
         return userApi.getMyProfile().toData()
     }
+
+    suspend fun fetchGenrePreference(userId: Long): List<GenrePreferenceEntity> {
+        return userApi.getGenrePreference(userId).genrePreferences.map { it.toData() }
+    }
+
+    suspend fun fetchNovelPreferences(userId: Long): NovelPreferenceEntity {
+        return userApi.getNovelPreferences(userId).toData()
+    }
 }