[Feature/#873] 오늘의 솝마디 콕찌르기 추천 기능 구현

data/fortune/src/main/java/org/sopt/official/data/fortune/di/ApiModule.kt

@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

data/fortune/src/main/java/org/sopt/official/data/fortune/di/RepositoryModule.kt

@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

data/poke/src/main/java/org/sopt/official/data/poke/implementation/PokeRepositoryImpl.kt

@@ -24,7 +24,6 @@
  */
 package org.sopt.official.data.poke.implementation
 
-import javax.inject.Inject
 import org.sopt.official.data.poke.dto.request.GetFriendListDetailRequest
 import org.sopt.official.data.poke.dto.request.GetPokeMessageListRequest
 import org.sopt.official.data.poke.dto.request.GetPokeNotificationListRequest
@@ -44,6 +43,7 @@ import org.sopt.official.domain.poke.entity.PokeUserResponse
 import org.sopt.official.domain.poke.repository.PokeRepository
 import org.sopt.official.domain.poke.type.PokeFriendType
 import org.sopt.official.domain.poke.type.PokeMessageType
+import javax.inject.Inject
 
 class PokeRepositoryImpl @Inject constructor(
     private val localDataSource: PokeLocalDataSource,
@@ -62,7 +62,7 @@ class PokeRepositoryImpl @Inject constructor(
         return remoteDataSource.checkNewInPoke()
     }
 
-    override suspend fun getOnboardingPokeUserList(randomType: String, size: Int): GetOnboardingPokeUserListResponse {
+    override suspend fun getOnboardingPokeUserList(randomType: String?, size: Int): GetOnboardingPokeUserListResponse {
         return remoteDataSource.getOnboardingPokeUserList(randomType, size)
     }
 
@@ -110,7 +110,7 @@ class PokeRepositoryImpl @Inject constructor(
         )
     }
 
-    override suspend fun pokeUser(userId: Int, isAnonymous: Boolean, message: String,): PokeUserResponse {
+    override suspend fun pokeUser(userId: Int, isAnonymous: Boolean, message: String): PokeUserResponse {
         return remoteDataSource.pokeUser(
             pokeUserRequest =
             PokeUserRequest(

data/poke/src/main/java/org/sopt/official/data/poke/service/PokeService.kt

@@ -46,8 +46,8 @@ interface PokeService {
 
     @GET("poke/random")
     suspend fun getOnboardingPokeUserList(
-        @Query("randomType") randomType: String,
-        @Query("size") size: Int
+        @Query("randomType") randomType: String?,
+        @Query("size") size: Int,
     ): Response<PokeRandomUserListResult>
 
     @GET("poke/to/me")
@@ -60,16 +60,16 @@ interface PokeService {
     suspend fun getPokeFriendOfFriendList(): Response<List<PokeFriendOfFriendListResult>>
 
     @GET("poke/to/me/list")
-    suspend fun getPokeNotificationList(@Query("page") page: Int,): Response<PokeNotificationResult>
+    suspend fun getPokeNotificationList(@Query("page") page: Int): Response<PokeNotificationResult>
 
     @GET("poke/friend/list")
     suspend fun getFriendListSummary(): Response<GetFriendListSummaryResult>
 
     @GET("poke/friend/list")
-    suspend fun getFriendListDetail(@Query("type") type: String, @Query("page") page: Int,): Response<GetFriendListDetailResult>
+    suspend fun getFriendListDetail(@Query("type") type: String, @Query("page") page: Int): Response<GetFriendListDetailResult>
 
     @GET("poke/message")
-    suspend fun getPokeMessageList(@Query("messageType") messageType: String,): Response<GetPokeMessageListResult>
+    suspend fun getPokeMessageList(@Query("messageType") messageType: String): Response<GetPokeMessageListResult>
 
     @PUT("poke/{userId}")
     suspend fun pokeUser(@Path("userId") userId: Int, @Body pokeMessageRequest: PokeMessageRequest): Response<PokeUserResult>

data/poke/src/main/java/org/sopt/official/data/poke/source/remote/PokeRemoteDataSource.kt

@@ -24,7 +24,6 @@
  */
 package org.sopt.official.data.poke.source.remote
 
-import javax.inject.Inject
 import org.sopt.official.data.poke.dto.request.GetFriendListDetailRequest
 import org.sopt.official.data.poke.dto.request.GetPokeMessageListRequest
 import org.sopt.official.data.poke.dto.request.GetPokeNotificationListRequest
@@ -41,6 +40,7 @@ import org.sopt.official.domain.poke.entity.GetPokeMeResponse
 import org.sopt.official.domain.poke.entity.GetPokeMessageListResponse
 import org.sopt.official.domain.poke.entity.GetPokeNotificationListResponse
 import org.sopt.official.domain.poke.entity.PokeUserResponse
+import javax.inject.Inject
 
 class PokeRemoteDataSource @Inject constructor(
     private val service: PokeService,
@@ -54,7 +54,7 @@ class PokeRemoteDataSource @Inject constructor(
         }
     }
 
-    suspend fun getOnboardingPokeUserList(randomType: String, size: Int): GetOnboardingPokeUserListResponse {
+    suspend fun getOnboardingPokeUserList(randomType: String?, size: Int): GetOnboardingPokeUserListResponse {
         val response = service.getOnboardingPokeUserList(randomType, size)
         return GetOnboardingPokeUserListResponse().apply {
             statusCode = response.code().toString()

domain/poke/src/main/java/org/sopt/official/domain/poke/repository/PokeRepository.kt

@@ -41,17 +41,17 @@ interface PokeRepository {
     suspend fun checkNewInPokeOnboarding(): Boolean
     suspend fun updateNewInPokeOnboarding()
     suspend fun checkNewInPoke(): CheckNewInPokeResponse
-    suspend fun getOnboardingPokeUserList(randomType: String, size: Int): GetOnboardingPokeUserListResponse
+    suspend fun getOnboardingPokeUserList(randomType: String? = null, size: Int): GetOnboardingPokeUserListResponse
     suspend fun getPokeMe(): GetPokeMeResponse
     suspend fun getPokeFriend(): GetPokeFriendResponse
     suspend fun getPokeFriendOfFriendList(): GetPokeFriendOfFriendListResponse
     suspend fun getPokeNotificationList(page: Int): GetPokeNotificationListResponse
 
     suspend fun getFriendListSummary(): GetFriendListSummaryResponse
 
-    suspend fun getFriendListDetail(type: PokeFriendType, page: Int,): GetFriendListDetailResponse
+    suspend fun getFriendListDetail(type: PokeFriendType, page: Int): GetFriendListDetailResponse
 
-    suspend fun getPokeMessageList(messageType: PokeMessageType,): GetPokeMessageListResponse
+    suspend fun getPokeMessageList(messageType: PokeMessageType): GetPokeMessageListResponse
 
-    suspend fun pokeUser(userId: Int, isAnonymous: Boolean, message: String,): PokeUserResponse
+    suspend fun pokeUser(userId: Int, isAnonymous: Boolean, message: String): PokeUserResponse
 }

domain/poke/src/main/java/org/sopt/official/domain/poke/usecase/GetOnboardingPokeUserListUseCase.kt

@@ -24,11 +24,11 @@
  */
 package org.sopt.official.domain.poke.usecase
 
-import javax.inject.Inject
 import org.sopt.official.domain.poke.entity.ApiResult
 import org.sopt.official.domain.poke.entity.PokeRandomUserList
 import org.sopt.official.domain.poke.entity.apiResult
 import org.sopt.official.domain.poke.repository.PokeRepository
+import javax.inject.Inject
 
 class GetOnboardingPokeUserListUseCase @Inject constructor(
     private val repository: PokeRepository,

feature/fortune/build.gradle.kts

@@ -35,6 +35,7 @@ android {
 dependencies {
     // domain
     implementation(projects.domain.fortune)
+    implementation(projects.domain.poke)
 
     // core
     implementation(projects.core.common)

feature/fortune/src/androidTest/java/org/sopt/official/feature/fortune/fortuneDetail/FortuneDetailScreenTest.kt

@@ -35,7 +35,9 @@ import org.junit.Rule
 import org.junit.Test
 import org.sopt.official.designsystem.SoptTheme
 import org.sopt.official.feature.fortune.feature.fortuneDetail.FortuneDetailScreen
-import org.sopt.official.feature.fortune.feature.fortuneDetail.model.FortuneDetailUiState
+import org.sopt.official.feature.fortune.feature.fortuneDetail.model.FortuneDetailUiState.Success
+import org.sopt.official.feature.fortune.feature.fortuneDetail.model.FortuneDetailUiState.Success.TodaySentence
+import org.sopt.official.feature.fortune.feature.fortuneDetail.model.FortuneDetailUiState.Success.UserInfo
 
 internal class FortuneDetailScreenTest {
 
@@ -50,17 +52,27 @@ internal class FortuneDetailScreenTest {
         val content = "안녕하세요안녕하세요안녕하세요안녕하세요안녕하세요"
 
         // when:
-
         composeRule.setContent {
             SoptTheme {
                 FortuneDetailScreen(
                     paddingValue = PaddingValues(),
                     date = date,
                     onFortuneAmuletClick = { },
-                    uiState = FortuneDetailUiState.TodaySentence(
-                        userName = name,
-                        content = content,
-                    )
+                    onPokeClick = { },
+                    onProfileClick = { },
+                    uiState = Success(
+                        todaySentence = TodaySentence(
+                            userName = name,
+                            content = content,
+                        ),
+                        userInfo = UserInfo(
+                            userId = 0L,
+                            profile = "",
+                            userName = "동민",
+                            generation = 111,
+                            part = "기획 파트",
+                        )
+                    ),
                 )
             }
         }

feature/fortune/src/main/java/org/sopt/official/feature/fortune/feature/fortuneDetail/FortuneDetailRoute.kt

@@ -24,9 +24,12 @@
  */
 package org.sopt.official.feature.fortune.feature.fortuneDetail
 
+import android.content.Intent
+import android.net.Uri
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.LocalContext
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 
@@ -37,12 +40,19 @@ internal fun FortuneDetailRoute(
     onFortuneAmuletClick: () -> Unit,
     viewModel: FortuneDetailViewModel = hiltViewModel(),
 ) {
+    val context = LocalContext.current
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
     FortuneDetailScreen(
         paddingValue = paddingValue,
         date = date,
         onFortuneAmuletClick = onFortuneAmuletClick,
+        onPokeClick = {},
+        onProfileClick = { userId ->
+            context.startActivity(
+                Intent(Intent.ACTION_VIEW, Uri.parse("https://playground.sopt.org/members/${userId}"))
+            )
+        },
         uiState = uiState,
     )
 }

feature/fortune/src/main/java/org/sopt/official/feature/fortune/feature/fortuneDetail/FortuneDetailScreen.kt

@@ -36,31 +36,46 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.sopt.official.designsystem.SoptTheme
+import org.sopt.official.feature.fortune.feature.fortuneDetail.component.PokeRecommendationDashboard
 import org.sopt.official.feature.fortune.feature.fortuneDetail.component.TodayFortuneDashboard
 import org.sopt.official.feature.fortune.feature.fortuneDetail.model.FortuneDetailUiState
 import org.sopt.official.feature.fortune.feature.fortuneDetail.model.FortuneDetailUiState.Error
 import org.sopt.official.feature.fortune.feature.fortuneDetail.model.FortuneDetailUiState.Loading
-import org.sopt.official.feature.fortune.feature.fortuneDetail.model.FortuneDetailUiState.TodaySentence
+import org.sopt.official.feature.fortune.feature.fortuneDetail.model.FortuneDetailUiState.Success
+import org.sopt.official.feature.fortune.feature.fortuneDetail.model.FortuneDetailUiState.Success.TodaySentence
+import org.sopt.official.feature.fortune.feature.fortuneDetail.model.FortuneDetailUiState.Success.UserInfo
 import timber.log.Timber
 
 @Composable
 internal fun FortuneDetailScreen(
     paddingValue: PaddingValues,
     date: String,
     onFortuneAmuletClick: () -> Unit,
+    onPokeClick: (userId: Long) -> Unit,
+    onProfileClick: (userId: Long) -> Unit,
     modifier: Modifier = Modifier,
     uiState: FortuneDetailUiState = Loading,
 ) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = modifier.fillMaxSize().padding(paddingValues = paddingValue),
+        modifier = modifier
+            .fillMaxSize()
+            .padding(paddingValues = paddingValue),
     ) {
         Spacer(modifier = Modifier.height(height = 16.dp))
         when (uiState) {
-            is TodaySentence -> {
+            is Success -> {
                 TodayFortuneDashboard(
                     date = date,
-                    todaySentence = uiState.message,
+                    todaySentence = uiState.todaySentence.message,
+                )
+                Spacer(modifier = Modifier.height(height = 20.dp))
+                PokeRecommendationDashboard(
+                    profile = uiState.userInfo.profile,
+                    name = uiState.userInfo.userName,
+                    userDescription = uiState.userInfo.userDescription,
+                    onPokeClick = { onPokeClick(uiState.userInfo.userId) },
+                    onProfileClick = { onProfileClick(uiState.userInfo.userId) }
                 )
             }
 
@@ -80,10 +95,21 @@ private fun FortuneDetailScreenPreview() {
             paddingValue = PaddingValues(vertical = 16.dp),
             date = "2024-09-09",
             onFortuneAmuletClick = {},
-            uiState = TodaySentence(
-                userName = "누누",
-                content = "오늘 하루종일 기분 좋을 것 같은 날이네요.",
+            uiState = Success(
+                todaySentence = TodaySentence(
+                    userName = "이현우",
+                    content = "사과해요나한테사과해요나한테사과해요나한테"
+                ),
+                userInfo = UserInfo(
+                    userId = 0L,
+                    profile = "",
+                    userName = "동민",
+                    generation = 111,
+                    part = "기획 파트"
+                )
             ),
+            onPokeClick = { },
+            onProfileClick = { },
         )
     }
 }