Merge pull request #39 from boostcampwm-2022/16-feature-click

[PR] 장소 검색한 아이템 클릭 시 viewModel 저장해서 MapFragment에서 관측 후 마커 및 패널 이동 구현

Author: koreatlwls

data/src/main/java/com/stop/data/model/nearplace/Place.kt

@@ -4,15 +4,17 @@ import com.stop.domain.model.nearplace.Place
 
 data class Place(
     val name: String,
-    val radius : String,
-    val roadAddressList: List<RoadAddress>
+    val radius: String,
+    val fullAddressRoad: String,
+    val centerLat: Double,
+    val centerLon: Double
 ) {
 
     fun toUseCaseModel() = Place(
         name = name,
         radius = radius,
-        roadAddressList = roadAddressList.map {
-           it.toDomainRoadAddress()
-        }
+        fullAddressRoad = fullAddressRoad,
+        centerLat = centerLat,
+        centerLon = centerLon
     )
 }

data/src/main/java/com/stop/data/model/nearplace/RoadAddress.kt

@@ -2,7 +2,6 @@ package com.stop.data.remote.model.nearplace
 
 import com.squareup.moshi.JsonClass
 import com.stop.data.model.nearplace.Place
-import com.stop.data.model.nearplace.RoadAddress
 
 @JsonClass(generateAdapter = true)
 data class Poi(
@@ -43,24 +42,13 @@ data class Poi(
 ) {
 
     fun toRepositoryModel(): Place {
-        val roadAddressList = newAddressList.newAddress.map {
-            RoadAddress(
-                it.bldNo1,
-                it.bldNo2,
-                it.centerLat.toFloat(),
-                it.centerLon.toFloat(),
-                it.frontLat.toFloat(),
-                it.frontLon.toFloat(),
-                it.fullAddressRoad,
-                it.roadId,
-                it.roadName
-            )
-        }
-
+        val road = newAddressList.newAddress.firstOrNull()
         return Place(
-            name,
-            radius,
-            roadAddressList
+            name = name,
+            radius = radius,
+            fullAddressRoad = road?.fullAddressRoad ?: "",
+            centerLat = road?.centerLat?.toDouble() ?: 0.0,
+            centerLon = road?.centerLon?.toDouble() ?: 0.0
         )
     }
 

data/src/main/java/com/stop/data/remote/model/nearplace/Poi.kt

@@ -11,8 +11,8 @@ interface NearPlaceApiService {
     suspend fun getNearPlaces(
         @Query("version") version: Int,
         @Query("searchKeyword") searchKeyword: String,
-        @Query("centerLon") centerLon: Float,
-        @Query("centerLat") centerLat: Float,
+        @Query("centerLon") centerLon: Double,
+        @Query("centerLat") centerLat: Double,
         @Query("appKey") appKey: String,
     ): NetworkResult<NearPlcaeResponse>
 

data/src/main/java/com/stop/data/remote/network/NearPlaceApiService.kt

@@ -7,8 +7,8 @@ interface NearPlaceRemoteDataSource {
     suspend fun getNearPlaces(
         version : Int,
         searchKeyword: String,
-        centerLon: Float,
-        centerLat: Float,
+        centerLon: Double,
+        centerLat: Double,
         appKey: String
     ): List<Place>
 

data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSource.kt

@@ -12,8 +12,8 @@ internal class NearPlaceRemoteDataSourceImpl @Inject constructor(
     override suspend fun getNearPlaces(
         version: Int,
         searchKeyword: String,
-        centerLon: Float,
-        centerLat: Float,
+        centerLon: Double,
+        centerLat: Double,
         appKey: String
     ): List<Place> {
         val result = nearPlaceApiService.getNearPlaces(

data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSourceImpl.kt

@@ -3,6 +3,8 @@ package com.stop.data.repository
 import com.stop.data.remote.source.nearplace.NearPlaceRemoteDataSource
 import com.stop.domain.model.nearplace.Place
 import com.stop.domain.repository.NearPlaceRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 import javax.inject.Inject
 
 internal class NearPlaceRepositoryImpl @Inject constructor(
@@ -12,13 +14,21 @@ internal class NearPlaceRepositoryImpl @Inject constructor(
     override suspend fun getNearPlaces(
         version: Int,
         searchKeyword: String,
-        centerLon: Float,
-        centerLat: Float,
+        centerLon: Double,
+        centerLat: Double,
         appKey: String
-    ): List<Place> {
-        return nearPlaceRemoteDataSource.getNearPlaces(
-            version, searchKeyword, centerLon, centerLat, appKey
-        ).map { it.toUseCaseModel() }
+    ): Flow<List<Place>> = flow<List<Place>> {
+        emit(
+            nearPlaceRemoteDataSource.getNearPlaces(
+                version,
+                searchKeyword,
+                centerLon,
+                centerLat,
+                appKey
+            ).map {
+                it.toUseCaseModel()
+            }
+        )
     }
 
 }

data/src/main/java/com/stop/data/repository/NearPlaceRepositoryImpl.kt

@@ -10,7 +10,10 @@ java {
 }
 
 dependencies {
-    //Hilt
+    // Hilt
     implementation 'com.google.dagger:hilt-core:2.44'
     kapt 'com.google.dagger:hilt-compiler:2.44'
+
+    // Flow
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
 }

domain/build.gradle

@@ -2,6 +2,8 @@ package com.stop.domain.model.nearplace
 
 data class Place(
     val name: String,
-    val radius : String,
-    val roadAddressList: List<RoadAddress>
+    val radius: String,
+    val fullAddressRoad: String,
+    val centerLat: Double,
+    val centerLon: Double
 )