[FIX] 메시지 조회 api 응답값 수정 (#220)

src/main/java/com/brainpix/message/converter/GetMessageListConverter.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -10,6 +11,7 @@
 import com.brainpix.api.exception.BrainPixException;
 import com.brainpix.message.dto.GetMessageListDto;
 import com.brainpix.message.dto.MessageSearchType;
+import com.brainpix.message.dto.MessageType;
 import com.brainpix.message.model.Message;
 
 public class GetMessageListConverter {
@@ -27,26 +29,30 @@ public static GetMessageListDto.Parameter toParameter(Long userId, String search
 			.build();
 	}
 
-	public static GetMessageListDto.Response toResponse(Page<Message> messages, Map<Long, String> userIdToNameMap) {
+	public static GetMessageListDto.Response toResponse(Page<Message> messages, Map<Long, String> userIdToNameMap,
+		Long userId) {
 		List<Message> messageList = messages.getContent();
 		List<GetMessageListDto.MessageDetail> messageDetailList = messageList.stream()
-			.map(message -> toMessageDetail(message, userIdToNameMap))
+			.map(message -> toMessageDetail(message, userIdToNameMap, userId))
 			.toList();
 
 		return GetMessageListDto.Response.builder()
 			.messageDetailList(messageDetailList)
 			.hasNext(messages.hasNext())
+			.currentPage(messages.getNumber())
 			.build();
 	}
 
-	public static GetMessageListDto.MessageDetail toMessageDetail(Message message, Map<Long, String> userIdToNameMap){
+	public static GetMessageListDto.MessageDetail toMessageDetail(Message message, Map<Long, String> userIdToNameMap,
+		Long userId) {
 		return GetMessageListDto.MessageDetail.builder()
 			.messageId(message.getId())
 			.title(message.getTitle())
 			.senderNickname(userIdToNameMap.get(message.getSenderId()))
 			.receiverNickname(userIdToNameMap.get(message.getReceiverId()))
 			.sendDate(message.getCreatedAt().toLocalDate())
 			.isRead(message.getIsRead())
+			.messageType(Objects.equals(message.getReceiverId(), userId) ? MessageType.RECEIVED : MessageType.SEND)
 			.build();
 	}
 }

src/main/java/com/brainpix/message/dto/GetMessageListDto.java

@@ -22,6 +22,7 @@ public static class Parameter {
 	@Builder
 	public static class Response {
 		private List<MessageDetail> messageDetailList;
+		private Integer currentPage;
 		private Boolean hasNext;
 	}
 
@@ -34,5 +35,6 @@ public static class MessageDetail {
 		private String receiverNickname;
 		private LocalDate sendDate;
 		private Boolean isRead;
+		private MessageType messageType;
 	}
 }

src/main/java/com/brainpix/message/dto/MessageType.java

@@ -0,0 +1,5 @@
+package com.brainpix.message.dto;
+
+public enum MessageType {
+	RECEIVED, SEND
+}

src/main/java/com/brainpix/message/service/MessageService.java

@@ -73,7 +73,7 @@ public GetMessageListDto.Response getMessageList(GetMessageListDto.Parameter par
 			.stream()
 			.collect(Collectors.toMap(User::getId, User::getNickName));
 
-		return GetMessageListConverter.toResponse(messages, userIdAndNickNameMap);
+		return GetMessageListConverter.toResponse(messages, userIdAndNickNameMap, parameter.getUserId());
 	}
 
 	@Transactional(readOnly = true)