Feat/#38 myinterststudy 구현

data/study/src/main/java/com/umcspot/spot/study/datasource/StudyDataSource.kt

@@ -3,6 +3,7 @@ package com.umcspot.spot.study.datasource
 import com.umcspot.spot.model.FeeRange
 import com.umcspot.spot.model.RecruitingStatus
 import com.umcspot.spot.model.RecruitingStudySort
+import com.umcspot.spot.model.StudyTheme
 import com.umcspot.spot.network.model.BaseResponse
 import com.umcspot.spot.study.dto.request.StudyRequestDto
 import com.umcspot.spot.study.dto.response.CreateStudyResponseDto
@@ -22,6 +23,16 @@ interface StudyDataSource {
         regionCodes : List<String>?
     ): BaseResponse<StudyResponseDto>
 
+    suspend fun getPreferCategoryStudies(
+        category : StudyTheme?,
+        recruitingStatus : RecruitingStatus?,
+        feeCategory: FeeRange?,
+        isOnline : Boolean?,
+        sortType: RecruitingStudySort?,
+        cursor: Long?,
+        size: Int,
+    ): BaseResponse<StudyResponseDto>
+
     suspend fun createStudy(request: StudyRequestDto, imageFile: File?): BaseResponse<CreateStudyResponseDto>
 
     suspend fun getCategoryStudies(

data/study/src/main/java/com/umcspot/spot/study/datasourceimpl/StudyDataSourceImpl.kt

@@ -3,6 +3,7 @@ package com.umcspot.spot.study.datasourceimpl
 import com.umcspot.spot.model.FeeRange
 import com.umcspot.spot.model.RecruitingStatus
 import com.umcspot.spot.model.RecruitingStudySort
+import com.umcspot.spot.model.StudyTheme
 import com.umcspot.spot.network.model.BaseResponse
 import com.umcspot.spot.study.datasource.StudyDataSource
 import com.umcspot.spot.study.dto.request.StudyRequestDto
@@ -45,6 +46,17 @@ class StudyDataSourceImpl @Inject constructor(
     ): BaseResponse<StudyResponseDto> =
         studyService.getPreferLocationStudies(recruitingStatus, feeCategory, categories, null, sortType, cursor, size, regionCodes)
 
+    override suspend fun getPreferCategoryStudies(
+        category: StudyTheme?,
+        recruitingStatus: RecruitingStatus?,
+        feeCategory: FeeRange?,
+        isOnline : Boolean?,
+        sortType: RecruitingStudySort?,
+        cursor: Long?,
+        size: Int,
+    ): BaseResponse<StudyResponseDto> =
+        studyService.getPreferCategoryStudies(category, recruitingStatus, feeCategory, isOnline, sortType, cursor, size)
+
     override suspend fun createStudy(
         request: StudyRequestDto,
         imageFile: File?

data/study/src/main/java/com/umcspot/spot/study/repositoryimpl/StudyRepositoryImpl.kt

@@ -70,6 +70,30 @@ class StudyRepositoryImpl @Inject constructor(
             Log.e("StudyRepository", "getPreferLocationStudies failed", it)
         }
 
+    override suspend fun getPreferCategoryStudies(
+        category: StudyTheme?,
+        recruitingStatus: RecruitingStatus?,
+        feeRange: FeeRange?,
+        isOnline : Boolean?,
+        sortBy: RecruitingStudySort?,
+        cursor: Long?,
+        size: Int,
+    ): Result<StudyResultList> =
+        runCatching {
+            val response = studyDataSource.getPreferCategoryStudies(
+                category = category,
+                recruitingStatus = recruitingStatus,
+                feeCategory = feeRange,
+                isOnline = isOnline,
+                sortType = sortBy,
+                cursor = cursor,
+                size = size,
+            )
+            response.result.toDomainList()
+        }.onFailure {
+            Log.e("StudyRepository", "getPreferCategoryStudies failed", it)
+        }
+
     override suspend fun getRecommendedStudies(): Result<StudyResultList> =
         runCatching {
             studyDataSource.getRecommendedStudies().result.toDomainList()

data/study/src/main/java/com/umcspot/spot/study/service/StudyService.kt

@@ -1,6 +1,5 @@
 package com.umcspot.spot.study.service
 
-import com.umcspot.spot.model.ActivityType
 import com.umcspot.spot.model.FeeRange
 import com.umcspot.spot.model.RecruitingStatus
 import com.umcspot.spot.model.RecruitingStudySort
@@ -43,6 +42,17 @@ interface StudyService {
         @Query("regionCodes") regionCodes: List<String>?
     ): BaseResponse<StudyResponseDto>
 
+    @GET("/api/studies/by-category")
+    suspend fun getPreferCategoryStudies(
+        @Query("category") category: StudyTheme?,
+        @Query("recruitingStatus") recruitingStatus: RecruitingStatus?,
+        @Query("feeCategory") feeCategory: FeeRange?,
+        @Query("isOnline") isOnline: Boolean?,
+        @Query("sortBy") sortBy: RecruitingStudySort?,
+        @Query("cursor") cursor: Long?,
+        @Query("size") size: Int,
+    ): BaseResponse<StudyResponseDto>
+
     @GET("/api/studies/categories")
     suspend fun getCategoryStudies(
         @Query("recruitingStatus") recruitingStatus: RecruitingStatus?,

data/user/src/main/java/com/umcspot/spot/user/dto/request/UserRequestDto.kt

@@ -6,8 +6,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class UserThemeRequestDto(
-    @SerialName("userThemes")
-    val userThemes: List<StudyTheme>
+    @SerialName("categories")
+    val categories: List<StudyTheme>
 )
 
 @Serializable

data/user/src/main/java/com/umcspot/spot/user/mapper/UserMapper.kt

@@ -17,7 +17,7 @@ import com.umcspot.spot.user.model.UserPreferredCategoryResult
 import com.umcspot.spot.user.model.UserPreferredRegionResult
 
 fun List<StudyTheme>.toRequestDto(): UserThemeRequestDto =
-    UserThemeRequestDto(userThemes = this)
+    UserThemeRequestDto(categories = this)
 
 fun String.toRequestDto(): UserNameRequestDto =
     UserNameRequestDto(name = this)
@@ -53,6 +53,6 @@ fun MyPageResponseDto.toDomain(): MyPageResult =
 
 fun UserPreferredCategoryResponseDto.toDomain(): UserPreferredCategoryResult =
     UserPreferredCategoryResult(
-        categories = categories.map { StudyTheme.from(it)?.title },
+        categories = categories.map { StudyTheme.from(it) },
         totalCount = totalCount
     )

domain/study/src/main/java/com/umcspot/spot/study/repository/StudyRepository.kt

@@ -29,6 +29,16 @@ interface StudyRepository {
         regionCodes : List<String>?
     ): Result<StudyResultList>
 
+    suspend fun getPreferCategoryStudies(
+        category : StudyTheme?,
+        recruitingStatus : RecruitingStatus?,
+        feeRange: FeeRange?,
+        isOnline : Boolean?,
+        sortBy: RecruitingStudySort?,
+        cursor: Long?,
+        size: Int,
+    ): Result<StudyResultList>
+
     suspend fun createStudy(studyCreateModel: StudyCreateModel, imageFile: File?): Result<Long>
 
     suspend fun getCategoryStudies(

domain/user/src/main/java/com/umcspot/spot/user/model/UserPreferredCategoryResult.kt

@@ -1,6 +1,8 @@
 package com.umcspot.spot.user.model
 
+import com.umcspot.spot.model.StudyTheme
+
 data class UserPreferredCategoryResult(
-    val categories : List<String?>,
+    val categories : List<StudyTheme?>,
     val totalCount: Int
 )

feature/main/src/main/java/com/umcspot/spot/main/MainNavHost.kt

@@ -34,6 +34,10 @@ import com.umcspot.spot.signup.navigation.signupGraph
 import com.umcspot.spot.study.detail.navigation.navigateToStudyDetail
 import com.umcspot.spot.study.detail.navigation.studyDetailGraph
 import com.umcspot.spot.study.my.navigation.myStudyGraph
+import com.umcspot.spot.study.preferCategory.navigation.navigateToPreferCategoryStudy
+import com.umcspot.spot.study.preferCategory.navigation.navigateToPreferCategoryStudyFilter
+import com.umcspot.spot.study.preferCategory.navigation.preferCategoryStudyFilterGraph
+import com.umcspot.spot.study.preferCategory.navigation.preferCategoryStudyGraph
 import com.umcspot.spot.study.preferLocation.navigation.preferLocationStudyFilterGraph
 import com.umcspot.spot.study.preferLocation.navigation.preferLocationStudyGraph
 import com.umcspot.spot.study.recruiting.navigation.recruitingStudyFilterGraph
@@ -78,9 +82,7 @@ fun MainNavHost(
                 when (type) {
                     QuickMenuType.BOARD -> navigator.navigateToBoard()
                     QuickMenuType.REGION -> navigator.navigateToPreferLocationStudy()
-                    QuickMenuType.INTERESTS -> { /* TODO */
-                    }
-
+                    QuickMenuType.INTERESTS -> navigator.navController.navigateToPreferCategoryStudy()
                     QuickMenuType.RECRUITING -> navigator.navigateToRecruitingStudy()
                 }
             },
@@ -168,6 +170,19 @@ fun MainNavHost(
             onAcceptFilterClick = { navigator.popBackStack() }
         )
 
+        preferCategoryStudyGraph(
+            contentPadding = contentPadding,
+            onRegisterScrollToTop = onRegisterScrollToTop,
+            onItemClick = { },
+            onFilterClick = { navigator.navController.navigateToPreferCategoryStudyFilter() },
+        )
+
+        preferCategoryStudyFilterGraph(
+            contentPadding = contentPadding,
+            navController = navigator.navController,
+            onAcceptFilterClick = { navigator.popBackStack() }
+        )
+
         boardGraph(
             contentPadding = contentPadding,
             navController = navigator.navController,

feature/main/src/main/java/com/umcspot/spot/main/MainNavigator.kt

@@ -36,6 +36,8 @@ import com.umcspot.spot.signup.navigation.navigateToSaving
 import com.umcspot.spot.signup.navigation.navigateToSignUp
 import com.umcspot.spot.study.detail.navigation.navigateToStudyDetail
 import com.umcspot.spot.study.my.navigation.navigateToMyStudy
+import com.umcspot.spot.study.preferCategory.navigation.PreferCategory
+import com.umcspot.spot.study.preferCategory.navigation.PreferCategoryFilter
 import com.umcspot.spot.study.preferLocation.navigation.PreferLocation
 import com.umcspot.spot.study.preferLocation.navigation.PreferLocationFilter
 import com.umcspot.spot.study.preferLocation.navigation.navigateToPreferLocationStudy
@@ -99,14 +101,14 @@ class MainNavigator(
     fun isInLanding(): Boolean = inAnyGraph(Landing::class, Saving::class)
 
     @Composable
-    fun showBackTopBar(): Boolean = inAnyGraph(Alert::class, RecruitingFilter::class, PreferLocationFilter::class,
+    fun showBackTopBar(): Boolean = inAnyGraph(Alert::class, RecruitingFilter::class, PreferLocationFilter::class, PreferCategoryFilter::class,
         SignUp::class, CheckList::class, Posting::class, BoardList::class, JJim::class, MyPage::class,
         ParticipatingStudy::class, MyRecruitingStudy::class, WaitingStudy::class
     ) || inAnyGraphRoutes(POST_CONTENT_ROUTE)
 
     @Composable
     fun showToTopFab(): Boolean = inAnyGraph(Alert::class, Recruiting::class,
-        PreferLocation::class, BoardList::class, JJim::class, ParticipatingStudy::class, MyRecruitingStudy::class, WaitingStudy::class)
+        PreferLocation::class, PreferCategory::class, BoardList::class, JJim::class, ParticipatingStudy::class, MyRecruitingStudy::class, WaitingStudy::class)
 
     @Composable
     fun showMultipleFab(): Boolean = inAnyGraph(Home::class, BoardList::class)

feature/main/src/main/java/com/umcspot/spot/main/MainScreen.kt

@@ -42,6 +42,7 @@ import com.umcspot.spot.mypage.waiting.navigation.WaitingStudy
 import com.umcspot.spot.signup.navigation.CheckList
 import com.umcspot.spot.signup.navigation.SignUp
 import com.umcspot.spot.study.detail.navigation.StudyDetail
+import com.umcspot.spot.study.preferCategory.navigation.PreferCategoryFilter
 import com.umcspot.spot.study.preferLocation.navigation.PreferLocationFilter
 import com.umcspot.spot.study.recruiting.navigation.RecruitingFilter
 import com.umcspot.spot.study.register.navigation.RegisterStudy
@@ -70,6 +71,7 @@ fun MainScreen(
                         dest?.hasRoute(Alert::class) == true -> "알림"
                         dest?.hasRoute(RecruitingFilter::class) == true -> "모집중인 스터디"
                         dest?.hasRoute(PreferLocationFilter::class) == true -> "내 지역 스터디"
+                        dest?.hasRoute(PreferCategoryFilter::class) == true -> "내 관심사 스터디"
                         dest?.hasRoute(SignUp::class) == true -> "회원가입"
                         dest?.hasRoute(CheckList::class) == true -> "체크리스트"
                         dest?.hasRoute(Posting::class) == true -> "글쓰기"

feature/mypage/src/main/java/com/umcspot/spot/mypage/main/MyPageViewModel.kt

@@ -65,7 +65,8 @@ class MyPageViewModel @Inject constructor(
         viewModelScope.launch {
             userRepository.getUserPreferredCategory()
                 .onSuccess { info ->
-                    _uiState.update { it.copy(preferCategories = UiState.Success(info.categories)) }
+                    val titles = info.categories.mapNotNull { it?.title }
+                    _uiState.update { it.copy(preferCategories = UiState.Success(titles)) }
                 }
                 .onFailure { e ->
                     Log.e("HomeViewModel", "loadPreferCategories error", e)