Merge feat/107 onto develop

app/build.gradle.kts

@@ -1,3 +1,6 @@
+import java.util.Properties
+
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.compose)
@@ -7,6 +10,12 @@ plugins {
     alias(libs.plugins.google.services)
 }
 
+val localProperty =
+    Properties().apply {
+        val f = rootProject.file("local.properties")
+        if (f.exists()) f.inputStream().use { load(it) }
+    }
+
 android {
     namespace = "com.kikidan.todakun"
     compileSdk = 37
@@ -22,7 +31,20 @@ android {
     }
 
     buildTypes {
+        debug {
+            // TODO CI 통과를 위해 공백을 넣음. 추후 CD 설정 시 재설정
+            val kakaoKey = localProperty.getProperty("KAKAO_NATIVE_APP_KEY_DEV") ?: ""
+            val appLinkHost = localProperty.getProperty("APP_LINK_HOST_DEV") ?: ""
+            manifestPlaceholders["KAKAO_APP_KEY"] = kakaoKey
+            manifestPlaceholders["APP_LINK_HOST"] = appLinkHost
+        }
         release {
+            // TODO CI 통과를 위해 공백을 넣음. 추후 CD 설정 시 재설정
+            val kakaoKey = localProperty.getProperty("KAKAO_NATIVE_APP_KEY") ?: ""
+            val appLinkHost = localProperty.getProperty("APP_LINK_HOST") ?: ""
+            manifestPlaceholders["KAKAO_APP_KEY"] = kakaoKey
+            manifestPlaceholders["APP_LINK_HOST"] = appLinkHost
+
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
@@ -70,10 +92,12 @@ dependencies {
     implementation(projects.feature.mypage)
     implementation(projects.feature.onboarding)
     implementation(projects.feature.auth)
+    implementation(projects.feature.sajuContents)
     implementation(projects.feature.luckAction)
     implementation(projects.feature.home)
     implementation(projects.feature.chat)
     implementation(projects.feature.notification)
+    implementation(projects.feature.sajuContents)
 
     implementation(libs.androidx.navigation3.runtime)
     implementation(libs.androidx.navigation3.ui)

app/src/main/AndroidManifest.xml

@@ -23,6 +23,26 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <!-- 카카오 공유 딥링크 -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="kakao${KAKAO_APP_KEY}" android:host="kakaolink" />
+            </intent-filter>
+
+            <!-- App-Link -->
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https"/>
+                <data android:host="${APP_LINK_HOST}"/>
+                <data android:path="/day-fortune" />
+                <data android:path="/year-fortune" />
+                <data android:path="/compatibility" />
+            </intent-filter>
         </activity>
     </application>
 

core/data-remote/src/main/java/com/kikidan/data_remote/datasource/RemoteCompatibilityDataSourceImpl.kt

@@ -0,0 +1,36 @@
+package com.kikidan.data_remote.datasource
+
+import com.kikidan.data.datasource.RemoteCompatibilityDataSource
+import com.kikidan.data_remote.dto.compatibility.CompatibilityResponse
+import com.kikidan.data_remote.dto.compatibility.toDomain
+import com.kikidan.data_remote.util.bodyNotNull
+import com.kikidan.domain.model.compatibility.Compatibility
+import dagger.Lazy
+import io.ktor.client.HttpClient
+import io.ktor.client.request.get
+import io.ktor.client.request.post
+import javax.inject.Inject
+
+class RemoteCompatibilityDataSourceImpl
+    @Inject
+    constructor(
+        private val client: Lazy<HttpClient>,
+    ) : RemoteCompatibilityDataSource {
+        override suspend fun postCompatibility(partnerLinkId: String): Compatibility =
+            client
+                .get()
+                .post("$COMPATIBILITIES_URL/$partnerLinkId")
+                .bodyNotNull<CompatibilityResponse>()
+                .toDomain()
+
+        override suspend fun getCompatibility(compatibilityId: String): Compatibility =
+            client
+                .get()
+                .get("$COMPATIBILITIES_URL/$compatibilityId")
+                .bodyNotNull<CompatibilityResponse>()
+                .toDomain()
+
+        companion object {
+            private const val COMPATIBILITIES_URL = "api/v1/compatibilities"
+        }
+    }

core/data-remote/src/main/java/com/kikidan/data_remote/datasource/RemoteDayFortuneDataSourceImpl.kt

@@ -0,0 +1,50 @@
+package com.kikidan.data_remote.datasource
+
+import com.kikidan.data.datasource.RemoteDayFortuneDataSource
+import com.kikidan.data_remote.dto.dayfortune.CreateDayFortuneRequest
+import com.kikidan.data_remote.dto.dayfortune.DayFortuneResponse
+import com.kikidan.data_remote.dto.dayfortune.toDomain
+import com.kikidan.data_remote.util.bodyNotNull
+import com.kikidan.domain.model.dayfortune.DayFortune
+import com.kikidan.domain.model.dayfortune.DayFortunePurpose
+import dagger.Lazy
+import io.ktor.client.HttpClient
+import io.ktor.client.request.get
+import io.ktor.client.request.post
+import io.ktor.client.request.setBody
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import javax.inject.Inject
+
+class RemoteDayFortuneDataSourceImpl
+    @Inject
+    constructor(
+        private val client: Lazy<HttpClient>,
+    ) : RemoteDayFortuneDataSource {
+        override suspend fun postDayFortunes(
+            purpose: DayFortunePurpose,
+            targetDates: List<LocalDate>,
+        ): List<DayFortune> =
+            client
+                .get()
+                .post(DAY_FORTUNES_URL) {
+                    setBody(
+                        CreateDayFortuneRequest(
+                            purpose = purpose.name,
+                            targetDates = targetDates.map { it.format(DateTimeFormatter.ISO_LOCAL_DATE) },
+                        ),
+                    )
+                }.bodyNotNull<List<DayFortuneResponse>>()
+                .map { it.toDomain() }
+
+        override suspend fun getDayFortune(id: String): DayFortune =
+            client
+                .get()
+                .get("$DAY_FORTUNES_URL/$id")
+                .bodyNotNull<DayFortuneResponse>()
+                .toDomain()
+
+        companion object {
+            private const val DAY_FORTUNES_URL = "api/v1/day-fortunes"
+        }
+    }

core/data-remote/src/main/java/com/kikidan/data_remote/datasource/RemotePartnerSajuDataSourceImpl.kt

@@ -5,12 +5,15 @@ import com.kikidan.data_remote.dto.CommonResponse
 import com.kikidan.data_remote.dto.saju.PartnerSajuDetailResponse
 import com.kikidan.data_remote.dto.saju.PartnerSajuSummaryResponse
 import com.kikidan.data_remote.dto.saju.RegisterPartnerSajuResponse
+import com.kikidan.data_remote.dto.saju.SajuChartDetailResponse
+import com.kikidan.data_remote.dto.saju.toChartDetail
 import com.kikidan.data_remote.dto.saju.toDomain
 import com.kikidan.data_remote.dto.saju.toRegisterRequest
 import com.kikidan.data_remote.dto.saju.toUpdateRequest
 import com.kikidan.data_remote.util.bodyNotNull
 import com.kikidan.domain.model.saju.PartnerSaju
 import com.kikidan.domain.model.saju.PartnerSajuInput
+import com.kikidan.domain.model.saju.SajuChartDetail
 import dagger.Lazy
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
@@ -40,6 +43,13 @@ class RemotePartnerSajuDataSourceImpl
                 .bodyNotNull<PartnerSajuDetailResponse>()
                 .toDomain()
 
+        override suspend fun getPartnerSajuChartDetail(linkId: String): SajuChartDetail =
+            client
+                .get()
+                .get(partnerUrl(linkId))
+                .bodyNotNull<SajuChartDetailResponse>()
+                .toChartDetail()
+
         override suspend fun deletePartnerSaju(linkId: String) {
             client.get().delete(partnerUrl(linkId)).body<CommonResponse<Unit>>()
         }

core/data-remote/src/main/java/com/kikidan/data_remote/datasource/RemoteYearFortuneDataSourceImpl.kt

@@ -0,0 +1,32 @@
+package com.kikidan.data_remote.datasource
+
+import com.kikidan.data.datasource.RemoteYearFortuneDataSource
+import com.kikidan.data_remote.dto.fortune.YearFortuneResponse
+import com.kikidan.data_remote.dto.fortune.toDomain
+import com.kikidan.data_remote.util.bodyNotNull
+import com.kikidan.domain.model.fortune.YearFortune
+import dagger.Lazy
+import io.ktor.client.HttpClient
+import io.ktor.client.request.get
+import io.ktor.client.request.post
+import javax.inject.Inject
+
+class RemoteYearFortuneDataSourceImpl
+    @Inject
+    constructor(
+        private val client: Lazy<HttpClient>,
+    ) : RemoteYearFortuneDataSource {
+        override suspend fun postYearFortune(year: Int): YearFortune =
+            client
+                .get()
+                .post("api/v1/year-fortunes/$year")
+                .bodyNotNull<YearFortuneResponse>()
+                .toDomain()
+
+        override suspend fun getYearFortune(id: String): YearFortune =
+            client
+                .get()
+                .get("api/v1/year-fortunes/$id")
+                .bodyNotNull<YearFortuneResponse>()
+                .toDomain()
+    }

core/data-remote/src/main/java/com/kikidan/data_remote/di/RemoteDataSourceModule.kt

@@ -3,23 +3,29 @@ package com.kikidan.data_remote.di
 import com.kikidan.data.auth.AuthTokenCacheInvalidator
 import com.kikidan.data.datasource.RemoteAuthDataSource
 import com.kikidan.data.datasource.RemoteChatDataSource
+import com.kikidan.data.datasource.RemoteCompatibilityDataSource
+import com.kikidan.data.datasource.RemoteDayFortuneDataSource
 import com.kikidan.data.datasource.RemoteDeviceTokenDataSource
 import com.kikidan.data.datasource.RemoteFortuneDataSource
 import com.kikidan.data.datasource.RemoteLuckActionDataSource
 import com.kikidan.data.datasource.RemoteNotificationDataSource
 import com.kikidan.data.datasource.RemotePartnerSajuDataSource
 import com.kikidan.data.datasource.RemoteSajuDataSource
 import com.kikidan.data.datasource.RemoteUserDataSource
+import com.kikidan.data.datasource.RemoteYearFortuneDataSource
 import com.kikidan.data_remote.auth.BearerTokenCacheInvalidator
 import com.kikidan.data_remote.datasource.RemoteAuthDataSourceImpl
 import com.kikidan.data_remote.datasource.RemoteChatDataSourceImpl
+import com.kikidan.data_remote.datasource.RemoteCompatibilityDataSourceImpl
+import com.kikidan.data_remote.datasource.RemoteDayFortuneDataSourceImpl
 import com.kikidan.data_remote.datasource.RemoteDeviceTokenDataSourceImpl
 import com.kikidan.data_remote.datasource.RemoteFortuneDataSourceImpl
 import com.kikidan.data_remote.datasource.RemoteLuckActionDataSourceImpl
 import com.kikidan.data_remote.datasource.RemoteNotificationDataSourceImpl
 import com.kikidan.data_remote.datasource.RemotePartnerSajuDataSourceImpl
 import com.kikidan.data_remote.datasource.RemoteSajuDataSourceImpl
 import com.kikidan.data_remote.datasource.RemoteUserDataSourceImpl
+import com.kikidan.data_remote.datasource.RemoteYearFortuneDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -37,6 +43,14 @@ abstract class RemoteDataSourceModule {
     @Singleton
     abstract fun bindAuthTokenCacheInvalidator(impl: BearerTokenCacheInvalidator): AuthTokenCacheInvalidator
 
+    @Binds
+    @Singleton
+    abstract fun bindYearFortuneRemoteDataSource(impl: RemoteYearFortuneDataSourceImpl): RemoteYearFortuneDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindDayFortuneRemoteDataSource(impl: RemoteDayFortuneDataSourceImpl): RemoteDayFortuneDataSource
+
     @Binds
     @Singleton
     abstract fun bindFortuneRemoteDataSource(impl: RemoteFortuneDataSourceImpl): RemoteFortuneDataSource
@@ -68,4 +82,10 @@ abstract class RemoteDataSourceModule {
     @Binds
     @Singleton
     abstract fun bindDeviceTokenDataSource(impl: RemoteDeviceTokenDataSourceImpl): RemoteDeviceTokenDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindCompatibilityRemoteDataSource(
+        impl: RemoteCompatibilityDataSourceImpl,
+    ): RemoteCompatibilityDataSource
 }

core/data-remote/src/main/java/com/kikidan/data_remote/dto/compatibility/CompatibilityResponse.kt

@@ -0,0 +1,43 @@
+package com.kikidan.data_remote.dto.compatibility
+
+import com.kikidan.data_remote.dto.saju.ElementResponse
+import com.kikidan.data_remote.dto.saju.RelationshipTypeResponse
+import com.kikidan.data_remote.dto.saju.toOhaeng
+import com.kikidan.domain.model.compatibility.Compatibility
+import com.kikidan.domain.model.compatibility.CompatibilityOhaeng
+import com.kikidan.domain.model.saju.RelationshipType
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CompatibilityResponse(
+    val id: String,
+    val partnerName: String,
+    val relationshipType: RelationshipTypeResponse,
+    val score: Int,
+    val headline: String,
+    val subheadline: String,
+    val summary: String,
+    val totalAnalysis: String,
+    val analysisBasis: String,
+    val ohaengs: List<CompatibilityOhaengResponse>,
+)
+
+@Serializable
+data class CompatibilityOhaengResponse(
+    val element: ElementResponse,
+    val percentage: Int,
+)
+
+fun CompatibilityResponse.toDomain(): Compatibility =
+    Compatibility(
+        id = id,
+        partnerName = partnerName,
+        relationshipType = RelationshipType(code = relationshipType.code, label = relationshipType.label),
+        score = score,
+        headline = headline,
+        subheadline = subheadline,
+        summary = summary,
+        totalAnalysis = totalAnalysis,
+        analysisBasis = analysisBasis,
+        ohaengs = ohaengs.map { CompatibilityOhaeng(ohaeng = it.element.code.toOhaeng(), percentage = it.percentage) },
+    )

core/data-remote/src/main/java/com/kikidan/data_remote/dto/dayfortune/CreateDayFortuneRequest.kt

@@ -0,0 +1,9 @@
+package com.kikidan.data_remote.dto.dayfortune
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CreateDayFortuneRequest(
+    val purpose: String,
+    val targetDates: List<String>,
+)

core/data-remote/src/main/java/com/kikidan/data_remote/dto/dayfortune/DayFortuneResponse.kt

@@ -0,0 +1,43 @@
+package com.kikidan.data_remote.dto.dayfortune
+
+import com.kikidan.domain.model.dayfortune.DayFortune
+import com.kikidan.domain.model.dayfortune.DayFortunePurpose
+import com.kikidan.domain.model.fortune.FortuneCategory
+import com.kikidan.domain.model.fortune.FortuneCategoryStar
+import kotlinx.serialization.Serializable
+import java.time.LocalDate
+
+@Serializable
+data class DayFortuneResponse(
+    val id: String,
+    val purpose: String,
+    val targetDate: String,
+    val score: Int,
+    val title: String,
+    val content: String,
+    val fortuneCategories: List<FortuneCategoryStarResponse>,
+)
+
+@Serializable
+data class FortuneCategoryStarResponse(
+    val fortuneCategory: String,
+    val star: Int,
+)
+
+fun DayFortuneResponse.toDomain(): DayFortune =
+    DayFortune(
+        id = id,
+        purpose =
+            DayFortunePurpose.entries.find { it.name == purpose }
+                ?: throw IllegalArgumentException("알 수 없는 purpose 입니다: $purpose"),
+        targetDate = LocalDate.parse(targetDate),
+        score = score,
+        title = title,
+        content = content,
+        categoryStars = fortuneCategories.mapNotNull { it.toDomainOrNull() },
+    )
+
+private fun FortuneCategoryStarResponse.toDomainOrNull(): FortuneCategoryStar? {
+    val category = FortuneCategory.entries.find { it.name == fortuneCategory } ?: return null
+    return FortuneCategoryStar(category = category, star = star)
+}