#28 [FEAT] 리뷰 작성 api 연결

DACOS-SOLUX-Hackathon-Team5 · Nov 8, 2024 · b36351b · b36351b
1 parent 8960695
commit b36351b
Show file tree

Hide file tree

Showing 15 changed files with 239 additions and 33 deletions.
diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/app/di/DataSourceModule.kt b/app/src/main/java/com/hackathon/alddeul_babsang/app/di/DataSourceModule.kt
@@ -1,10 +1,12 @@
 package com.hackathon.alddeul_babsang.app.di
 
 import com.hackathon.alddeul_babsang.data.datasource.BabsangDataSource
+import com.hackathon.alddeul_babsang.data.datasource.DetailDataSource
 import com.hackathon.alddeul_babsang.data.datasource.ExampleDataSource
 import com.hackathon.alddeul_babsang.data.datasource.ProfileDataSource
 import com.hackathon.alddeul_babsang.data.datasource.UserPreferencesDataSource
 import com.hackathon.alddeul_babsang.data.datasourceimpl.BabsangDataSourceImpl
+import com.hackathon.alddeul_babsang.data.datasourceimpl.DetailDataSourceImpl
 import com.hackathon.alddeul_babsang.data.datasourceimpl.ExampleDataSourceImpl
 import com.hackathon.alddeul_babsang.data.datasourceimpl.ProfileDataSourceImpl
 import com.hackathon.alddeul_babsang.data.datasourceimpl.UserPreferencesDataSourceImpl
@@ -33,4 +35,8 @@ abstract class DataSourceModule {
     @Binds
     @Singleton
     abstract fun bindProfileDataSource(profileDataSourceImpl: ProfileDataSourceImpl): ProfileDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindDetailDataSource(detailDataSourceImpl: DetailDataSourceImpl): DetailDataSource
 }
diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/app/di/RepositoryModule.kt b/app/src/main/java/com/hackathon/alddeul_babsang/app/di/RepositoryModule.kt
@@ -1,10 +1,12 @@
 package com.hackathon.alddeul_babsang.app.di
 
 import com.hackathon.alddeul_babsang.data.repositoryimpl.BabsangRepositoryImpl
+import com.hackathon.alddeul_babsang.data.repositoryimpl.DetailRepositoryImpl
 import com.hackathon.alddeul_babsang.data.repositoryimpl.ExampleRepositoryImpl
 import com.hackathon.alddeul_babsang.data.repositoryimpl.ProfileRepositoryImpl
 import com.hackathon.alddeul_babsang.data.repositoryimpl.UserPreferencesRepositoryImpl
 import com.hackathon.alddeul_babsang.domain.repository.BabsangRepository
+import com.hackathon.alddeul_babsang.domain.repository.DetailRepository
 import com.hackathon.alddeul_babsang.domain.repository.ExampleRepository
 import com.hackathon.alddeul_babsang.domain.repository.ProfileRepository
 import com.hackathon.alddeul_babsang.domain.repository.UserPreferencesRepository
@@ -33,4 +35,8 @@ abstract class RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindProfileRepository(profileRepositoryImpl: ProfileRepositoryImpl): ProfileRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindDetailRepository(detailRepositoryImpl: DetailRepositoryImpl): DetailRepository
 }
diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/app/di/ServiceModule.kt b/app/src/main/java/com/hackathon/alddeul_babsang/app/di/ServiceModule.kt
@@ -1,6 +1,7 @@
 package com.hackathon.alddeul_babsang.app.di
 
 import com.hackathon.alddeul_babsang.data.service.BabsangApiService
+import com.hackathon.alddeul_babsang.data.service.DetailApiService
 import com.hackathon.alddeul_babsang.data.service.ProfileApiService
 import com.sopt.data.service.ExampleApiService
 import dagger.Module
@@ -31,4 +32,10 @@ object ServiceModule {
     fun provideProfileService(
         @AlddeulRetrofit retrofit: Retrofit
     ): ProfileApiService = retrofit.create(ProfileApiService::class.java)
+
+    @Provides
+    @Singleton
+    fun provideDetailService(
+        @AlddeulRetrofit retrofit: Retrofit
+    ): DetailApiService = retrofit.create(DetailApiService::class.java)
 }
diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/data/datasource/DetailDataSource.kt b/app/src/main/java/com/hackathon/alddeul_babsang/data/datasource/DetailDataSource.kt
@@ -0,0 +1,14 @@
+package com.hackathon.alddeul_babsang.data.datasource
+
+import com.hackathon.alddeul_babsang.data.dto.BaseResponse
+import com.hackathon.alddeul_babsang.data.dto.response.ResponseReviewDto
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+
+interface DetailDataSource {
+    suspend fun postReview(
+        storeId: Long,
+        data: Map<String, RequestBody>, // JSON 데이터를 포함하는 Map
+        reviewImage: MultipartBody.Part? = null // 이미지 파일
+    ): BaseResponse<ResponseReviewDto>
+}
diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/data/datasourceimpl/DetailDataSourceImpl.kt b/app/src/main/java/com/hackathon/alddeul_babsang/data/datasourceimpl/DetailDataSourceImpl.kt
@@ -0,0 +1,22 @@
+package com.hackathon.alddeul_babsang.data.datasourceimpl
+
+import com.hackathon.alddeul_babsang.data.datasource.DetailDataSource
+import com.hackathon.alddeul_babsang.data.dto.BaseResponse
+import com.hackathon.alddeul_babsang.data.dto.response.ResponseReviewDto
+import com.hackathon.alddeul_babsang.data.service.DetailApiService
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import javax.inject.Inject
+
+class DetailDataSourceImpl @Inject constructor(
+    private val detailApiService: DetailApiService
+) : DetailDataSource {
+    override suspend fun postReview(
+        storeId: Long,
+        data: Map<String, RequestBody>,
+        reviewImage: MultipartBody.Part?
+    ): BaseResponse<ResponseReviewDto> {
+        return detailApiService.postReview(storeId, data, reviewImage)
+    }
+
+}
diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/data/dto/response/ResponseLikesDto.kt b/app/src/main/java/com/hackathon/alddeul_babsang/data/dto/response/ResponseLikesDto.kt
@@ -5,7 +5,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class ResponseLikesDto(
-    @SerialName("favoriteRestaurants") val favoriteRestaurants: List<FavoriteRestaurantDto>
+    @SerialName("favoriteStoreDetailDtos") val favoriteRestaurants: List<FavoriteRestaurantDto>
 )
 
 @Serializable

diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/data/dto/response/ResponseReviewDto.kt b/app/src/main/java/com/hackathon/alddeul_babsang/data/dto/response/ResponseReviewDto.kt
@@ -0,0 +1,11 @@
+package com.hackathon.alddeul_babsang.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseReviewDto (
+    @SerialName("storeId") val storeId: Long,
+    @SerialName("userId") val userId: Long,
+    @SerialName("message") val message: String,
+)
diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/data/repositoryimpl/DetailRepositoryImpl.kt b/app/src/main/java/com/hackathon/alddeul_babsang/data/repositoryimpl/DetailRepositoryImpl.kt
@@ -0,0 +1,43 @@
+package com.hackathon.alddeul_babsang.data.repositoryimpl
+
+import com.hackathon.alddeul_babsang.data.datasource.DetailDataSource
+import com.hackathon.alddeul_babsang.domain.repository.DetailRepository
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
+import java.io.File
+import javax.inject.Inject
+
+class DetailRepositoryImpl @Inject constructor(
+    private val detailDataSource: DetailDataSource
+) : DetailRepository {
+    override suspend fun postReview(
+        storeId: Long,
+        userId: Long,
+        rating: Double,
+        content: String,
+        reviewImage: File
+    ): Result<String> {
+        return runCatching {
+            val dataMap = mapOf(
+                "userId" to userId.toString().toRequestBody("text/plain".toMediaTypeOrNull()),
+                "rating" to rating.toString().toRequestBody("text/plain".toMediaTypeOrNull()),
+                "content" to content.toRequestBody("text/plain".toMediaTypeOrNull())
+            )
+
+            // 이미지 파일 파트 생성
+            val filePart = reviewImage?.let {
+                val requestBody = it.asRequestBody("image/jpeg".toMediaTypeOrNull())
+                MultipartBody.Part.createFormData("reviewImage", it.name, requestBody)
+            }
+
+            detailDataSource.postReview(
+                storeId = storeId,
+                data = dataMap,
+                reviewImage = filePart
+            ).message
+        }
+    }
+}
diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/data/service/ApiKeyStorage.kt b/app/src/main/java/com/hackathon/alddeul_babsang/data/service/ApiKeyStorage.kt
@@ -19,4 +19,5 @@ object ApiKeyStorage {
     const val MYPAGE = "mypage"
     const val LOGOUT = "logout"
     const val USER_ID = "userId"
+    const val STORE_ID = "storeId"
 }
diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/data/service/DetailApiService.kt b/app/src/main/java/com/hackathon/alddeul_babsang/data/service/DetailApiService.kt
@@ -0,0 +1,23 @@
+package com.hackathon.alddeul_babsang.data.service
+
+import com.hackathon.alddeul_babsang.data.dto.BaseResponse
+import com.hackathon.alddeul_babsang.data.dto.response.ResponseReviewDto
+import com.sopt.data.service.ApiKeyStorage.REVIEW
+import com.sopt.data.service.ApiKeyStorage.STORE_ID
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import retrofit2.http.Multipart
+import retrofit2.http.POST
+import retrofit2.http.Part
+import retrofit2.http.PartMap
+import retrofit2.http.Path
+
+interface DetailApiService {
+    @Multipart
+    @POST("/$REVIEW/{$STORE_ID}")
+    suspend fun postReview(
+        @Path("storeId") storeId: Long,
+        @PartMap data: Map<String, @JvmSuppressWildcards RequestBody>,
+        @Part reviewImage: MultipartBody.Part? = null
+    ): BaseResponse<ResponseReviewDto>
+}
diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/data/service/ProfileApiService.kt b/app/src/main/java/com/hackathon/alddeul_babsang/data/service/ProfileApiService.kt
@@ -5,6 +5,7 @@ import com.hackathon.alddeul_babsang.data.dto.request.RequestLikesDto
 import com.hackathon.alddeul_babsang.data.dto.response.ResponseLikesDto
 import com.sopt.data.service.ApiKeyStorage.FAVORITES
 import com.sopt.data.service.ApiKeyStorage.USER_ID
+import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Path
@@ -17,6 +18,6 @@ interface ProfileApiService {
 
     @POST("/$FAVORITES")
     suspend fun postLike(
-        requestLikesDto: RequestLikesDto
+        @Body requestLikesDto: RequestLikesDto
     ): BaseResponse<String>
 }
diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/domain/repository/DetailRepository.kt b/app/src/main/java/com/hackathon/alddeul_babsang/domain/repository/DetailRepository.kt
@@ -0,0 +1,13 @@
+package com.hackathon.alddeul_babsang.domain.repository
+
+import java.io.File
+
+interface DetailRepository {
+    suspend fun postReview(
+        storeId: Long,
+        userId: Long,
+        rating: Double,
+        content: String,
+        reviewImage: File
+    ): Result<String>
+}
diff --git a/app/src/main/java/com/hackathon/alddeul_babsang/presentation/babsang/screen/BabsangItem.kt b/app/src/main/java/com/hackathon/alddeul_babsang/presentation/babsang/screen/BabsangItem.kt
@@ -159,22 +159,4 @@ fun ReplaceImage2(codeName: String, imageUrl: String?) {
             )
         }
     }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun BabsangListItemPreview() {
-    AlddeulBabsangTheme {
-        LikeItem(
-            data = LikesEntity(
-                id = 1,
-                avatar = null,
-                name = "송이네 밥상",
-                codeName = "경양식/일식",
-                address = "서울특별시 용산구 청파동 11",
-                phone = "02-210-0220",
-                favorite = true
-            )
-        )
-    }
 }