Skip to content

Commit 9a8dad3

Browse files
authored
refactor(be) : readonly 추가 및 카멜케이스 수정,사용하지 않는 서비스 로직 삭제 (#52)
* feat(be) : ë�서비스 단순 조회에 readonly 추가 * refactor(be): msg,room controller 카멜케이스 ì�수정 * refactor(be): msg,room controlservice 카멜케이스 수정 * refactor(be): 사용하지 않는 서비스로직 삭제
1 parent 76061f6 commit 9a8dad3

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

src/main/kotlin/com/back/koreaTravelGuide/domain/userChat/chatmessage/controller/ChatMessageController.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController
1515
@RestController
1616
@RequestMapping("/api/userchat/rooms")
1717
class ChatMessageController(
18-
private val msgSvc: ChatMessageService,
18+
private val messageService: ChatMessageService,
1919
private val messagingTemplate: SimpMessagingTemplate,
2020
) {
2121
@GetMapping("/{roomId}/messages")
@@ -26,9 +26,9 @@ class ChatMessageController(
2626
): ResponseEntity<ApiResponse<Any>> {
2727
val messages =
2828
if (after == null) {
29-
msgSvc.getlistbefore(roomId, limit)
29+
messageService.getlistbefore(roomId, limit)
3030
} else {
31-
msgSvc.getlistafter(roomId, after)
31+
messageService.getlistafter(roomId, after)
3232
}
3333
return ResponseEntity.ok(ApiResponse(msg = "메시지 조회", data = messages))
3434
}
@@ -38,7 +38,7 @@ class ChatMessageController(
3838
@PathVariable roomId: Long,
3939
@RequestBody req: ChatMessageService.SendMessageReq,
4040
): ResponseEntity<ApiResponse<Any>> {
41-
val saved = msgSvc.send(roomId, req)
41+
val saved = messageService.send(roomId, req)
4242
messagingTemplate.convertAndSend(
4343
"/topic/userchat/$roomId",
4444
ApiResponse(msg = "메시지 전송", data = saved),

src/main/kotlin/com/back/koreaTravelGuide/domain/userChat/chatmessage/service/ChatMessageService.kt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,29 @@ import org.springframework.transaction.annotation.Transactional
88

99
@Service
1010
class ChatMessageService(
11-
private val msgRepository: ChatMessageRepository,
11+
private val messageRepository: ChatMessageRepository,
1212
private val roomRepository: ChatRoomRepository,
1313
) {
1414
data class SendMessageReq(val senderId: Long, val content: String)
1515

16+
@Transactional(readOnly = true)
1617
fun getlistbefore(
1718
roomId: Long,
1819
limit: Int,
19-
): List<ChatMessage> = msgRepository.findTop50ByRoomIdOrderByIdDesc(roomId).asReversed()
20+
): List<ChatMessage> = messageRepository.findTop50ByRoomIdOrderByIdDesc(roomId).asReversed()
2021

22+
@Transactional(readOnly = true)
2123
fun getlistafter(
2224
roomId: Long,
2325
afterId: Long,
24-
): List<ChatMessage> = msgRepository.findByRoomIdAndIdGreaterThanOrderByIdAsc(roomId, afterId)
25-
26-
@Transactional
27-
fun deleteByRoom(roomId: Long) {
28-
msgRepository.deleteByRoomId(roomId)
29-
}
26+
): List<ChatMessage> = messageRepository.findByRoomIdAndIdGreaterThanOrderByIdAsc(roomId, afterId)
3027

3128
@Transactional
3229
fun send(
3330
roomId: Long,
3431
req: SendMessageReq,
3532
): ChatMessage {
36-
val saved = msgRepository.save(ChatMessage(roomId = roomId, senderId = req.senderId, content = req.content))
33+
val saved = messageRepository.save(ChatMessage(roomId = roomId, senderId = req.senderId, content = req.content))
3734
roomRepository.findById(roomId).ifPresent {
3835
roomRepository.save(it.copy(updatedAt = saved.createdAt, lastMessageId = saved.id))
3936
}

src/main/kotlin/com/back/koreaTravelGuide/domain/userChat/chatroom/controller/ChatRoomController.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController
1414
@RestController
1515
@RequestMapping("/api/userchat/rooms")
1616
class ChatRoomController(
17-
private val roomSvc: ChatRoomService,
17+
private val roomService: ChatRoomService,
1818
) {
1919
data class StartChatReq(val guideId: Long, val userId: Long)
2020

@@ -25,7 +25,7 @@ class ChatRoomController(
2525
fun startChat(
2626
@RequestBody req: StartChatReq,
2727
): ResponseEntity<ApiResponse<Map<String, Long>>> {
28-
val roomId = roomSvc.exceptOneToOneRoom(req.guideId, req.userId).id!!
28+
val roomId = roomService.exceptOneToOneRoom(req.guideId, req.userId).id!!
2929
return ResponseEntity.ok(ApiResponse(msg = "채팅방 시작", data = mapOf("roomId" to roomId)))
3030
}
3131

@@ -34,12 +34,12 @@ class ChatRoomController(
3434
@PathVariable roomId: Long,
3535
@RequestBody req: DeleteChatReq,
3636
): ResponseEntity<ApiResponse<Unit>> {
37-
roomSvc.deleteByOwner(roomId, req.userId)
37+
roomService.deleteByOwner(roomId, req.userId)
3838
return ResponseEntity.ok(ApiResponse("채팅방 삭제 완료"))
3939
}
4040

4141
@GetMapping("/{roomId}")
4242
fun get(
4343
@PathVariable roomId: Long,
44-
) = ResponseEntity.ok(ApiResponse(msg = "채팅방 조회", data = roomSvc.get(roomId)))
44+
) = ResponseEntity.ok(ApiResponse(msg = "채팅방 조회", data = roomService.get(roomId)))
4545
}

src/main/kotlin/com/back/koreaTravelGuide/domain/userChat/chatroom/service/ChatRoomService.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class ChatRoomService(
2727
)
2828
}
2929

30+
@Transactional(readOnly = true)
3031
fun get(roomId: Long): ChatRoom =
3132
roomRepository.findById(roomId)
3233
.orElseThrow { NoSuchElementException("room not found: $roomId") }

0 commit comments

Comments
 (0)