feat : 데이터 클래스 통합

koreatlwls · koreatlwls · commit 6eec9233e6cc · 2022-12-05T01:22:24.000+09:00
diff --git a/data/src/main/java/com/stop/data/local/model/RecentPlaceSearchEntity.kt b/data/src/main/java/com/stop/data/local/model/RecentPlaceSearchEntity.kt
@@ -2,7 +2,7 @@ package com.stop.data.local.model
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.stop.data.model.alarm.RecentPlaceSearchItem
+import com.stop.data.model.nearplace.PlaceRepositoryItem
 
 @Entity
 data class RecentPlaceSearchEntity(
@@ -15,7 +15,7 @@ data class RecentPlaceSearchEntity(
     val centerLon: Double
 ) {
 
-    fun toRepositoryModel() = RecentPlaceSearchItem(
+    fun toRepositoryModel() = PlaceRepositoryItem(
         name = name,
         radius = radius,
         fullAddressRoad = fullAddressRoad,
diff --git a/data/src/main/java/com/stop/data/local/source/alarm/RecentPlaceSearchLocalDataSource.kt b/data/src/main/java/com/stop/data/local/source/alarm/RecentPlaceSearchLocalDataSource.kt
@@ -1,13 +1,13 @@
 package com.stop.data.local.source.alarm
 
-import com.stop.data.model.alarm.RecentPlaceSearchItem
+import com.stop.data.model.nearplace.PlaceRepositoryItem
 import kotlinx.coroutines.flow.Flow
 
 interface RecentPlaceSearchLocalDataSource {
 
-    suspend fun insertRecentPlaceSearch(recentPlaceSearchItem: RecentPlaceSearchItem)
+    suspend fun insertRecentPlaceSearch(placeRepositoryItem: PlaceRepositoryItem)
 
-    fun getAllRecentPlaceSearch(): Flow<List<RecentPlaceSearchItem>>
+    fun getAllRecentPlaceSearch(): Flow<List<PlaceRepositoryItem>>
 
     suspend fun deleteAllRecentPlaceSearch()
 
diff --git a/data/src/main/java/com/stop/data/local/source/alarm/RecentPlaceSearchLocalDataSourceImpl.kt b/data/src/main/java/com/stop/data/local/source/alarm/RecentPlaceSearchLocalDataSourceImpl.kt
@@ -1,7 +1,7 @@
 package com.stop.data.local.source.alarm
 
 import com.stop.data.local.database.dao.RecentPlaceSearchDao
-import com.stop.data.model.alarm.RecentPlaceSearchItem
+import com.stop.data.model.nearplace.PlaceRepositoryItem
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
@@ -10,14 +10,14 @@ class RecentPlaceSearchLocalDataSourceImpl @Inject constructor(
     private val recentPlaceSearchDao: RecentPlaceSearchDao
 ) : RecentPlaceSearchLocalDataSource {
 
-    override suspend fun insertRecentPlaceSearch(recentPlaceSearchItem: RecentPlaceSearchItem) {
-        recentPlaceSearchDao.insertRecentPlaceSearchEntity(recentPlaceSearchItem.toDataSourceModel())
+    override suspend fun insertRecentPlaceSearch(placeRepositoryItem: PlaceRepositoryItem) {
+        recentPlaceSearchDao.insertRecentPlaceSearchEntity(placeRepositoryItem.toDataSourceModel())
     }
 
-    override fun getAllRecentPlaceSearch(): Flow<List<RecentPlaceSearchItem>> {
-        return recentPlaceSearchDao.getAllRecentPlaceSearchEntity().map { recentPlaceSearchEntities ->
-            recentPlaceSearchEntities.map { recentPlaceSearchEntity ->
-                recentPlaceSearchEntity.toRepositoryModel()
+    override fun getAllRecentPlaceSearch(): Flow<List<PlaceRepositoryItem>> {
+        return recentPlaceSearchDao.getAllRecentPlaceSearchEntity().map { placeEntities ->
+            placeEntities.map { placeEntity ->
+                placeEntity.toRepositoryModel()
             }
         }
     }
diff --git a/data/src/main/java/com/stop/data/model/alarm/RecentPlaceSearchItem.kt b/data/src/main/java/com/stop/data/model/alarm/RecentPlaceSearchItem.kt
diff --git a/data/src/main/java/com/stop/data/model/nearplace/PlaceRepositoryItem.kt b/data/src/main/java/com/stop/data/model/nearplace/PlaceRepositoryItem.kt
@@ -1,24 +1,33 @@
 package com.stop.data.model.nearplace
 
-import com.stop.domain.model.nearplace.Place
+import com.stop.data.local.model.RecentPlaceSearchEntity
+import com.stop.domain.model.nearplace.PlaceUseCaseItem
 import com.stop.domain.model.nowlocation.NowStationLocationUseCaseItem
 
-data class Place(
+data class PlaceRepositoryItem(
     val name: String,
     val radius: String,
     val fullAddressRoad: String,
     val centerLat: Double,
     val centerLon: Double
 ) {
 
-    fun toUseCaseModel() = Place(
+    fun toUseCaseModel() = PlaceUseCaseItem(
         name = name,
         radius = radius,
         fullAddressRoad = fullAddressRoad,
         centerLat = centerLat,
         centerLon = centerLon
     )
 
+    fun toDataSourceModel() = RecentPlaceSearchEntity(
+        name = name,
+        radius = radius,
+        fullAddressRoad = fullAddressRoad,
+        centerLat = centerLat,
+        centerLon = centerLon,
+    )
+
     fun toNowStationLocationUseCaseModel() = NowStationLocationUseCaseItem(
         name = name,
         latitude = centerLat.toString(),
diff --git a/data/src/main/java/com/stop/data/remote/model/nearplace/Poi.kt b/data/src/main/java/com/stop/data/remote/model/nearplace/Poi.kt
@@ -1,7 +1,7 @@
 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.PlaceRepositoryItem
 
 @JsonClass(generateAdapter = true)
 data class Poi(
@@ -41,9 +41,9 @@ data class Poi(
     val zipCode: String
 ) {
 
-    fun toRepositoryModel(): Place {
+    fun toRepositoryModel(): PlaceRepositoryItem {
         val road = newAddressList.newAddress.firstOrNull()
-        return Place(
+        return PlaceRepositoryItem(
             name = name,
             radius = radius,
             fullAddressRoad = road?.fullAddressRoad ?: "",
diff --git a/data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSource.kt b/data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSource.kt
@@ -1,13 +1,13 @@
 package com.stop.data.remote.source.nearplace
 
-import com.stop.data.model.nearplace.Place
+import com.stop.data.model.nearplace.PlaceRepositoryItem
 
 interface NearPlaceRemoteDataSource {
 
     suspend fun getNearPlaces(
         searchKeyword: String,
         centerLon: Double,
         centerLat: Double
-    ): Result<List<Place>>
+    ): Result<List<PlaceRepositoryItem>>
 
 }
diff --git a/data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSourceImpl.kt b/data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSourceImpl.kt
@@ -1,6 +1,6 @@
 package com.stop.data.remote.source.nearplace
 
-import com.stop.data.model.nearplace.Place
+import com.stop.data.model.nearplace.PlaceRepositoryItem
 import com.stop.data.remote.model.NetworkResult
 import com.stop.data.remote.network.TmapApiService
 import javax.inject.Inject
@@ -13,7 +13,7 @@ internal class NearPlaceRemoteDataSourceImpl @Inject constructor(
         searchKeyword: String,
         centerLon: Double,
         centerLat: Double
-    ): Result<List<Place>> {
+    ): Result<List<PlaceRepositoryItem>> {
         val result = tmapApiService.getNearPlaces(
             searchKeyword = searchKeyword,
             centerLon = centerLon,
diff --git a/data/src/main/java/com/stop/data/repository/NearPlaceRepositoryImpl.kt b/data/src/main/java/com/stop/data/repository/NearPlaceRepositoryImpl.kt
@@ -1,7 +1,7 @@
 package com.stop.data.repository
 
 import com.stop.data.remote.source.nearplace.NearPlaceRemoteDataSource
-import com.stop.domain.model.nearplace.Place
+import com.stop.domain.model.nearplace.PlaceUseCaseItem
 import com.stop.domain.model.nowlocation.NowStationLocationUseCaseItem
 import com.stop.domain.repository.NearPlaceRepository
 import javax.inject.Inject
@@ -14,7 +14,7 @@ internal class NearPlaceRepositoryImpl @Inject constructor(
         searchKeyword: String,
         centerLon: Double,
         centerLat: Double
-    ): List<Place> {
+    ): List<PlaceUseCaseItem> {
         return nearPlaceRemoteDataSource.getNearPlaces(
             searchKeyword = searchKeyword,
             centerLon = centerLon,
@@ -25,7 +25,7 @@ internal class NearPlaceRepositoryImpl @Inject constructor(
             }
         }.onFailure {
             throw it
-        }.getOrDefault(emptyList()) as List<Place>
+        }.getOrDefault(emptyList()) as List<PlaceUseCaseItem>
     }
 
     override suspend fun getNowStationLocationInfo(
diff --git a/data/src/main/java/com/stop/data/repository/RecentPlaceSearchRepositoryImpl.kt b/data/src/main/java/com/stop/data/repository/RecentPlaceSearchRepositoryImpl.kt
@@ -1,8 +1,8 @@
 package com.stop.data.repository
 
 import com.stop.data.local.source.alarm.RecentPlaceSearchLocalDataSource
-import com.stop.data.model.alarm.RecentPlaceSearchItem
-import com.stop.domain.model.nearplace.RecentPlaceSearch
+import com.stop.data.model.nearplace.PlaceRepositoryItem
+import com.stop.domain.model.nearplace.PlaceUseCaseItem
 import com.stop.domain.repository.RecentPlaceSearchRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -12,22 +12,22 @@ class RecentPlaceSearchRepositoryImpl @Inject constructor(
     private val recentPlaceSearchLocalDataSource: RecentPlaceSearchLocalDataSource
 ) : RecentPlaceSearchRepository {
 
-    override suspend fun insertRecentPlaceSearch(recentPlaceSearch: RecentPlaceSearch) {
+    override suspend fun insertRecentPlaceSearch(placeUseCaseItem: PlaceUseCaseItem) {
         recentPlaceSearchLocalDataSource.insertRecentPlaceSearch(
-            RecentPlaceSearchItem(
-                name = recentPlaceSearch.name,
-                radius = recentPlaceSearch.radius,
-                fullAddressRoad = recentPlaceSearch.fullAddressRoad,
-                centerLat = recentPlaceSearch.centerLat,
-                centerLon = recentPlaceSearch.centerLon,
+            PlaceRepositoryItem(
+                name = placeUseCaseItem.name,
+                radius = placeUseCaseItem.radius,
+                fullAddressRoad = placeUseCaseItem.fullAddressRoad,
+                centerLat = placeUseCaseItem.centerLat,
+                centerLon = placeUseCaseItem.centerLon,
             )
         )
     }
 
-    override fun getAllRecentPlaceSearch(): Flow<List<RecentPlaceSearch>> {
-        return recentPlaceSearchLocalDataSource.getAllRecentPlaceSearch().map { recentPlaceSearchItems ->
-            recentPlaceSearchItems.map { recentPlaceSearchItem ->
-                recentPlaceSearchItem.toUseCaseModel()
+    override fun getAllRecentPlaceSearch(): Flow<List<PlaceUseCaseItem>> {
+        return recentPlaceSearchLocalDataSource.getAllRecentPlaceSearch().map { placeRepositoryItems ->
+            placeRepositoryItems.map { placeRepositoryItem ->
+                placeRepositoryItem.toUseCaseModel()
             }
         }
     }
diff --git a/domain/src/main/java/com/stop/domain/model/nearplace/PlaceUseCaseItem.kt b/domain/src/main/java/com/stop/domain/model/nearplace/PlaceUseCaseItem.kt
@@ -1,6 +1,6 @@
 package com.stop.domain.model.nearplace
 
-data class Place(
+data class PlaceUseCaseItem(
     val name: String,
     val radius: String,
     val fullAddressRoad: String,
diff --git a/domain/src/main/java/com/stop/domain/model/nearplace/RecentPlaceSearch.kt b/domain/src/main/java/com/stop/domain/model/nearplace/RecentPlaceSearch.kt
diff --git a/domain/src/main/java/com/stop/domain/repository/NearPlaceRepository.kt b/domain/src/main/java/com/stop/domain/repository/NearPlaceRepository.kt
@@ -1,6 +1,6 @@
 package com.stop.domain.repository
 
-import com.stop.domain.model.nearplace.Place
+import com.stop.domain.model.nearplace.PlaceUseCaseItem
 import com.stop.domain.model.nowlocation.NowStationLocationUseCaseItem
 
 interface NearPlaceRepository {
@@ -9,7 +9,7 @@ interface NearPlaceRepository {
         searchKeyword: String,
         centerLon: Double,
         centerLat: Double
-    ): List<Place>
+    ): List<PlaceUseCaseItem>
 
     suspend fun getNowStationLocationInfo(
         searchKeyword: String,
diff --git a/domain/src/main/java/com/stop/domain/repository/RecentPlaceSearchRepository.kt b/domain/src/main/java/com/stop/domain/repository/RecentPlaceSearchRepository.kt
@@ -1,13 +1,13 @@
 package com.stop.domain.repository
 
-import com.stop.domain.model.nearplace.RecentPlaceSearch
+import com.stop.domain.model.nearplace.PlaceUseCaseItem
 import kotlinx.coroutines.flow.Flow
 
 interface RecentPlaceSearchRepository {
 
-    suspend fun insertRecentPlaceSearch(recentPlaceSearch: RecentPlaceSearch)
+    suspend fun insertRecentPlaceSearch(placeUseCaseItem: PlaceUseCaseItem)
 
-    fun getAllRecentPlaceSearch(): Flow<List<RecentPlaceSearch>>
+    fun getAllRecentPlaceSearch(): Flow<List<PlaceUseCaseItem>>
 
     suspend fun deleteAllRecentPlaceSearch()
 
diff --git a/domain/src/main/java/com/stop/domain/usecase/nearplace/GetNearPlacesUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/nearplace/GetNearPlacesUseCase.kt
@@ -1,13 +1,13 @@
 package com.stop.domain.usecase.nearplace
 
-import com.stop.domain.model.nearplace.Place
+import com.stop.domain.model.nearplace.PlaceUseCaseItem
 
 interface GetNearPlacesUseCase {
 
     suspend fun getNearPlaces(
         searchKeyword: String,
         centerLon: Double,
         centerLat: Double
-    ): List<Place>
+    ): List<PlaceUseCaseItem>
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nearplace/GetNearPlacesUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/nearplace/GetNearPlacesUseCaseImpl.kt
@@ -1,6 +1,6 @@
 package com.stop.domain.usecase.nearplace
 
-import com.stop.domain.model.nearplace.Place
+import com.stop.domain.model.nearplace.PlaceUseCaseItem
 import com.stop.domain.repository.NearPlaceRepository
 import javax.inject.Inject
 
@@ -12,7 +12,7 @@ internal class GetNearPlacesUseCaseImpl @Inject constructor(
         searchKeyword: String,
         centerLon: Double,
         centerLat: Double,
-    ): List<Place> =
+    ): List<PlaceUseCaseItem> =
         nearPlaceRepository.getNearPlaces(
             searchKeyword,
             centerLon,
diff --git a/domain/src/main/java/com/stop/domain/usecase/nearplace/GetRecentPlaceSearchUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/nearplace/GetRecentPlaceSearchUseCase.kt
@@ -1,10 +1,10 @@
 package com.stop.domain.usecase.nearplace
 
-import com.stop.domain.model.nearplace.RecentPlaceSearch
+import com.stop.domain.model.nearplace.PlaceUseCaseItem
 import kotlinx.coroutines.flow.Flow
 
 interface GetRecentPlaceSearchUseCase {
 
-    fun getAllRecentPlaceSearch(): Flow<List<RecentPlaceSearch>>
+    fun getAllRecentPlaceSearch(): Flow<List<PlaceUseCaseItem>>
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nearplace/GetRecentPlaceSearchUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/nearplace/GetRecentPlaceSearchUseCaseImpl.kt
@@ -1,6 +1,6 @@
 package com.stop.domain.usecase.nearplace
 
-import com.stop.domain.model.nearplace.RecentPlaceSearch
+import com.stop.domain.model.nearplace.PlaceUseCaseItem
 import com.stop.domain.repository.RecentPlaceSearchRepository
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
@@ -9,7 +9,7 @@ class GetRecentPlaceSearchUseCaseImpl @Inject constructor(
     private val recentPlaceSearchRepository: RecentPlaceSearchRepository
 ) : GetRecentPlaceSearchUseCase {
 
-    override fun getAllRecentPlaceSearch(): Flow<List<RecentPlaceSearch>> {
+    override fun getAllRecentPlaceSearch(): Flow<List<PlaceUseCaseItem>> {
         return recentPlaceSearchRepository.getAllRecentPlaceSearch()
     }
 
diff --git a/domain/src/main/java/com/stop/domain/usecase/nearplace/InsertRecentPlaceSearchUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/nearplace/InsertRecentPlaceSearchUseCase.kt
@@ -1,9 +1,9 @@
 package com.stop.domain.usecase.nearplace
 
-import com.stop.domain.model.nearplace.RecentPlaceSearch
+import com.stop.domain.model.nearplace.PlaceUseCaseItem
 
 interface InsertRecentPlaceSearchUseCase {
 
-    suspend fun insertRecentPlaceSearch(recentPlaceSearch: RecentPlaceSearch)
+    suspend fun insertRecentPlaceSearch(placeUseCaseItem: PlaceUseCaseItem)
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/nearplace/InsertRecentPlaceSearchUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/nearplace/InsertRecentPlaceSearchUseCaseImpl.kt
diff --git a/presentation/src/main/java/com/stop/ui/map/MapFragment.kt b/presentation/src/main/java/com/stop/ui/map/MapFragment.kt
diff --git a/presentation/src/main/java/com/stop/ui/placesearch/NearPlaceAdapter.kt b/presentation/src/main/java/com/stop/ui/placesearch/NearPlaceAdapter.kt
diff --git a/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchFragment.kt b/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchFragment.kt
diff --git a/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchViewModel.kt b/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchViewModel.kt
diff --git a/presentation/src/main/res/layout/item_near_place.xml b/presentation/src/main/res/layout/item_near_place.xml
