[MERGE] #36 -> develop

[FEAT/#36] 홈 뷰 / 서버통신 구현

app/src/main/java/co/orange/ddanzi/di/DataSourceModule.kt

@@ -1,7 +1,9 @@
 package co.orange.ddanzi.di
 
 import co.orange.data.dataSource.AuthDataSource
+import co.orange.data.dataSource.HomeDataSource
 import co.orange.data.dataSourceImpl.AuthDataSourceImpl
+import co.orange.data.dataSourceImpl.HomeDataSourceImpl
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -14,4 +16,8 @@ object DataSourceModule {
     @Provides
     @Singleton
     fun provideAuthDataSource(authDataSourceImpl: AuthDataSourceImpl): AuthDataSource = authDataSourceImpl
+
+    @Provides
+    @Singleton
+    fun provideHomeDataSource(homeDataSourceImpl: HomeDataSourceImpl): HomeDataSource = homeDataSourceImpl
 }

app/src/main/java/co/orange/ddanzi/di/RepositoryModule.kt

@@ -1,7 +1,9 @@
 package co.orange.ddanzi.di
 
 import co.orange.data.repositoryImpl.AuthRepositoryImpl
+import co.orange.data.repositoryImpl.HomeRepositoryImpl
 import co.orange.domain.repository.AuthRepository
+import co.orange.domain.repository.HomeRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -14,4 +16,8 @@ object RepositoryModule {
     @Provides
     @Singleton
     fun provideAuthRepository(authRepositoryImpl: AuthRepositoryImpl): AuthRepository = authRepositoryImpl
+
+    @Provides
+    @Singleton
+    fun provideHomeRepository(homeRepositoryImpl: HomeRepositoryImpl): HomeRepository = homeRepositoryImpl
 }

app/src/main/java/co/orange/ddanzi/di/ServiceModule.kt

@@ -1,6 +1,7 @@
 package co.orange.ddanzi.di
 
 import co.orange.data.service.AuthService
+import co.orange.data.service.HomeService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -16,4 +17,11 @@ object ServiceModule {
     fun provideAuthService(
         @RetrofitQualifier.NOTOKEN retrofit: Retrofit,
     ): AuthService = retrofit.create(AuthService::class.java)
+
+    // TODO 추후 수정
+    @Provides
+    @Singleton
+    fun provideHomeService(
+        @RetrofitQualifier.NOTOKEN retrofit: Retrofit,
+    ): HomeService = retrofit.create(HomeService::class.java)
 }

data/src/main/java/co/orange/data/dataSource/HomeDataSource.kt

@@ -0,0 +1,8 @@
+package co.orange.data.dataSource
+
+import co.orange.data.dto.BaseResponse
+import co.orange.data.dto.response.HomeDto
+
+interface HomeDataSource {
+    suspend fun getHomeData(): BaseResponse<HomeDto>
+}

data/src/main/java/co/orange/data/dataSourceImpl/HomeDataSourceImpl.kt

@@ -0,0 +1,15 @@
+package co.orange.data.dataSourceImpl
+
+import co.orange.data.dataSource.HomeDataSource
+import co.orange.data.dto.BaseResponse
+import co.orange.data.dto.response.HomeDto
+import co.orange.data.service.HomeService
+import javax.inject.Inject
+
+data class HomeDataSourceImpl
+    @Inject
+    constructor(
+        private val homeService: HomeService,
+    ) : HomeDataSource {
+        override suspend fun getHomeData(): BaseResponse<HomeDto> = homeService.getHomeData()
+    }

data/src/main/java/co/orange/data/dto/BaseResponse.kt

@@ -5,14 +5,14 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class BaseResponse<T>(
-    @SerialName("success")
-    val success: Boolean,
-    @SerialName("response")
-    val response: T,
-    @SerialName("code")
-    val code: String,
-    @SerialName("message")
-    val message: String,
     @SerialName("status")
     val status: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("timestamp")
+    val timestamp: String,
+    @SerialName("path")
+    val path: String,
+    @SerialName("data")
+    val data: T,
 )

data/src/main/java/co/orange/data/dto/response/HomeDto.kt

@@ -0,0 +1,15 @@
+package co.orange.data.dto.response
+
+import co.orange.domain.entity.response.HomeModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class HomeDto(
+    @SerialName("homeImgUrl")
+    val homeImgUrl: String,
+    @SerialName("productList")
+    val productList: List<ProductDto>,
+) {
+    fun toModel() = HomeModel(homeImgUrl, productList.map { it.toModel() })
+}

data/src/main/java/co/orange/data/dto/response/ProductDto.kt

@@ -0,0 +1,25 @@
+package co.orange.data.dto.response
+
+import co.orange.domain.entity.response.ProductModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ProductDto(
+    @SerialName("productId")
+    val productId: String,
+    @SerialName("kakaoProductId")
+    val kakaoProductId: Long,
+    @SerialName("name")
+    val name: String,
+    @SerialName("imgUrl")
+    val imgUrl: String,
+    @SerialName("originPrice")
+    val originPrice: Int,
+    @SerialName("salePrice")
+    val salePrice: Int,
+    @SerialName("interestCount")
+    val interestCount: Int,
+) {
+    fun toModel() = ProductModel(productId, kakaoProductId, name, imgUrl, originPrice, salePrice, interestCount)
+}

data/src/main/java/co/orange/data/repositoryImpl/AuthRepositoryImpl.kt

@@ -20,6 +20,6 @@ class AuthRepositoryImpl
                 authDataSource.postReissueTokens(
                     authorization,
                     request.toDto(),
-                ).response.toModel()
+                ).data.toModel()
             }
     }

data/src/main/java/co/orange/data/repositoryImpl/HomeRepositoryImpl.kt

@@ -0,0 +1,14 @@
+package co.orange.data.repositoryImpl
+
+import co.orange.data.dataSource.HomeDataSource
+import co.orange.domain.entity.response.HomeModel
+import co.orange.domain.repository.HomeRepository
+import javax.inject.Inject
+
+class HomeRepositoryImpl
+    @Inject
+    constructor(
+        private val homeDataSource: HomeDataSource,
+    ) : HomeRepository {
+        override suspend fun getHomeData(): Result<HomeModel> = runCatching { homeDataSource.getHomeData().data.toModel() }
+    }

data/src/main/java/co/orange/data/service/HomeService.kt

@@ -0,0 +1,10 @@
+package co.orange.data.service
+
+import co.orange.data.dto.BaseResponse
+import co.orange.data.dto.response.HomeDto
+import retrofit2.http.GET
+
+interface HomeService {
+    @GET("/api/v1/home")
+    suspend fun getHomeData(): BaseResponse<HomeDto>
+}

domain/src/main/kotlin/co/orange/domain/entity/response/HomeModel.kt

@@ -0,0 +1,6 @@
+package co.orange.domain.entity.response
+
+data class HomeModel(
+    val homeImgUrl: String,
+    val productList: List<ProductModel>,
+)

domain/src/main/kotlin/co/orange/domain/entity/response/ProductModel.kt

@@ -1,10 +1,11 @@
 package co.orange.domain.entity.response
 
 data class ProductModel(
-    val productId: Long,
+    val productId: String,
+    val kakaoProductId: Long,
     val name: String,
     val imgUrl: String,
     val originPrice: Int,
     val salePrice: Int,
     val interestCount: Int,
-)
+)

domain/src/main/kotlin/co/orange/domain/repository/HomeRepository.kt

@@ -0,0 +1,7 @@
+package co.orange.domain.repository
+
+import co.orange.domain.entity.response.HomeModel
+
+interface HomeRepository {
+    suspend fun getHomeData(): Result<HomeModel>
+}

presentation/src/main/java/co/orange/presentation/detail/DetailActivity.kt

@@ -107,7 +107,7 @@ class DetailActivity : BaseActivity<ActivityDetailBinding>(R.layout.activity_det
         @JvmStatic
         fun createIntent(
             context: Context,
-            productId: Long,
+            productId: String,
             productUrl: String,
             originPrice: Int,
             salePrice: Int,

presentation/src/main/java/co/orange/presentation/main/home/HomeAdapter.kt

@@ -16,6 +16,7 @@ class HomeAdapter(
     private val likeClick: (Unit) -> (Unit),
 ) : ListAdapter<ProductModel, RecyclerView.ViewHolder>(diffUtil) {
     private var itemList = mutableListOf<ProductModel>()
+    private var bannerItem: String? = null
 
     override fun onCreateViewHolder(
         parent: ViewGroup,
@@ -52,7 +53,7 @@ class HomeAdapter(
     ) {
         when (holder) {
             is HomeBannerViewHolder -> {
-                holder.onBind()
+                bannerItem?.let { holder.onBind(it) }
             }
 
             is HomeProductViewHolder -> {
@@ -73,8 +74,8 @@ class HomeAdapter(
             else -> VIEW_TYPE_PRODUCT
         }
 
-    fun addItemList(newItems: List<ProductModel>) {
-        this.itemList.addAll(newItems)
+    fun addBannerItem(bannerUrl: String) {
+        this.bannerItem = bannerUrl
         notifyDataSetChanged()
     }
 
@@ -83,14 +84,6 @@ class HomeAdapter(
         notifyDataSetChanged()
     }
 
-    fun removeItem(position: Int) {
-        if (this.itemList.isNotEmpty()) {
-            this.itemList.removeAt(position)
-            notifyItemRemoved(position + HEADER_COUNT)
-            notifyItemRangeChanged(position + HEADER_COUNT, itemCount)
-        }
-    }
-
     companion object {
         private val diffUtil =
             ItemDiffCallback<ProductModel>(

presentation/src/main/java/co/orange/presentation/main/home/HomeBannerViewHolder.kt

@@ -2,16 +2,20 @@ package co.orange.presentation.main.home
 
 import androidx.recyclerview.widget.RecyclerView
 import co.orange.core.extension.setOnSingleClickListener
+import coil.load
 import kr.genti.presentation.databinding.ItemHomeBannerBinding
 
 class HomeBannerViewHolder(
     val binding: ItemHomeBannerBinding,
     val bannerClick: (Unit) -> (Unit),
 ) :
     RecyclerView.ViewHolder(binding.root) {
-    fun onBind() {
-        binding.root.setOnSingleClickListener {
-            bannerClick
+    fun onBind(item: String) {
+        with(binding) {
+            ivHomeBanner.load(item)
+            root.setOnSingleClickListener {
+                bannerClick
+            }
         }
     }
 }

presentation/src/main/java/co/orange/presentation/main/home/HomeFragment.kt

@@ -14,6 +14,9 @@ import co.orange.core.base.BaseFragment
 import co.orange.core.extension.dpToPx
 import co.orange.core.extension.initOnBackPressedListener
 import co.orange.core.extension.setOnSingleClickListener
+import co.orange.core.extension.stringOf
+import co.orange.core.extension.toast
+import co.orange.core.state.UiState
 import co.orange.domain.entity.response.ProductModel
 import co.orange.presentation.auth.login.LoginActivity
 import co.orange.presentation.detail.DetailActivity
@@ -51,8 +54,8 @@ class HomeFragment() : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home)
         searchSellProduct()
         setGridRecyclerView()
         setRecyclerViewDeco()
-        setItemList()
         observeCheckedAgainState()
+        observeGetHomeDataState()
     }
 
     private fun initView() {
@@ -145,10 +148,6 @@ class HomeFragment() : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home)
         )
     }
 
-    private fun setItemList() {
-        adapter.setItemList(viewModel.mockItemList)
-    }
-
     private fun observeCheckedAgainState() {
         viewModel.isCheckedAgain.flowWithLifecycle(lifecycle).onEach { isChecked ->
             if (isChecked) {
@@ -158,6 +157,20 @@ class HomeFragment() : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home)
         }.launchIn(lifecycleScope)
     }
 
+    private fun observeGetHomeDataState() {
+        viewModel.getHomeDataState.flowWithLifecycle(lifecycle).onEach { state ->
+            when (state) {
+                is UiState.Success -> {
+                    adapter.addBannerItem(state.data.homeImgUrl)
+                    adapter.setItemList(state.data.productList)
+                }
+
+                is UiState.Failure -> toast(stringOf(R.string.error_msg))
+                else -> return@onEach
+            }
+        }.launchIn(lifecycleScope)
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _adapter = null