Merge pull request #22 from Nexters/feature/implement-home-api

[FEAT] 홈 비즈니스 로직 구현

Author: bywindow

core/designsystem/src/main/res/drawable/img_satto_tiger.png

@@ -44,7 +44,7 @@ interface UserRemoteDataSource {
 	suspend fun getDailyFortunes(
 		userId: String,
 		fortuneDate: String
-	): List<DailyFortuneDto>
+	): DailyFortuneDto
 
 	suspend fun getDailyFortuneDetail(
 		userId: String,

data/src/main/java/com/hanbang/data/datasource/UserRemoteDataSource.kt

@@ -8,16 +8,21 @@ import com.hanbang.domain.model.DailyFortune
  * @created  2025/08/13
  */
 data class DailyFortuneDto(
-	val id: Int,
-	val userId: String,
-	val fortuneDate: String,
-	val fortuneType: String,
-	val imageUrl: String,
-	val description: String
-)
+	val title: String,
+	val content: List<Content>
+) {
+	data class Content(
+		val id: Int,
+		val userId: String,
+		val fortuneDate: String,
+		val fortuneType: String,
+		val imageUrl: String,
+		val description: String
+	)
+}
 
-internal fun DailyFortuneDto.toDomain(): DailyFortune {
-	return com.hanbang.domain.model.DailyFortune(
+internal fun DailyFortuneDto.Content.toDomain(): DailyFortune.Content {
+	return DailyFortune.Content(
 		id = id,
 		userId = userId,
 		fortuneDate = fortuneDate,
@@ -27,4 +32,9 @@ internal fun DailyFortuneDto.toDomain(): DailyFortune {
 	)
 }
 
-internal fun List<DailyFortuneDto>.toDomain() = map { it.toDomain() }
+internal fun List<DailyFortuneDto.Content>.toDomain() = map { it.toDomain() }
+
+internal fun DailyFortuneDto.toDomain() = DailyFortune(
+	title = title,
+	content = content.toDomain()
+)

data/src/main/java/com/hanbang/data/model/DailyFortuneDto.kt

@@ -8,21 +8,15 @@ import com.hanbang.domain.model.LottoRecommendation
  * @created  2025/08/13
  */
 data class LottoRecommendationDto(
-	val id: Int,
 	val userId: String,
 	val round: Int,
-	val content: LottoRecommendationContentDto,
-	val createdAt: String,
-	val updatedAt: String
+	val content: LottoRecommendationContentDto?,
 )
 
 internal fun LottoRecommendationDto.toDomain(): LottoRecommendation {
 	return LottoRecommendation(
-		id = id,
 		userId = userId,
 		round = round,
-		content = content.toDomain(),
-		createdAt = createdAt,
-		updatedAt = updatedAt
+		content = content?.toDomain(),
 	)
 }

data/src/main/java/com/hanbang/data/model/LottoRecommendationDto.kt

@@ -13,8 +13,6 @@ data class PillarDetailDto(
 	val branch: String,
 	val stemTenGod: String,
 	val branchTenGod: String,
-	val stemElement: String,
-	val branchElement: String
 )
 
 internal fun PillarDetailDto.toDomain(): PillarDetail {
@@ -23,7 +21,5 @@ internal fun PillarDetailDto.toDomain(): PillarDetail {
 		branch = PillarElement.parsePillarElementInString(branch),
 		stemTenGod = stemTenGod,
 		branchTenGod = branchTenGod,
-		stemElement = stemElement,
-		branchElement = branchElement
 	)
 }

data/src/main/java/com/hanbang/data/model/PillarDetailDto.kt

@@ -6,7 +6,9 @@ import com.hanbang.data.datasource.UserRemoteDataSource
 import com.hanbang.data.model.toDomain
 import com.hanbang.domain.model.DailyFortuneDetail
 import com.hanbang.domain.model.FourPillar
+import com.hanbang.domain.model.DailyFortune
 import com.hanbang.domain.model.GenderType
+import com.hanbang.domain.model.LottoRecommendation
 import com.hanbang.domain.model.User
 import com.hanbang.domain.repository.SattoRepository
 import kotlinx.coroutines.Dispatchers
@@ -100,6 +102,18 @@ class DefaultSattoRepository @Inject constructor(
 		emit(dailyFortuneDetailDto.toDomain())
 	}.flowOn(Dispatchers.IO)
 
+	override fun getDailyFortunes(fortuneDate: String): Flow<DailyFortune> = flow {
+		val userId = userLocalDataSource.getUserId()
+		val dailyFortunesDto = userRemoteDataSource.getDailyFortunes(userId, fortuneDate)
+		emit(dailyFortunesDto.toDomain())
+	}.flowOn(Dispatchers.IO)
+
+	override fun getLottoRecommendation(): Flow<LottoRecommendation> = flow {
+		val userId = userLocalDataSource.getUserId()
+		val lottoRecommendationDto = userRemoteDataSource.getLottoRecommendation(userId)
+		emit(lottoRecommendationDto.toDomain())
+	}.flowOn(Dispatchers.IO)
+
 	private fun formatBirthDateTime(year: Int, month: Int, day: Int, hour: Int, minute: Int): String {
 		val dateTime = LocalDateTime.of(year, month, day, hour, minute)
 		val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")

data/src/main/java/com/hanbang/data/repository/DefaultSattoRepository.kt

@@ -6,10 +6,15 @@ package com.hanbang.domain.model
  * @created  2025/08/13
  */
 data class DailyFortune(
-	val id: Int,
-	val userId: String,
-	val fortuneDate: String,
-	val fortuneType: String,
-	val imageUrl: String,
-	val description: String
-)
+	val title: String,
+	val content: List<Content>
+) {
+	data class Content(
+		val id: Int,
+		val userId: String,
+		val fortuneDate: String,
+		val fortuneType: String,
+		val imageUrl: String,
+		val description: String
+	)
+}

domain/src/main/java/com/hanbang/domain/model/DailyFortune.kt

@@ -6,10 +6,7 @@ package com.hanbang.domain.model
  * @created  2025/08/13
  */
 data class LottoRecommendation(
-	val id: Int,
 	val userId: String,
 	val round: Int,
-	val content: LottoRecommendationContent,
-	val createdAt: String,
-	val updatedAt: String
+	val content: LottoRecommendationContent?,
 )

domain/src/main/java/com/hanbang/domain/model/LottoRecommendation.kt

@@ -10,6 +10,4 @@ data class PillarDetail(
 	val branch: PillarElement,
 	val stemTenGod: String,
 	val branchTenGod: String,
-	val stemElement: String,
-	val branchElement: String
 )

domain/src/main/java/com/hanbang/domain/model/PillarDetail.kt

@@ -2,7 +2,9 @@ package com.hanbang.domain.repository
 
 import com.hanbang.domain.model.DailyFortuneDetail
 import com.hanbang.domain.model.FourPillar
+import com.hanbang.domain.model.DailyFortune
 import com.hanbang.domain.model.GenderType
+import com.hanbang.domain.model.LottoRecommendation
 import com.hanbang.domain.model.User
 import kotlinx.coroutines.flow.Flow
 
@@ -44,4 +46,10 @@ interface SattoRepository {
 	fun getDailyFortuneDetail(
 		fortuneDate: String
 	): Flow<DailyFortuneDetail>
+
+	fun getDailyFortunes(
+		fortuneDate: String
+	): Flow<DailyFortune>
+
+	fun getLottoRecommendation(): Flow<LottoRecommendation>
 }