[API] 피드 작성 구현 #88
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.texthip.thip.data.model.feed.request | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class CreateFeedRequest( | ||
| @SerialName("isbn") | ||
| val isbn: String, | ||
| @SerialName("contentBody") | ||
| val contentBody: String, | ||
| @SerialName("isPublic") | ||
| val isPublic: Boolean, | ||
| @SerialName("tagList") | ||
| val tagList: List<String> = emptyList() | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package com.texthip.thip.data.model.feed.response | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class CreateFeedResponse( | ||
| @SerialName("feedId") | ||
| val feedId: Int | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package com.texthip.thip.data.model.feed.response | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class FeedWriteInfoResponse( | ||
| @SerialName("categoryList") | ||
| val categoryList: List<FeedCategory> | ||
| ) | ||
|
|
||
| @Serializable | ||
| data class FeedCategory( | ||
| @SerialName("category") | ||
| val category: String, | ||
| @SerialName("tagList") | ||
| val tagList: List<String> | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| package com.texthip.thip.data.repository | ||
|
|
||
| import android.content.Context | ||
| import android.net.Uri | ||
| import com.texthip.thip.data.model.base.handleBaseResponse | ||
| import com.texthip.thip.data.model.feed.request.CreateFeedRequest | ||
| import com.texthip.thip.data.model.feed.response.CreateFeedResponse | ||
| import com.texthip.thip.data.model.feed.response.FeedWriteInfoResponse | ||
| import com.texthip.thip.data.service.FeedService | ||
| import dagger.hilt.android.qualifiers.ApplicationContext | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.withContext | ||
| import kotlinx.serialization.json.Json | ||
| import okhttp3.MediaType.Companion.toMediaType | ||
| import okhttp3.MultipartBody | ||
| import okhttp3.RequestBody.Companion.asRequestBody | ||
| import okhttp3.RequestBody.Companion.toRequestBody | ||
| import java.io.File | ||
| import java.io.FileOutputStream | ||
| import javax.inject.Inject | ||
| import javax.inject.Singleton | ||
|
|
||
| @Singleton | ||
| class FeedRepository @Inject constructor( | ||
| private val feedService: FeedService, | ||
| @param:ApplicationContext private val context: Context, | ||
| private val json: Json | ||
| ) { | ||
|
|
||
| /** 피드 작성에 필요한 카테고리 및 태그 목록 조회 */ | ||
| suspend fun getFeedWriteInfo(): Result<FeedWriteInfoResponse?> = runCatching { | ||
| val response = feedService.getFeedWriteInfo() | ||
| .handleBaseResponse() | ||
| .getOrThrow() | ||
|
|
||
| // 카테고리 순서 조정 | ||
| val orderedCategories = response?.categoryList?.sortedBy { category -> | ||
| when (category.category) { | ||
| "문학" -> 0 | ||
| "과학·IT" -> 1 | ||
| "사회과학" -> 2 | ||
| "인문학" -> 3 | ||
| "예술" -> 4 | ||
| else -> 999 | ||
| } | ||
| } ?: emptyList() | ||
|
|
||
| response?.copy(categoryList = orderedCategories) | ||
| } | ||
|
|
||
| /** 피드 생성 */ | ||
| suspend fun createFeed( | ||
| isbn: String, | ||
| contentBody: String, | ||
| isPublic: Boolean, | ||
| tagList: List<String>, | ||
| imageUris: List<Uri> | ||
| ): Result<CreateFeedResponse?> = runCatching { | ||
| val request = CreateFeedRequest( | ||
| isbn = isbn, | ||
| contentBody = contentBody, | ||
| isPublic = isPublic, | ||
| tagList = tagList | ||
| ) | ||
|
|
||
| // JSON 요청 부분을 RequestBody로 변환 | ||
| val requestJson = json.encodeToString(CreateFeedRequest.serializer(), request) | ||
| val requestBody = requestJson.toRequestBody("application/json".toMediaType()) | ||
|
Comment on lines
+67
to
+68
Member
There was a problem hiding this comment. 이거 FeedSerivce의 createFeed에서 CreateFeedRequest를 안쓰고 RequestBody를 써서 여기에서 처리한거같은데 그렇게 한 이유가 있을까요? 웬만하면 형식 통일해서 FeedService에서 suspend fun createFeed(
@Part("request") request: CreateFeedRequest, ...이런식으로 쓰는게 좋지 않을까 생각합니당
Collaborator
Author
There was a problem hiding this comment. 이게 제가 @MuitiPart를 사용하고 있어서 원시타입만 허용하기에 이렇게 해야된다고 합니다. RequestBody 같은거만 사용가능하고 커스텀 dto는 사용하면 자동으로 레트로핏이 직렬화가 안된다고 합니다 |
||
|
|
||
| // 임시 파일 목록 추적 | ||
| val tempFiles = mutableListOf<File>() | ||
|
|
||
| try { | ||
| // 이미지 파일들을 MultipartBody.Part로 변환 | ||
| val imageParts = if (imageUris.isNotEmpty()) { | ||
| withContext(Dispatchers.IO) { | ||
| imageUris.mapNotNull { uri -> | ||
| try { | ||
| uriToMultipartBodyPart(uri, "images", tempFiles) | ||
| } catch (e: Exception) { | ||
| null | ||
| } | ||
| } | ||
| } | ||
| } else { | ||
| null | ||
| } | ||
|
|
||
| feedService.createFeed(requestBody, imageParts) | ||
| .handleBaseResponse() | ||
| .getOrThrow() | ||
| } finally { | ||
| // 임시 파일들 정리 | ||
| cleanupTempFiles(tempFiles) | ||
| } | ||
| } | ||
|
|
||
| private fun uriToMultipartBodyPart(uri: Uri, paramName: String, tempFiles: MutableList<File>): MultipartBody.Part? { | ||
| return try { | ||
| // MIME 타입 확인 | ||
| val mimeType = context.contentResolver.getType(uri) ?: "image/jpeg" | ||
| val extension = when (mimeType) { | ||
| "image/png" -> "png" | ||
| "image/gif" -> "gif" | ||
| "image/jpeg", "image/jpg" -> "jpg" | ||
| else -> "jpg" // 기본값 | ||
| } | ||
|
|
||
| // 파일명 생성 | ||
| val fileName = "feed_image_${System.currentTimeMillis()}.$extension" | ||
| val tempFile = File(context.cacheDir, fileName) | ||
|
There was a problem hiding this comment. Temporary files created in cache directory are not being cleaned up. Consider implementing cleanup logic or using try-with-resources pattern to ensure proper resource management. |
||
|
|
||
| // 임시 파일 목록에 추가 | ||
| tempFiles.add(tempFile) | ||
|
|
||
| // InputStream을 use 블록으로 안전하게 관리 | ||
| context.contentResolver.openInputStream(uri)?.use { inputStream -> | ||
| FileOutputStream(tempFile).use { outputStream -> | ||
| inputStream.copyTo(outputStream) | ||
| } | ||
| } ?: return null | ||
|
|
||
| // MultipartBody.Part 생성 | ||
| val requestFile = tempFile.asRequestBody(mimeType.toMediaType()) | ||
| MultipartBody.Part.createFormData(paramName, fileName, requestFile) | ||
| } catch (e: Exception) { | ||
| e.printStackTrace() | ||
| null | ||
| } | ||
| } | ||
|
|
||
| /** 임시 파일들을 정리하는 함수 */ | ||
| private fun cleanupTempFiles(tempFiles: List<File>) { | ||
| tempFiles.forEach { file -> | ||
| try { | ||
| if (file.exists()) { | ||
| file.delete() | ||
| } | ||
| } catch (e: Exception) { | ||
| e.printStackTrace() | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package com.texthip.thip.data.service | ||
|
|
||
| import com.texthip.thip.data.model.base.BaseResponse | ||
| import com.texthip.thip.data.model.feed.response.CreateFeedResponse | ||
| import com.texthip.thip.data.model.feed.response.FeedWriteInfoResponse | ||
| import okhttp3.MultipartBody | ||
| import okhttp3.RequestBody | ||
| import retrofit2.http.GET | ||
| import retrofit2.http.Multipart | ||
| import retrofit2.http.POST | ||
| import retrofit2.http.Part | ||
|
|
||
| interface FeedService { | ||
|
|
||
| /** 피드 작성에 필요한 카테고리 및 태그 목록 조회 */ | ||
| @GET("feeds/write-info") | ||
| suspend fun getFeedWriteInfo(): BaseResponse<FeedWriteInfoResponse> | ||
|
|
||
| /** 피드 생성 */ | ||
| @Multipart | ||
| @POST("feeds") | ||
| suspend fun createFeed( | ||
| @Part("request") request: RequestBody, | ||
| @Part images: List<MultipartBody.Part>? | ||
| ): BaseResponse<CreateFeedResponse> | ||
|
Comment on lines
+19
to
+25
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chain멀티파트 전송 시 JSON Part/이미지 Part 네이밍과 Content-Type을 확인해주세요
검증용 스크립트를 공유드립니다. 🏁 Script executed: #!/bin/bash
set -euo pipefail
# 1) JSON RequestBody가 올바른 미디어 타입으로 생성되는지 확인
rg -n -C3 --type=kt -P 'application/json' app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt || true
rg -n -C3 --type=kt -P '(toMediaType|MediaType\.parse|toRequestBody|RequestBody\.create)' app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt || true
# 2) 이미지 Part 네이밍 확인 (images 혹은 images[] 등)
rg -n -C2 --type=kt -P 'MultipartBody\.Part\.createFormData\(' app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt || true
# 3) 빈 이미지 목록 처리 (빈 리스트를 null로 변환하는지) 확인
rg -n -C3 --type=kt -P '(if\s*\(images\.isEmpty\(\)\)|takeIf|takeUnless)' app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt || trueLength of output: 706 🏁 Script executed: #!/bin/bash
set -euo pipefail
echo "PWD: $(pwd)"
echo "--- locating FeedRepository.kt ---"
find app -type f -iname 'FeedRepository.kt' -print || true
echo "--- searching repository for likely patterns ---"
rg -n -S -C3 'createFormData\(|MultipartBody\.Part|toRequestBody\(|application/json|toMediaType\(|MediaType\.parse|RequestBody\.create|feeds\b|createFeed\(' || true
echo "--- showing candidate repository files (top 200 lines each) ---"
# show top matches for files that look relevant
rg -n --files-with-matches -S 'createFormData\(|toRequestBody\(|application/json|toMediaType\(|MultipartBody\.Part|RequestBody\.create' || true \
| head -n 20 \
| xargs -r -I{} sh -c 'echo ""; echo "===== {} ====="; sed -n "1,200p" "{}"'Length of output: 21725 🏁 Script executed: #!/bin/bash
set -euo pipefail
echo "---- FeedRepository.kt ----"
nl -ba app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt | sed -n '1,240p' || true
echo ""
echo "---- FeedService.kt ----"
nl -ba app/src/main/java/com/texthip/thip/data/service/FeedService.kt | sed -n '1,240p' || true
echo ""
echo "---- FeedWriteViewModel.kt ----"
nl -ba app/src/main/java/com/texthip/thip/ui/feed/viewmodel/FeedWriteViewModel.kt | sed -n '1,420p' || true
echo ""
echo "---- NetworkModule.kt ----"
nl -ba app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt | sed -n '1,200p' || trueLength of output: 1081 멀티파트 전송 점검 결과 — 조치 필요 확인 요약: 레포지토리에서 JSON RequestBody는 "application/json"으로 생성되며, 이미지 파트는 MultipartBody.Part.createFormData(paramName, ...)로 생성되고 빈 이미지 리스트는 null로 처리됩니다. 다음 항목을 확인/수정해주세요.
권장 작업(간단한 코드 예시)
🤖 Prompt for AI Agents |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
전반적으로 runcatching안쓰고 try catch를 썼던데 이유가 있을까용 ? 다른 코드들이랑 통일성있게 runcatching으로 수정하는게 어떨까욧 !?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
아 확인했습니다 지피티꺼 수정하는거를 까먹었네요