merge #81 -> develop

[Feat/#81] 산책하기 리뷰 - 상세보기 정보, 카테고리, 데이터 post 까지 api 연동 완료

Author: vvan2

app/src/main/java/com/paw/key/core/util/PhotoUtils.kt

@@ -1,6 +1,8 @@
 package com.paw.key.core.util
 
+import android.content.ContentResolver
 import android.graphics.Bitmap
+import android.net.Uri
 import android.util.Log
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
@@ -94,5 +96,17 @@ class PhotoUtils {
                 null
             }
         }
+
+        fun uriListToMultipartParts(
+            uris: List<Uri>,
+            contentResolver: ContentResolver
+        ): List<MultipartBody.Part> {
+            return uris.mapIndexed { index, uri ->
+                val inputStream = contentResolver.openInputStream(uri) ?: throw IllegalArgumentException("Can't open URI: $uri")
+                val fileName = "image_$index.jpg" // 혹은 uri에서 파일명 추출
+                val requestBody = inputStream.readBytes().toRequestBody("image/*".toMediaTypeOrNull())
+                MultipartBody.Part.createFormData("images", fileName, requestBody)
+            }
+        }
     }
 }

app/src/main/java/com/paw/key/data/di/RepositoryModule.kt

@@ -8,20 +8,20 @@ import com.paw.key.data.repositoryimpl.onboarding.OnboardingRepositoryImpl
 import com.paw.key.data.repositoryimpl.RegionRepositoryImpl
 import com.paw.key.data.repositoryimpl.WalkCourseRepositoryImpl
 import com.paw.key.data.repositoryimpl.WalkSharedResultRepositoryImpl
-import com.paw.key.data.repositoryimpl.filter.FilterOptionRepositoryImpl
 import com.paw.key.data.repositoryimpl.sharedwalk.SharedWalkRepositoryImpl
 import com.paw.key.data.repositoryimpl.home.HomeRegionRepositoryImpl
+import com.paw.key.data.repositoryimpl.walkreview.WalkReviewRepositoryImpl
 import com.paw.key.domain.repository.DummyRepository
 import com.paw.key.domain.repository.onboarding.OnboardingInfoRepository
 import com.paw.key.domain.repository.onboarding.OnboardingRegionRepository
 import com.paw.key.domain.repository.onboarding.OnboardingRepository
 import com.paw.key.domain.repository.RegionRepository
 import com.paw.key.domain.repository.WalkSharedResultRepository
-import com.paw.key.domain.repository.filter.FilterOptionRepository
 import com.paw.key.domain.repository.sharedwalk.SharedWalkRepository
 import com.paw.key.domain.repository.home.HomeRegionRepository
 import com.paw.key.domain.repository.petprofile.PetProfileRepository
 import com.paw.key.domain.repository.walkcourse.WalkCourseRepository
+import com.paw.key.domain.repository.walkreview.WalkReviewRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -55,7 +55,7 @@ interface RepositoryModule {
     fun bindsWalkCourseRepository(
         walkCourseRepositoryImpl: WalkCourseRepositoryImpl
     ): WalkCourseRepository
-  
+
     @Binds
     @Singleton
     fun bindOnboardingRepository(
@@ -96,7 +96,7 @@ interface RepositoryModule {
 
     @Binds
     @Singleton
-    fun bindFilterOptionRepository(
-        impl: FilterOptionRepositoryImpl
-    ): FilterOptionRepository
+    fun bindWalkReviewRepository(
+        impl: WalkReviewRepositoryImpl
+    ) : WalkReviewRepository
 }

app/src/main/java/com/paw/key/data/di/ServiceModule.kt

@@ -6,10 +6,10 @@ import com.paw.key.data.service.onboarding.OnboardingInfoService
 import com.paw.key.data.service.onboarding.OnboardingPetsService
 import com.paw.key.data.service.onboarding.OnboardingRegionService
 import com.paw.key.data.service.RegionService
-import com.paw.key.data.service.filter.FilterOptionService
 import com.paw.key.data.service.sharedwalk.SharedWalkService
 import com.paw.key.data.service.home.HomeRegionService
 import com.paw.key.data.service.walkcourse.WalkCourseService
+import com.paw.key.data.service.walkreview.WalkReviewService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -36,7 +36,7 @@ object ServiceModule {
     @Singleton
     fun providesWalkCourseService(retrofit: Retrofit ): WalkCourseService =
         retrofit.create()
-        
+
     @Provides
     @Singleton
     fun provideOnboardingPetsService(retrofit: Retrofit): OnboardingPetsService =
@@ -70,7 +70,8 @@ object ServiceModule {
 
     @Provides
     @Singleton
-    fun provideFilterOptionService(retrofit: Retrofit): FilterOptionService =
-        retrofit.create(FilterOptionService::class.java)
+    fun provideWalkReviewService(retrofit: Retrofit): WalkReviewService =
+        retrofit.create()
+
 
 }

app/src/main/java/com/paw/key/data/dto/request/sharedwalk/WalkReviewRequestDto.kt

@@ -0,0 +1,19 @@
+package com.paw.key.data.dto.request.sharedwalk
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SharedWalkReviewRequestDto(
+    @SerialName("selectedCategories")
+    val selectedCategories: List<SharedWalkReviewCategoryDto>
+)
+
+@Serializable
+data class SharedWalkReviewCategoryDto(
+    @SerialName("categoryId")
+    val categoryId: Int,
+
+    @SerialName("selectedOptionIds")
+    val selectedOptionIds: List<Int>
+)

app/src/main/java/com/paw/key/data/dto/request/walkreview/WalkCourseReviewRequestDto.kt

@@ -0,0 +1,32 @@
+package com.paw.key.data.dto.request.walkreview
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class WalkCourseReviewRequestDto(
+    @SerialName("title")
+    val title: String,
+
+    @SerialName("description")
+    val description: String,
+
+    @SerialName("isPublic")
+    val isPublic: Boolean,
+
+    @SerialName("selectedCategories")
+    val selectedCategories: List<SelectedCategoryDto>,
+
+    @SerialName("routeId")
+    val routeId: Long
+)
+
+@Serializable
+data class SelectedCategoryDto(
+    @SerialName("categoryId")
+    val categoryId: Int,
+
+    @SerialName("selectedOptionIds")
+    val selectedOptionIds: List<Int>
+)

app/src/main/java/com/paw/key/data/dto/response/walkreview/WalkReviewCategoryResponseDto.kt

@@ -0,0 +1,40 @@
+package com.paw.key.data.dto.response.walkreview
+
+import com.paw.key.domain.model.entity.walkreview.WalkReviewCategoryEntity
+import com.paw.key.domain.model.entity.walkreview.WalkReviewCategoryListEntity
+import com.paw.key.domain.model.entity.walkreview.WalkReviewOptionOptionsResponseEntity
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class WalkReviewCategoryResponseDto(
+    val categoryList : List<CategoryResponseDto>
+) {
+    fun toEntity() = WalkReviewCategoryListEntity(
+        categoryList = categoryList.map { it.toEntity() }
+    )
+}
+
+@Serializable
+data class CategoryResponseDto(
+    val categoryId : Int,
+    val categoryName : String,
+    val categoryOptions : List<OptionsResponseDto>
+) {
+    fun toEntity() = WalkReviewCategoryEntity(
+        categoryId = categoryId,
+        categoryName = categoryName,
+        options = categoryOptions.map { it.toEntity() }
+    )
+
+}
+
+@Serializable
+data class OptionsResponseDto(
+    val categoryOptionId : Int,
+    val categoryOptionText : String
+) {
+    fun toEntity() = WalkReviewOptionOptionsResponseEntity(
+        categoryOptionId = categoryOptionId,
+        optionText = categoryOptionText
+    )
+}

app/src/main/java/com/paw/key/data/dto/response/walkreview/WalkReviewInfoResponseDto.kt

@@ -0,0 +1,37 @@
+package com.paw.key.data.dto.response.walkreview
+
+import com.paw.key.domain.model.entity.walkreview.WalkReviewInfoEntity
+import com.paw.key.domain.model.entity.walkreview.WalkReviewRouteInfoEntity
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class WalkReviewInfoResponseDto(
+    @SerialName("routeDto")
+    val routeDto: WalkReviewRouteInfoResponseDto,
+    @SerialName("petName")
+    val petName: String
+) {
+    fun toEntity() = WalkReviewInfoEntity(
+        routeDto = routeDto.toEntity(),
+        petName = petName
+    )
+}
+
+@Serializable
+data class WalkReviewRouteInfoResponseDto(
+    val id: Int,
+    @SerialName("locationDescription")
+    val locationDescription: String,
+    @SerialName("dateDescription")
+    val dateDescription: String,
+    @SerialName("descriptionTags")
+    val descriptionTags: List<String>
+) {
+    fun toEntity() = WalkReviewRouteInfoEntity(
+        id = id,
+        locationDescription = locationDescription,
+        dateDescription = dateDescription,
+        descriptionTags = descriptionTags
+    )
+}

app/src/main/java/com/paw/key/data/remote/datasource/walkreview/WalkReviewDataSource.kt

@@ -0,0 +1,44 @@
+package com.paw.key.data.remote.datasource.walkreview
+
+import com.paw.key.data.dto.request.walkcourse.WalkCourseRequestDto
+import com.paw.key.data.dto.request.walkreview.WalkCourseReviewRequestDto
+import com.paw.key.data.dto.response.BaseResponse
+import com.paw.key.data.service.walkreview.WalkReviewService
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.MultipartBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import javax.inject.Inject
+
+class WalkReviewDataSource @Inject constructor(
+    private val service: WalkReviewService
+) {
+    suspend fun postWalkReview(
+        userId: Int,
+        imageFiles: List<MultipartBody.Part>,
+        walkReviewRequestDto: WalkCourseReviewRequestDto
+    ) : BaseResponse<Unit> {
+        val jsonString = Json.encodeToString(WalkCourseReviewRequestDto.serializer(), walkReviewRequestDto)
+        val requestBody = jsonString.toRequestBody("application/json".toMediaType())
+
+        return service.postWalkReview(
+            userId = userId,
+            imageFiles = imageFiles,
+            data = requestBody
+        )
+    }
+
+    suspend fun getWalkReviewInfo(
+        userId: Int,
+        routeId: Int
+    ) = service.getWalkReviewInfo(
+        userId = userId,
+        routeId = routeId
+    )
+
+    suspend fun getWalkReviewCategory(
+        userId: Int
+    ) = service.getWalkReviewCategory(
+        userId = userId
+    )
+}

app/src/main/java/com/paw/key/data/repositoryimpl/walkreview/WalkReviewRepositoryImpl.kt

@@ -0,0 +1,49 @@
+package com.paw.key.data.repositoryimpl.walkreview
+
+import com.paw.key.data.remote.datasource.walkreview.WalkReviewDataSource
+import com.paw.key.domain.model.entity.walkreview.WalkReviewCategoryListEntity
+import com.paw.key.domain.model.entity.walkreview.WalkReviewInfoEntity
+import com.paw.key.domain.model.entity.walkreview.WalkReviewRecordEntity
+import com.paw.key.domain.repository.walkreview.WalkReviewRepository
+import okhttp3.MultipartBody
+import javax.inject.Inject
+
+class WalkReviewRepositoryImpl @Inject constructor(
+    private val dataSource: WalkReviewDataSource
+) : WalkReviewRepository {
+    override suspend fun postWalkReview(
+        userId: Int,
+        imageFiles: List<MultipartBody.Part>,
+        walkReviewRequest: WalkReviewRecordEntity
+    ): Result<Unit> {
+        return runCatching {
+            dataSource.postWalkReview(
+                userId = userId,
+                imageFiles = imageFiles,
+                walkReviewRequestDto = walkReviewRequest.toDto()
+            )
+        }
+    }
+
+    override suspend fun getWalkReviewInfo(
+        userId: Int,
+        routeId: Int
+    ): Result<WalkReviewInfoEntity> {
+        return runCatching {
+            dataSource.getWalkReviewInfo(
+                userId = userId,
+                routeId = routeId
+            ).data.toEntity()
+        }
+    }
+
+    override suspend fun getWalkReviewCategory(
+        userId: Int
+    ): Result<WalkReviewCategoryListEntity> {
+        return runCatching {
+            dataSource.getWalkReviewCategory(
+                userId = userId
+            ).data.toEntity()
+        }
+    }
+}

app/src/main/java/com/paw/key/data/service/walkreview/WalkReviewService.kt

@@ -0,0 +1,34 @@
+package com.paw.key.data.service.walkreview
+
+import com.paw.key.data.dto.response.BaseResponse
+import com.paw.key.data.dto.response.walkreview.WalkReviewCategoryResponseDto
+import com.paw.key.data.dto.response.walkreview.WalkReviewInfoResponseDto
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Multipart
+import retrofit2.http.POST
+import retrofit2.http.Part
+import retrofit2.http.Path
+
+interface WalkReviewService {
+    @Multipart
+    @POST("posts")
+    suspend fun postWalkReview(
+        @Header("X-USER-ID") userId: Int,
+        @Part imageFiles: List<MultipartBody.Part>,
+        @Part("data") data: RequestBody
+    ): BaseResponse<Unit>
+
+    @GET("posts/categories")
+    suspend fun getWalkReviewCategory(
+        @Header("X-USER-ID") userId: Int,
+    ): BaseResponse<WalkReviewCategoryResponseDto>
+
+    @GET("routes/{routeId}/info")
+    suspend fun getWalkReviewInfo(
+        @Header("X-USER-ID") userId: Int,
+        @Path("routeId") routeId: Int
+    ): BaseResponse<WalkReviewInfoResponseDto>
+}