diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/dto/ChatCharacterSearchListPageResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/dto/ChatCharacterSearchListPageResponse.kt new file mode 100644 index 0000000..4495264 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/dto/ChatCharacterSearchListPageResponse.kt @@ -0,0 +1,9 @@ +package kr.co.vividnext.sodalive.admin.chat.character.dto + +/** + * 캐릭터 검색 결과 페이지 응답 DTO + */ +data class ChatCharacterSearchListPageResponse( + val totalCount: Long, + val content: List +) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/dto/ChatCharacterSearchResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/dto/OriginalWorkChatCharacterResponse.kt similarity index 51% rename from src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/dto/ChatCharacterSearchResponse.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/dto/OriginalWorkChatCharacterResponse.kt index 9c93850..510a15a 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/dto/ChatCharacterSearchResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/dto/OriginalWorkChatCharacterResponse.kt @@ -3,16 +3,16 @@ package kr.co.vividnext.sodalive.admin.chat.character.dto import kr.co.vividnext.sodalive.chat.character.ChatCharacter /** - * 캐릭터 검색 결과 응답 DTO + * 원작 연결된 캐릭터 결과 응답 DTO */ -data class ChatCharacterSearchResponse( +data class OriginalWorkChatCharacterResponse( val id: Long, val name: String, val imagePath: String? ) { companion object { - fun from(character: ChatCharacter, imageHost: String): ChatCharacterSearchResponse { - return ChatCharacterSearchResponse( + fun from(character: ChatCharacter, imageHost: String): OriginalWorkChatCharacterResponse { + return OriginalWorkChatCharacterResponse( id = character.id!!, name = character.name, 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 content: List + val content: List ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/service/AdminChatCharacterService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/service/AdminChatCharacterService.kt index 775673d..3663369 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/service/AdminChatCharacterService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/service/AdminChatCharacterService.kt @@ -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.ChatCharacterListPageResponse 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.common.SodaException import org.springframework.data.domain.Page @@ -72,8 +71,8 @@ class AdminChatCharacterService( searchTerm: String, pageable: Pageable, imageHost: String = "" - ): Page { + ): Page { val characters = chatCharacterRepository.searchCharacters(searchTerm, pageable) - return characters.map { ChatCharacterSearchResponse.from(it, imageHost) } + return characters.map { ChatCharacterListResponse.from(it, imageHost) } } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/original/AdminOriginalWorkController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/original/AdminOriginalWorkController.kt index 71b14c8..95365dd 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/original/AdminOriginalWorkController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/original/AdminOriginalWorkController.kt @@ -2,8 +2,8 @@ package kr.co.vividnext.sodalive.admin.chat.original import com.amazonaws.services.s3.model.ObjectMetadata 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.ChatCharacterSearchResponse +import kr.co.vividnext.sodalive.admin.chat.character.dto.OriginalWorkChatCharacterListPageResponse +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.OriginalWorkPageResponse import kr.co.vividnext.sodalive.admin.chat.original.dto.OriginalWorkRegisterRequest @@ -172,9 +172,9 @@ class AdminOriginalWorkController( @RequestParam(defaultValue = "20") size: Int ) = run { 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( - ChatCharacterSearchListPageResponse( + OriginalWorkChatCharacterListPageResponse( totalCount = pageRes.totalElements, content = content )