Merge pull request #75 from Team-Sopetit/feature/#68-feat-happy-adddetail-server

#68 [feat] 행복 루틴 추가하기(상세) 뷰 API 연결

Author: pump9918

app/src/main/AndroidManifest.xml

@@ -45,12 +45,12 @@
         </activity>
 
         <activity
-            android:name=".ui.happyroutine.addlist.HappyAddListActivity"
+            android:name=".ui.happyroutine.list.HappyAddListActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".ui.happyroutine.adddetail.HappyDetailActivity"
+            android:name=".ui.happyroutine.detail.HappyDetailActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 

app/src/main/java/com/sopetit/softie/data/entity/response/HappyCardResponse.kt

@@ -0,0 +1,53 @@
+package com.sopetit.softie.data.entity.response
+
+import com.sopetit.softie.domain.entity.HappyCard
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class HappyCardResponse(
+    @SerialName("title")
+    val title: String,
+    @SerialName("name")
+    val name: String,
+    @SerialName("nameColor")
+    val nameColor: String,
+    @SerialName("iconImageUrl")
+    val iconImageUrl: String,
+    @SerialName("contentImageUrl")
+    val contentImageUrl: String,
+    @SerialName("subRoutines")
+    val subRoutines: List<SubRoutines>
+) {
+    @Serializable
+    data class SubRoutines(
+        @SerialName("subRoutineId")
+        val subRoutineId: Int,
+        @SerialName("content")
+        val content: String,
+        @SerialName("detailContent")
+        val detailContent: String,
+        @SerialName("timeTaken")
+        val timeTaken: String,
+        @SerialName("place")
+        val place: String
+    )
+
+    fun toHappyCard() = HappyCard(
+        title = this.title,
+        name = this.name,
+        nameColor = this.nameColor,
+        iconImageUrl = this.iconImageUrl,
+        contentImageUrl = this.contentImageUrl,
+        subRoutines = this.subRoutines.map { subRoutine ->
+            HappyCard.SubRoutines(
+                subRoutineId = subRoutine.subRoutineId,
+                content = subRoutine.content,
+                detailContent = subRoutine.detailContent,
+                timeTaken = subRoutine.timeTaken,
+                place = subRoutine.place,
+                contentImageUrl = contentImageUrl
+            )
+        }
+    )
+}

app/src/main/java/com/sopetit/softie/data/repositoryImpl/HappinessRoutineRepositoryImpl.kt

@@ -1,6 +1,7 @@
 package com.sopetit.softie.data.repositoryImpl
 
 import com.sopetit.softie.data.source.HappinessRoutineDataSource
+import com.sopetit.softie.domain.entity.HappyCard
 import com.sopetit.softie.domain.entity.HappyChip
 import com.sopetit.softie.domain.entity.HappyContent
 import com.sopetit.softie.domain.repository.HappinessRoutineRepository
@@ -9,6 +10,13 @@ import javax.inject.Inject
 class HappinessRoutineRepositoryImpl @Inject constructor(
     private val happinessRoutineDataSource: HappinessRoutineDataSource
 ) : HappinessRoutineRepository {
+    override suspend fun getHappyCard(routineId: String): Result<HappyCard> =
+        runCatching {
+            happinessRoutineDataSource.getHappyCard(routineId)
+        }.map {
+            requireNotNull(it.data).toHappyCard()
+        }
+
     override suspend fun getHappyChip(): Result<List<HappyChip>> =
         runCatching { happinessRoutineDataSource.getHappyChip() }.map { response ->
             requireNotNull(response.data).toHappyChip()

app/src/main/java/com/sopetit/softie/data/service/HappinessRoutineService.kt

@@ -1,12 +1,19 @@
 package com.sopetit.softie.data.service
 
 import com.sopetit.softie.data.entity.BaseResponse
+import com.sopetit.softie.data.entity.response.HappyCardResponse
 import com.sopetit.softie.data.entity.response.HappyChipResponse
 import com.sopetit.softie.data.entity.response.HappyContentResponse
 import retrofit2.http.GET
+import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface HappinessRoutineService {
+    @GET("api/v1/routines/happiness/routine/{routineId}")
+    suspend fun getHappyCard(
+        @Path("routineId") routineId: String
+    ): BaseResponse<HappyCardResponse>
+
     @GET("api/v1/routines/happiness/themes")
     suspend fun getHappyChip(): BaseResponse<HappyChipResponse>
 

app/src/main/java/com/sopetit/softie/data/source/HappinessRoutineDataSource.kt

@@ -1,6 +1,7 @@
 package com.sopetit.softie.data.source
 
 import com.sopetit.softie.data.entity.BaseResponse
+import com.sopetit.softie.data.entity.response.HappyCardResponse
 import com.sopetit.softie.data.entity.response.HappyChipResponse
 import com.sopetit.softie.data.entity.response.HappyContentResponse
 import com.sopetit.softie.data.service.HappinessRoutineService
@@ -9,6 +10,8 @@ import javax.inject.Inject
 class HappinessRoutineDataSource @Inject constructor(
     private val happinessRoutineService: HappinessRoutineService
 ) {
+    suspend fun getHappyCard(routineId: String): BaseResponse<HappyCardResponse> =
+        happinessRoutineService.getHappyCard(routineId)
     suspend fun getHappyChip(): BaseResponse<HappyChipResponse> =
         happinessRoutineService.getHappyChip()
 

app/src/main/java/com/sopetit/softie/di/RepositoryModule.kt

@@ -23,6 +23,12 @@ abstract class RepositoryModule {
         memberRepositoryImpl: MemberRepositoryImpl
     ): MemberRepository
 
+    /*@Binds
+    @Singleton
+    abstract fun bindToHappyCardRepository(
+        happinessRoutineRepositoryImpl: HappinessRoutineRepositoryImpl
+    ): HappinessRoutineRepository*/
+
     @Binds
     @Singleton
     abstract fun bindToDailyRoutineRepository(

app/src/main/java/com/sopetit/softie/di/RetrofitServiceModule.kt

@@ -17,15 +17,15 @@ object RetrofitServiceModule {
     fun providesMemberService(@RetrofitModule.SoftieType retrofit: Retrofit): MemberService =
         retrofit.create(MemberService::class.java)
 
+    @Provides
+    fun providesHappinessRoutineService(@RetrofitModule.SoftieType retrofit: Retrofit): HappinessRoutineService =
+        retrofit.create(HappinessRoutineService::class.java)
+
     @Provides
     fun providesDailyRoutineService(@RetrofitModule.SoftieType retrofit: Retrofit): DailyRoutineService =
         retrofit.create(DailyRoutineService::class.java)
 
     @Provides
     fun providesDollService(@RetrofitModule.SoftieType retrofit: Retrofit): DollService =
         retrofit.create(DollService::class.java)
-
-    @Provides
-    fun providesHappinessRoutineService(@RetrofitModule.SoftieType retrofit: Retrofit): HappinessRoutineService =
-        retrofit.create(HappinessRoutineService::class.java)
 }

app/src/main/java/com/sopetit/softie/domain/entity/HappyCard.kt

@@ -1,22 +1,19 @@
 package com.sopetit.softie.domain.entity
 
-import androidx.annotation.DrawableRes
-
 data class HappyCard(
-    val categoryId: Int,
+    val title: String,
     val name: String,
     val nameColor: String,
-    val title: String,
-    @DrawableRes val iconImageUrl: Int,
-    val routines: List<Routines>
+    val iconImageUrl: String,
+    val contentImageUrl: String,
+    val subRoutines: List<SubRoutines>
 ) {
-    data class Routines(
-        val routineId: Int,
-        @DrawableRes val cardImageUrl: Int,
+    data class SubRoutines(
+        val subRoutineId: Int,
         val content: String,
-        val detailTitle: String,
         val detailContent: String,
-        val detailTime: String,
-        val detailPlace: String
+        val timeTaken: String,
+        val place: String,
+        val contentImageUrl: String
     )
 }

app/src/main/java/com/sopetit/softie/domain/repository/HappinessRoutineRepository.kt

@@ -1,9 +1,11 @@
 package com.sopetit.softie.domain.repository
 
+import com.sopetit.softie.domain.entity.HappyCard
 import com.sopetit.softie.domain.entity.HappyChip
 import com.sopetit.softie.domain.entity.HappyContent
 
 interface HappinessRoutineRepository {
+    suspend fun getHappyCard(routineId: String): Result<HappyCard>
     suspend fun getHappyChip(): Result<List<HappyChip>>
     suspend fun getHappyContent(themeId: Int): Result<List<HappyContent>>
 }

app/src/main/java/com/sopetit/softie/domain/usecase/GetHappyCardUseCase.kt

@@ -0,0 +1,11 @@
+package com.sopetit.softie.domain.usecase
+
+import com.sopetit.softie.domain.repository.HappinessRoutineRepository
+import javax.inject.Inject
+
+class GetHappyCardUseCase @Inject constructor(
+    private val happinessRoutineRepository: HappinessRoutineRepository
+) {
+    suspend operator fun invoke(routineId: String) =
+        happinessRoutineRepository.getHappyCard(routineId)
+}