Merge pull request #207 from LJG7123/feature-aos/현재-위치에서-다시-검색

Feature(#40): 현재 위치에서 다시 검색
wsb7788 · Dec 3, 2023 · dd0e243 · dd0e243
2 parents 41571fd + 532cdae
commit dd0e243
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 0 deletions.
diff --git a/android/app/src/main/java/com/boostcampwm2023/snappoint/data/mapper/PostMapper.kt b/android/app/src/main/java/com/boostcampwm2023/snappoint/data/mapper/PostMapper.kt
@@ -3,8 +3,10 @@ package com.boostcampwm2023.snappoint.data.mapper
 import com.boostcampwm2023.snappoint.data.remote.model.BlockType
 import com.boostcampwm2023.snappoint.data.remote.model.File
 import com.boostcampwm2023.snappoint.data.remote.model.PostBlock
+import com.boostcampwm2023.snappoint.data.remote.model.response.GetAroundPostResponse
 import com.boostcampwm2023.snappoint.presentation.model.PositionState
 import com.boostcampwm2023.snappoint.presentation.model.PostBlockState
+import com.boostcampwm2023.snappoint.presentation.model.PostSummaryState
 
 fun PostBlock.asPostBlockState(): PostBlockState {
     return when(type){
@@ -71,3 +73,12 @@ fun PostBlock.asPositionState(): PositionState {
         longitude = this.longitude!!
     )
 }
+
+fun GetAroundPostResponse.asPostSummaryState(): PostSummaryState {
+    return PostSummaryState(
+        title = this.title,
+        author = "",
+        timeStamp = this.createdAt,
+        postBlocks = this.blocks.map { it.asPostBlockState() }
+    )
+}
diff --git a/android/app/src/main/java/com/boostcampwm2023/snappoint/data/remote/SnapPointApi.kt b/android/app/src/main/java/com/boostcampwm2023/snappoint/data/remote/SnapPointApi.kt
@@ -1,9 +1,11 @@
 package com.boostcampwm2023.snappoint.data.remote
 
 import com.boostcampwm2023.snappoint.data.remote.model.request.CreatePostRequest
+import com.boostcampwm2023.snappoint.data.remote.model.request.GetAroundPostRequest
 import com.boostcampwm2023.snappoint.data.remote.model.request.SignInRequest
 import com.boostcampwm2023.snappoint.data.remote.model.request.SignupRequest
 import com.boostcampwm2023.snappoint.data.remote.model.response.CreatePostResponse
+import com.boostcampwm2023.snappoint.data.remote.model.response.GetAroundPostResponse
 import com.boostcampwm2023.snappoint.data.remote.model.response.ImageResponse
 import com.boostcampwm2023.snappoint.data.remote.model.response.ImageUriResponse
 import com.boostcampwm2023.snappoint.data.remote.model.response.PostImageResponse
@@ -52,4 +54,9 @@ interface SnapPointApi {
     suspend fun postImage(
         @Part bitmap: MultipartBody.Part
     ): PostImageResponse
+
+    @GET("posts")
+    suspend fun getAroundPost(
+        @Body getAroundPostRequest: GetAroundPostRequest
+    ): List<GetAroundPostResponse>
 }
diff --git a/...main/java/com/boostcampwm2023/snappoint/data/remote/model/request/GetAroundPostRequest.kt b/...main/java/com/boostcampwm2023/snappoint/data/remote/model/request/GetAroundPostRequest.kt
@@ -0,0 +1,10 @@
+package com.boostcampwm2023.snappoint.data.remote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GetAroundPostRequest(
+    @SerialName("lb") val leftBottom: String,
+    @SerialName("rt") val rightTop: String,
+)
diff --git a/...in/java/com/boostcampwm2023/snappoint/data/remote/model/response/GetAroundPostResponse.kt b/...in/java/com/boostcampwm2023/snappoint/data/remote/model/response/GetAroundPostResponse.kt
@@ -0,0 +1,14 @@
+package com.boostcampwm2023.snappoint.data.remote.model.response
+
+import com.boostcampwm2023.snappoint.data.remote.model.PostBlock
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GetAroundPostResponse(
+    @SerialName("uuid") val postUuid: String,
+    @SerialName("title") val title: String,
+    @SerialName("createdAt") val createdAt: String,
+    @SerialName("modifiedAt") val modifiedAt: String,
+    @SerialName("blocks") val blocks: List<PostBlock>,
+)
diff --git a/android/app/src/main/java/com/boostcampwm2023/snappoint/data/repository/PostRepository.kt b/android/app/src/main/java/com/boostcampwm2023/snappoint/data/repository/PostRepository.kt
@@ -1,6 +1,7 @@
 package com.boostcampwm2023.snappoint.data.repository
 
 import com.boostcampwm2023.snappoint.data.remote.model.response.CreatePostResponse
+import com.boostcampwm2023.snappoint.data.remote.model.response.GetAroundPostResponse
 import com.boostcampwm2023.snappoint.presentation.model.PostBlockState
 import kotlinx.coroutines.flow.Flow
 
@@ -10,4 +11,5 @@ interface PostRepository {
     fun getVideo(uri: String): Flow<ByteArray>
     fun getVideoUri(video: ByteArray): Flow<Unit>
     fun postCreatePost(title: String, postBlocks: List<PostBlockState>): Flow<CreatePostResponse>
+    fun getAroundPost(leftBottom: String, rightTop: String): Flow<List<GetAroundPostResponse>>
 }
diff --git a/...oid/app/src/main/java/com/boostcampwm2023/snappoint/data/repository/PostRepositoryImpl.kt b/...oid/app/src/main/java/com/boostcampwm2023/snappoint/data/repository/PostRepositoryImpl.kt
@@ -6,6 +6,7 @@ import com.boostcampwm2023.snappoint.data.remote.SnapPointApi
 import com.boostcampwm2023.snappoint.data.remote.model.File
 import com.boostcampwm2023.snappoint.data.remote.model.request.CreatePostRequest
 import com.boostcampwm2023.snappoint.data.remote.model.response.CreatePostResponse
+import com.boostcampwm2023.snappoint.data.remote.model.response.GetAroundPostResponse
 import com.boostcampwm2023.snappoint.presentation.model.PostBlockState
 import com.boostcampwm2023.snappoint.presentation.util.toByteArray
 import kotlinx.coroutines.Dispatchers
@@ -87,4 +88,8 @@ class PostRepositoryImpl @Inject constructor(
                 snapPointApi.createPost(request)
             }
     }
+
+    override fun getAroundPost(leftBottom: String, rightTop: String): Flow<List<GetAroundPostResponse>> {
+        TODO("Not yet implemented")
+    }
 }