feat(admin-character-list): 캐릭터 검색결과
- 캐릭터 목록과 동일한 내용으로 변경
This commit is contained in:
parent
eb2d093b02
commit
dad517a953
|
@ -0,0 +1,9 @@
|
||||||
|
package kr.co.vividnext.sodalive.admin.chat.character.dto
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 캐릭터 검색 결과 페이지 응답 DTO
|
||||||
|
*/
|
||||||
|
data class ChatCharacterSearchListPageResponse(
|
||||||
|
val totalCount: Long,
|
||||||
|
val content: List<ChatCharacterListResponse>
|
||||||
|
)
|
|
@ -3,16 +3,16 @@ package kr.co.vividnext.sodalive.admin.chat.character.dto
|
||||||
import kr.co.vividnext.sodalive.chat.character.ChatCharacter
|
import kr.co.vividnext.sodalive.chat.character.ChatCharacter
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 캐릭터 검색 결과 응답 DTO
|
* 원작 연결된 캐릭터 결과 응답 DTO
|
||||||
*/
|
*/
|
||||||
data class ChatCharacterSearchResponse(
|
data class OriginalWorkChatCharacterResponse(
|
||||||
val id: Long,
|
val id: Long,
|
||||||
val name: String,
|
val name: String,
|
||||||
val imagePath: String?
|
val imagePath: String?
|
||||||
) {
|
) {
|
||||||
companion object {
|
companion object {
|
||||||
fun from(character: ChatCharacter, imageHost: String): ChatCharacterSearchResponse {
|
fun from(character: ChatCharacter, imageHost: String): OriginalWorkChatCharacterResponse {
|
||||||
return ChatCharacterSearchResponse(
|
return OriginalWorkChatCharacterResponse(
|
||||||
id = character.id!!,
|
id = character.id!!,
|
||||||
name = character.name,
|
name = character.name,
|
||||||
imagePath = character.imagePath?.let { "$imageHost/$it" }
|
imagePath = character.imagePath?.let { "$imageHost/$it" }
|
||||||
|
@ -22,9 +22,9 @@ data class ChatCharacterSearchResponse(
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 캐릭터 검색 결과 페이지 응답 DTO
|
* 원작 연결된 캐릭터 결과 페이지 응답 DTO
|
||||||
*/
|
*/
|
||||||
data class ChatCharacterSearchListPageResponse(
|
data class OriginalWorkChatCharacterListPageResponse(
|
||||||
val totalCount: Long,
|
val totalCount: Long,
|
||||||
val content: List<ChatCharacterSearchResponse>
|
val content: List<OriginalWorkChatCharacterResponse>
|
||||||
)
|
)
|
|
@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.admin.chat.character.service
|
||||||
import kr.co.vividnext.sodalive.admin.chat.character.dto.ChatCharacterDetailResponse
|
import kr.co.vividnext.sodalive.admin.chat.character.dto.ChatCharacterDetailResponse
|
||||||
import kr.co.vividnext.sodalive.admin.chat.character.dto.ChatCharacterListPageResponse
|
import kr.co.vividnext.sodalive.admin.chat.character.dto.ChatCharacterListPageResponse
|
||||||
import kr.co.vividnext.sodalive.admin.chat.character.dto.ChatCharacterListResponse
|
import kr.co.vividnext.sodalive.admin.chat.character.dto.ChatCharacterListResponse
|
||||||
import kr.co.vividnext.sodalive.admin.chat.character.dto.ChatCharacterSearchResponse
|
|
||||||
import kr.co.vividnext.sodalive.chat.character.repository.ChatCharacterRepository
|
import kr.co.vividnext.sodalive.chat.character.repository.ChatCharacterRepository
|
||||||
import kr.co.vividnext.sodalive.common.SodaException
|
import kr.co.vividnext.sodalive.common.SodaException
|
||||||
import org.springframework.data.domain.Page
|
import org.springframework.data.domain.Page
|
||||||
|
@ -72,8 +71,8 @@ class AdminChatCharacterService(
|
||||||
searchTerm: String,
|
searchTerm: String,
|
||||||
pageable: Pageable,
|
pageable: Pageable,
|
||||||
imageHost: String = ""
|
imageHost: String = ""
|
||||||
): Page<ChatCharacterSearchResponse> {
|
): Page<ChatCharacterListResponse> {
|
||||||
val characters = chatCharacterRepository.searchCharacters(searchTerm, pageable)
|
val characters = chatCharacterRepository.searchCharacters(searchTerm, pageable)
|
||||||
return characters.map { ChatCharacterSearchResponse.from(it, imageHost) }
|
return characters.map { ChatCharacterListResponse.from(it, imageHost) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,8 +2,8 @@ package kr.co.vividnext.sodalive.admin.chat.original
|
||||||
|
|
||||||
import com.amazonaws.services.s3.model.ObjectMetadata
|
import com.amazonaws.services.s3.model.ObjectMetadata
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper
|
import com.fasterxml.jackson.databind.ObjectMapper
|
||||||
import kr.co.vividnext.sodalive.admin.chat.character.dto.ChatCharacterSearchListPageResponse
|
import kr.co.vividnext.sodalive.admin.chat.character.dto.OriginalWorkChatCharacterListPageResponse
|
||||||
import kr.co.vividnext.sodalive.admin.chat.character.dto.ChatCharacterSearchResponse
|
import kr.co.vividnext.sodalive.admin.chat.character.dto.OriginalWorkChatCharacterResponse
|
||||||
import kr.co.vividnext.sodalive.admin.chat.original.dto.OriginalWorkAssignCharactersRequest
|
import kr.co.vividnext.sodalive.admin.chat.original.dto.OriginalWorkAssignCharactersRequest
|
||||||
import kr.co.vividnext.sodalive.admin.chat.original.dto.OriginalWorkPageResponse
|
import kr.co.vividnext.sodalive.admin.chat.original.dto.OriginalWorkPageResponse
|
||||||
import kr.co.vividnext.sodalive.admin.chat.original.dto.OriginalWorkRegisterRequest
|
import kr.co.vividnext.sodalive.admin.chat.original.dto.OriginalWorkRegisterRequest
|
||||||
|
@ -172,9 +172,9 @@ class AdminOriginalWorkController(
|
||||||
@RequestParam(defaultValue = "20") size: Int
|
@RequestParam(defaultValue = "20") size: Int
|
||||||
) = run {
|
) = run {
|
||||||
val pageRes = originalWorkService.getCharactersOfOriginalWorkPage(id, page, size)
|
val pageRes = originalWorkService.getCharactersOfOriginalWorkPage(id, page, size)
|
||||||
val content = pageRes.content.map { ChatCharacterSearchResponse.from(it, imageHost) }
|
val content = pageRes.content.map { OriginalWorkChatCharacterResponse.from(it, imageHost) }
|
||||||
ApiResponse.ok(
|
ApiResponse.ok(
|
||||||
ChatCharacterSearchListPageResponse(
|
OriginalWorkChatCharacterListPageResponse(
|
||||||
totalCount = pageRes.totalElements,
|
totalCount = pageRes.totalElements,
|
||||||
content = content
|
content = content
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue