Merge branch 'dev' into refactor/#115-로그인-에러-페이지-반환

build.gradle

@@ -58,8 +58,11 @@ dependencies {
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.0'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
+    testCompileOnly 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
 }
 
 tasks.named('test') {
     useJUnitPlatform()
-}
+}

src/main/java/com/example/eatmate/EatmateApplication.java

@@ -3,9 +3,13 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableJpaAuditing
+@EnableScheduling
+@EnableAsync
 public class EatmateApplication {
 
 	public static void main(String[] args) {

src/main/java/com/example/eatmate/app/domain/chat/controller/ChatController.java

@@ -39,7 +39,7 @@ public void sendChatMessage(
 	}
 
 	//보완적 함수 웹소켓 끊어졌을 경우
-	@PostMapping("/chat/{chatRoomId}")
+	@PostMapping("/api/chat/{chatRoomId}")
 	@Operation(summary = "채팅 메세지 전송 대체 수단", description = "채팅을 메세지를 대체 방안을 통해 전송합니다.")
 	public ResponseEntity<GlobalResponseDto<Void>> sendChatMessageAlter(
 		@PathVariable Long chatRoomId,

src/main/java/com/example/eatmate/app/domain/chat/domain/repository/ChatRepository.java

@@ -1,9 +1,10 @@
 package com.example.eatmate.app.domain.chat.domain.repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import com.example.eatmate.app.domain.chat.domain.Chat;
@@ -12,7 +13,9 @@
 
 public interface ChatRepository extends JpaRepository<Chat, Long> {
 
-	Page<Chat> findChatByChatRoom(ChatRoom chatRoom, Pageable pageable);
+	Slice<Chat> findChatByChatRoomOrderByCreatedAtDesc(ChatRoom chatRoom, Pageable pageable);
+
+	Slice<Chat> findChatByChatRoomAndCreatedAtLessThanOrderByCreatedAtDesc(ChatRoom chatRoom, LocalDateTime createdAt, Pageable pageable);
 
 	List<Chat> findChatByChatRoomAndDeletedStatusNot(ChatRoom chatRoom, DeletedStatus deletedStatus);
-}
+}

src/main/java/com/example/eatmate/app/domain/chat/dto/response/ChatMessageListDto.java

@@ -0,0 +1,33 @@
+package com.example.eatmate.app.domain.chat.dto.response;
+
+import java.util.List;
+
+import org.springframework.data.domain.Slice;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class ChatMessageListDto {
+
+	private List<ChatMessageResponseDto> chats;
+	private int pageNumber;
+	private boolean isLast;
+
+	@Builder
+	private ChatMessageListDto(List<ChatMessageResponseDto> chats, int pageNumber, boolean isLast) {
+		this.chats = chats;
+		this.pageNumber = pageNumber;
+		this.isLast = isLast;
+	}
+
+	public static ChatMessageListDto from(Slice<ChatMessageResponseDto> chatList) {
+		return ChatMessageListDto.builder()
+			.chats(chatList.getContent())
+			.pageNumber(chatList.getNumber())
+			.isLast(chatList.isLast())
+			.build();
+	}
+}

src/main/java/com/example/eatmate/app/domain/chat/service/ChatService.java

@@ -1,16 +1,18 @@
 package com.example.eatmate.app.domain.chat.service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.example.eatmate.app.domain.chat.domain.Chat;
 import com.example.eatmate.app.domain.chat.domain.repository.ChatRepository;
 import com.example.eatmate.app.domain.chat.dto.request.ChatMessageRequestDto;
+import com.example.eatmate.app.domain.chat.dto.response.ChatMessageListDto;
 import com.example.eatmate.app.domain.chat.dto.response.ChatMessageResponseDto;
 import com.example.eatmate.app.domain.chatRoom.domain.ChatRoom;
 import com.example.eatmate.app.domain.chatRoom.domain.DeletedStatus;
@@ -50,19 +52,41 @@ public void saveChat(ChatMessageRequestDto chatMessageDto, UserDetails userDetai
 		chatRoom.updateLastChatAt(chat.getCreatedAt());
 	}
 
-	//불러오기(읽기 상태 없음)
-	public Page<ChatMessageResponseDto> loadChat(Long chatRoomId, Pageable pageable) {
+	//불러오기
+	public Slice<ChatMessageResponseDto> loadChat(Long chatRoomId, LocalDateTime cursor, Pageable pageable) {
 		ChatRoom chatRoom = chatRoomRepository.findByIdAndDeletedStatus(chatRoomId, DeletedStatus.NOT_DELETED)
 			.orElseThrow(() -> new CommonException(ErrorCode.CHATROOM_NOT_FOUND));
 
-		Page<Chat> chats = chatRepository.findChatByChatRoom(chatRoom, pageable);
+		try{
+			if (cursor == null) {
+				Slice<Chat> chats = chatRepository.findChatByChatRoomOrderByCreatedAtDesc(chatRoom, pageable);
+				return chats.map(ChatMessageResponseDto::from);
+			}
+			if (cursor.isAfter(LocalDateTime.now())) {
+				throw new CommonException(ErrorCode.INVALID_CURSOR);
+			}
+			Slice<Chat> chats = chatRepository.findChatByChatRoomAndCreatedAtLessThanOrderByCreatedAtDesc(chatRoom, cursor, pageable);
 
-		return chats.map(ChatMessageResponseDto::from);
+			return chats.map(ChatMessageResponseDto::from);
+
+		} catch (CommonException e) {
+			throw e;
+
+		} catch (Exception e) {
+			throw new CommonException(ErrorCode.CHAT_LOAD_FAIL);
+
+		}
 	}
 
 	//채팅 삭제
 	public void deleteChat(ChatRoom chatRoom) {
 		List<Chat> chatList = chatRepository.findChatByChatRoomAndDeletedStatusNot(chatRoom, DeletedStatus.NOT_DELETED);
 		chatList.forEach(Chat::deleteChat);
 	}
+
+	public ChatMessageListDto convertChatList(Long chatRoomId, LocalDateTime cursor, Pageable pageable) {
+		Slice<ChatMessageResponseDto> chatDtos = loadChat(chatRoomId, cursor, pageable);
+
+		return ChatMessageListDto.from(chatDtos);
+	}
 }

src/main/java/com/example/eatmate/app/domain/chatRoom/controller/ChatRoomController.java

@@ -1,8 +1,11 @@
 package com.example.eatmate.app.domain.chatRoom.controller;
 
+import java.time.LocalDateTime;
+
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.web.PageableDefault;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -11,9 +14,11 @@
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.example.eatmate.app.domain.chat.service.ChatPublisher;
+import com.example.eatmate.app.domain.chat.dto.response.ChatMessageListDto;
+import com.example.eatmate.app.domain.chat.service.ChatService;
 import com.example.eatmate.app.domain.chatRoom.dto.response.ChatRoomResponseDto;
 import com.example.eatmate.app.domain.chatRoom.service.ChatRoomService;
 import com.example.eatmate.global.response.GlobalResponseDto;
@@ -26,20 +31,31 @@
 @RequiredArgsConstructor
 public class ChatRoomController {
 
-	private final ChatPublisher chatPublisher;
 	private final ChatRoomService chatRoomService;
+	private final ChatService chatService;
 
 	@GetMapping("/{chatRoomId}")
 	@Operation(summary = "채팅방 입장", description = "채팅방에 입장합니다.")
 	public ResponseEntity<GlobalResponseDto<ChatRoomResponseDto>> enterChatRoom(
 		@PathVariable Long chatRoomId,
 		@AuthenticationPrincipal UserDetails userDetails,
-		@PageableDefault(size = 20, sort = "createdAt", direction = Sort.Direction.ASC) Pageable pageable) {
+		@PageableDefault(size = 20, sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable) {
 
 		return ResponseEntity.status(HttpStatus.OK)
 			.body(GlobalResponseDto.success(chatRoomService.enterChatRoomAndLoadMessage(chatRoomId, userDetails, pageable)));
 	}
 
+	@GetMapping("/{chatRoomId}/past")
+	@Operation(summary = "채팅방의 과거 채팅 로딩", description = "채팅방의 과거 채팅을 로딩합니다.")
+	public ResponseEntity<GlobalResponseDto<ChatMessageListDto>> loadChatRoomPastMessage(
+		@PathVariable Long chatRoomId,
+		@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime cursor,
+		@PageableDefault(size = 20, sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable) {
+
+		return ResponseEntity.status(HttpStatus.OK)
+			.body(GlobalResponseDto.success(chatService.convertChatList(chatRoomId, cursor, pageable)));
+	}
+
 	@PatchMapping("/{chatRoomId}")
 	@Operation(summary = "채팅방 나가기", description = "채팅방을 나갑니다.")
 	public ResponseEntity<GlobalResponseDto<Void>> leftChatRoom(

src/main/java/com/example/eatmate/app/domain/chatRoom/dto/response/ChatRoomResponseDto.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Slice;
 
 import com.example.eatmate.app.domain.chat.dto.response.ChatMessageResponseDto;
 import com.example.eatmate.app.domain.member.domain.Mbti;
@@ -23,7 +23,7 @@ public class ChatRoomResponseDto {
 	private boolean isLast;
 
 	@Builder
-	private ChatRoomResponseDto(Page<ChatMessageResponseDto> chats, List<ChatMemberResponseDto> participants,
+	private ChatRoomResponseDto(Slice<ChatMessageResponseDto> chats, List<ChatMemberResponseDto> participants,
 		ChatRoomDeliveryNoticeDto deliveryNotice, ChatRoomOfflineNoticeDto offlineNotice) {
 		this.chats = chats.getContent();
 		this.participants = participants;
@@ -33,37 +33,42 @@ private ChatRoomResponseDto(Page<ChatMessageResponseDto> chats, List<ChatMemberR
 		this.isLast = chats.isLast();
 	}
 
-	public static ChatRoomResponseDto ofWithDelivery(List<ChatMemberResponseDto> participants, Page<ChatMessageResponseDto> chatPage, ChatRoomDeliveryNoticeDto deliveryNotice) {
+	public static ChatRoomResponseDto ofWithDelivery(List<ChatMemberResponseDto> participants, Slice<ChatMessageResponseDto> chatPage, ChatRoomDeliveryNoticeDto deliveryNotice) {
 		return ChatRoomResponseDto.builder()
 			.chats(chatPage)
 			.participants(participants)
+			.offlineNotice(null)
 			.deliveryNotice(deliveryNotice)
 			.build();
 	}
 
-	public static ChatRoomResponseDto ofWithOffline(List<ChatMemberResponseDto> participants, Page<ChatMessageResponseDto> chatPage, ChatRoomOfflineNoticeDto offlineNotice) {
+	public static ChatRoomResponseDto ofWithOffline(List<ChatMemberResponseDto> participants, Slice<ChatMessageResponseDto> chatPage, ChatRoomOfflineNoticeDto offlineNotice) {
 		return ChatRoomResponseDto.builder()
 			.chats(chatPage)
 			.participants(participants)
 			.offlineNotice(offlineNotice)
+			.deliveryNotice(null)
 			.build();
 	}
 
 	@Getter
 	public static class ChatMemberResponseDto {
-		private String memberName;
+		private String nickname;
 		private Mbti mbti;
+		private String profileImageUrl;
 
 		@Builder
-		private ChatMemberResponseDto(String memberName, Mbti mbti) {
-			this.memberName = memberName;
+		private ChatMemberResponseDto(String nickname, Mbti mbti, String profileImageUrl) {
+			this.nickname = nickname;
 			this.mbti = mbti;
+			this.profileImageUrl = profileImageUrl;
 		}
 
 		public static ChatMemberResponseDto from(Member member) {
 			return ChatMemberResponseDto.builder()
-				.memberName(member.getName())
+				.nickname(member.getNickname())
 				.mbti(member.getMbti())
+				.profileImageUrl(member.getProfileImage().getImageUrl())
 				.build();
 		}
 	}

src/main/java/com/example/eatmate/app/domain/chatRoom/service/ChatRoomService.java

@@ -4,8 +4,8 @@
 import java.util.stream.Collectors;
 
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -79,7 +79,7 @@ public ChatRoomResponseDto enterChatRoomAndLoadMessage(Long chatRoomId, UserDeta
 			.map(memberChatRoom -> ChatRoomResponseDto.ChatMemberResponseDto.from(memberChatRoom.getMember()))
 			.collect(Collectors.toList());
 
-		Page<ChatMessageResponseDto> chatList = chatService.loadChat(chatRoomId, pageable);
+		Slice<ChatMessageResponseDto> chatList = chatService.loadChat(chatRoomId, null, pageable);
 
 		//채팅방 공지 처리
 		Meeting meeting = chatRoom.getMeeting();

src/main/java/com/example/eatmate/app/domain/meeting/domain/DeliveryMeeting.java

@@ -9,7 +9,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import jakarta.validation.constraints.Future;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -33,15 +32,11 @@ public class DeliveryMeeting extends Meeting {
 	private String pickupLocation; // 현재 지도 API 관련 정보가 없어 임시로 String 자료형 선언
 
 	@Column(nullable = false)
-	@Future
 	private LocalDateTime orderDeadline;
 
 	@Column(nullable = false)
 	private String accountNumber;
 
-	@Column(nullable = false)
-	private String accountHolder;
-
 	@Column(nullable = false)
 	private BankName bankName;
 
@@ -52,7 +47,6 @@ public void updateDeliveryMeeting(
 		String storeName,
 		String pickupLocation,
 		String accountNumber,
-		String accountHolder,
 		Image backgroundImage
 	) {
 		super.updateMeeting(meetingName, description, backgroundImage);
@@ -61,6 +55,5 @@ public void updateDeliveryMeeting(
 		this.storeName = storeName;
 		this.pickupLocation = pickupLocation;
 		this.accountNumber = accountNumber;
-		this.accountHolder = accountHolder;
 	}
 }

src/main/java/com/example/eatmate/app/domain/meeting/domain/OfflineMeeting.java

@@ -9,7 +9,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import jakarta.validation.constraints.Future;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -25,7 +24,6 @@ public class OfflineMeeting extends Meeting {
 	private String meetingPlace; // 현재 지도 API 관련 정보가 없어 임시로 String 자료형 선언
 
 	@Column(nullable = false)
-	@Future
 	private LocalDateTime meetingDate;
 
 	@Column(nullable = false)

src/main/java/com/example/eatmate/app/domain/meeting/domain/repository/DeliveryMeetingRepository.java

@@ -1,5 +1,8 @@
 package com.example.eatmate.app.domain.meeting.domain.repository;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -11,5 +14,8 @@
 public interface DeliveryMeetingRepository extends JpaRepository<DeliveryMeeting, Long> {
 	Slice<DeliveryMeeting> findAllByFoodCategoryAndMeetingStatus(FoodCategory foodCategory,
 		MeetingStatus meetingStatus, Pageable pageable);
+
+	List<DeliveryMeeting> findByMeetingStatusAndOrderDeadlineBefore(MeetingStatus meetingStatus,
+		LocalDateTime orderDeadline);
 }