Merge branch 'refs/heads/feat/#117-place-search-api' into feat/#122-p…

…lace-duplicated-api
SOPT-all · Jan 22, 2025 · 1a9bab8 · 1a9bab8
2 parents d327151 + be2bc37
commit 1a9bab8
Show file tree

Hide file tree

Showing 11 changed files with 148 additions and 42 deletions.
diff --git a/app/src/main/java/com/spoony/spoony/data/datasource/PlaceDataSource.kt b/app/src/main/java/com/spoony/spoony/data/datasource/PlaceDataSource.kt
@@ -0,0 +1,8 @@
+package com.spoony.spoony.data.datasource
+
+import com.spoony.spoony.data.dto.response.BaseResponse
+import com.spoony.spoony.data.dto.response.SearchPlaceData
+
+interface PlaceDataSource {
+    suspend fun searchPlace(query: String, display: Int): BaseResponse<SearchPlaceData>
+}
diff --git a/app/src/main/java/com/spoony/spoony/data/datasourceimpl/PlaceDataSourceImpl.kt b/app/src/main/java/com/spoony/spoony/data/datasourceimpl/PlaceDataSourceImpl.kt
@@ -0,0 +1,17 @@
+package com.spoony.spoony.data.datasourceimpl
+
+import com.spoony.spoony.data.datasource.PlaceDataSource
+import com.spoony.spoony.data.dto.response.BaseResponse
+import com.spoony.spoony.data.dto.response.SearchPlaceData
+import com.spoony.spoony.data.service.PlaceService
+import javax.inject.Inject
+
+class PlaceDataSourceImpl @Inject constructor(
+    private val placeService: PlaceService
+) : PlaceDataSource {
+    override suspend fun searchPlace(
+        query: String,
+        display: Int
+    ): BaseResponse<SearchPlaceData> =
+        placeService.searchPlace(query, display)
+}
diff --git a/app/src/main/java/com/spoony/spoony/data/di/DataSourceModule.kt b/app/src/main/java/com/spoony/spoony/data/di/DataSourceModule.kt
@@ -1,7 +1,9 @@
 package com.spoony.spoony.data.di
 
 import com.spoony.spoony.data.datasource.DummyRemoteDataSource
+import com.spoony.spoony.data.datasource.PlaceDataSource
 import com.spoony.spoony.data.datasourceimpl.DummyRemoteDataSourceImpl
+import com.spoony.spoony.data.datasourceimpl.PlaceDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -13,5 +15,13 @@ import javax.inject.Singleton
 abstract class DataSourceModule {
     @Binds
     @Singleton
-    abstract fun bindDummyDataSource(dummyRemoteDataSourceImpl: DummyRemoteDataSourceImpl): DummyRemoteDataSource
+    abstract fun bindDummyDataSource(
+        dummyRemoteDataSourceImpl: DummyRemoteDataSourceImpl
+    ): DummyRemoteDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindPlaceDataSource(
+        placeDataSourceImpl: PlaceDataSourceImpl
+    ): PlaceDataSource
 }
diff --git a/app/src/main/java/com/spoony/spoony/data/di/ServiceModule.kt b/app/src/main/java/com/spoony/spoony/data/di/ServiceModule.kt
@@ -1,6 +1,7 @@
 package com.spoony.spoony.data.di
 
 import com.spoony.spoony.data.service.DummyService
+import com.spoony.spoony.data.service.PlaceService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -15,4 +16,9 @@ object ServiceModule {
     @Singleton
     fun provideDummyService(retrofit: Retrofit): DummyService =
         retrofit.create(DummyService::class.java)
+
+    @Provides
+    @Singleton
+    fun providePlaceService(retrofit: Retrofit): PlaceService =
+        retrofit.create(PlaceService::class.java)
 }
diff --git a/app/src/main/java/com/spoony/spoony/data/dto/response/BaseResponseDTO.kt b/app/src/main/java/com/spoony/spoony/data/dto/response/BaseResponseDTO.kt
@@ -0,0 +1,20 @@
+package com.spoony.spoony.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BaseResponse<T>(
+    @SerialName("success")
+    val success: Boolean,
+    @SerialName("error")
+    val error: ErrorResponse? = null,
+    @SerialName("data")
+    val data: T? = null
+)
+
+@Serializable
+data class ErrorResponse(
+    @SerialName("message")
+    val message: String
+)
diff --git a/app/src/main/java/com/spoony/spoony/data/dto/response/PlaceResponseDTO.kt b/app/src/main/java/com/spoony/spoony/data/dto/response/PlaceResponseDTO.kt
@@ -0,0 +1,24 @@
+package com.spoony.spoony.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SearchPlaceData(
+    @SerialName("placeList")
+    val placeList: List<PlaceDto>
+)
+
+@Serializable
+data class PlaceDto(
+    @SerialName("placeName")
+    val placeName: String,
+    @SerialName("placeAddress")
+    val placeAddress: String,
+    @SerialName("placeRoadAddress")
+    val placeRoadAddress: String,
+    @SerialName("latitude")
+    val latitude: Double,
+    @SerialName("longitude")
+    val longitude: Double
+)
diff --git a/app/src/main/java/com/spoony/spoony/data/mapper/PlaceMapper.kt b/app/src/main/java/com/spoony/spoony/data/mapper/PlaceMapper.kt
@@ -0,0 +1,23 @@
+package com.spoony.spoony.data.mapper
+
+import com.spoony.spoony.data.dto.response.PlaceDto
+import com.spoony.spoony.domain.entity.PlaceEntity
+import com.spoony.spoony.presentation.register.model.Place
+
+fun PlaceDto.toPlaceEntity(): PlaceEntity =
+    PlaceEntity(
+        placeName = placeName,
+        placeAddress = placeAddress,
+        placeRoadAddress = placeRoadAddress,
+        latitude = latitude,
+        longitude = longitude
+    )
+
+fun PlaceEntity.toPlace(): Place =
+    Place(
+        placeName = placeName,
+        placeAddress = placeAddress,
+        placeRoadAddress = placeRoadAddress,
+        latitude = latitude,
+        longitude = longitude
+    )
diff --git a/app/src/main/java/com/spoony/spoony/data/repositoryimpl/RegisterRepositoryImpl.kt b/app/src/main/java/com/spoony/spoony/data/repositoryimpl/RegisterRepositoryImpl.kt
@@ -1,12 +1,17 @@
 package com.spoony.spoony.data.repositoryimpl
 
 import android.net.Uri
+import com.spoony.spoony.data.datasource.PlaceDataSource
+import com.spoony.spoony.data.mapper.toPlace
+import com.spoony.spoony.data.mapper.toPlaceEntity
 import com.spoony.spoony.domain.repository.RegisterRepository
 import com.spoony.spoony.presentation.register.model.Category
 import com.spoony.spoony.presentation.register.model.Place
 import javax.inject.Inject
 
-class RegisterRepositoryImpl @Inject constructor() : RegisterRepository {
+class RegisterRepositoryImpl @Inject constructor(
+    private val placeDataSource: PlaceDataSource
+) : RegisterRepository {
     override suspend fun getCategories(): Result<List<Category>> = Result.success(
         listOf(
             Category(
@@ -54,45 +59,15 @@ class RegisterRepositoryImpl @Inject constructor() : RegisterRepository {
         )
     )
 
-    override suspend fun searchPlace(query: String, display: Int): Result<List<Place>> = Result.success(
-        listOf(
-            Place(
-                placeName = "스타벅스 강남대로점",
-                placeAddress = "서울특별시 서초구 서초동 1305-7",
-                placeRoadAddress = "서울특별시 서초구 강남대로 369 (서초동)",
-                latitude = 37.4979,
-                longitude = 127.0276
-            ),
-            Place(
-                placeName = "스타벅스 신촌역점",
-                placeAddress = "서울특별시 서대문구 창천동 30-1",
-                placeRoadAddress = "서울특별시 서대문구 연세로 10-1 (창천동)",
-                latitude = 37.5598,
-                longitude = 126.9423
-            ),
-            Place(
-                placeName = "스타벅스 홍대역점",
-                placeAddress = "서울특별시 마포구 서교동 358-11",
-                placeRoadAddress = "서울특별시 마포구 양화로 166 (서교동)",
-                latitude = 37.5569,
-                longitude = 126.9237
-            ),
-            Place(
-                placeName = "스타벅스 부산센텀시티점",
-                placeAddress = "부산광역시 해운대구 우동 1505",
-                placeRoadAddress = "부산광역시 해운대구 센텀남대로 35 (우동)",
-                latitude = 35.1698,
-                longitude = 129.1315
-            ),
-            Place(
-                placeName = "스타벅스 대구동성로점",
-                placeAddress = "대구광역시 중구 동성로3가 11",
-                placeRoadAddress = "대구광역시 중구 동성로 55 (동성로3가)",
-                latitude = 35.8703,
-                longitude = 128.5978
-            )
-        )
-    )
+    override suspend fun searchPlace(query: String, display: Int): Result<List<Place>> = runCatching {
+        val response = placeDataSource.searchPlace(query, display)
+        if (!response.success || response.data == null) {
+            throw IllegalStateException(response.error?.message ?: "에러 발생")
+        }
+        response.data.placeList.map { placeDto ->
+            placeDto.toPlaceEntity().toPlace()
+        }
+    }
 
     override suspend fun checkDuplicatePlace(
         userId: Long,

diff --git a/app/src/main/java/com/spoony/spoony/data/service/PlaceService.kt b/app/src/main/java/com/spoony/spoony/data/service/PlaceService.kt
@@ -0,0 +1,14 @@
+package com.spoony.spoony.data.service
+
+import com.spoony.spoony.data.dto.response.BaseResponse
+import com.spoony.spoony.data.dto.response.SearchPlaceData
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface PlaceService {
+    @GET("api/v1/place/search")
+    suspend fun searchPlace(
+        @Query("query") query: String,
+        @Query("display") display: Int = 5
+    ): BaseResponse<SearchPlaceData>
+}
diff --git a/app/src/main/java/com/spoony/spoony/domain/entity/PlaceEntity.kt b/app/src/main/java/com/spoony/spoony/domain/entity/PlaceEntity.kt
@@ -0,0 +1,9 @@
+package com.spoony.spoony.domain.entity
+
+data class PlaceEntity(
+    val placeName: String,
+    val placeAddress: String,
+    val placeRoadAddress: String,
+    val latitude: Double,
+    val longitude: Double
+)
diff --git a/app/src/main/java/com/spoony/spoony/presentation/main/component/MainBottomBar.kt b/app/src/main/java/com/spoony/spoony/presentation/main/component/MainBottomBar.kt
@@ -116,7 +116,7 @@ private fun RowScope.MainBottomBarItem(
             color = if (selected) {
                 SpoonyAndroidTheme.colors.main400
             } else {
-                SpoonyAndroidTheme.colors.gray200
+                SpoonyAndroidTheme.colors.gray400
             }
         )
     }