Merge pull request #79 from code-review-platform-flow/hotfix/mailbox

feat: mailbox 수정
code-review-platform-flow · Dec 17, 2024 · f74c7fa · f74c7fa
2 parents 3366fc3 + 14b7cfd
commit f74c7fa
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/main/java/com/flow/main/repository/CoffeeChatsRepository.java b/src/main/java/com/flow/main/repository/CoffeeChatsRepository.java
@@ -14,4 +14,7 @@ public interface CoffeeChatsRepository extends JpaRepository<CoffeeChatsEntity,
 	@Query("SELECT c FROM CoffeeChatsEntity  c WHERE c.initiatorUser.userId = :initiatorUserId")
 	List<CoffeeChatsEntity> findAllCoffeeChatsByInitiatorUserIdWithPageable(@Param("initiatorUserId") Long initiatorUserId, Pageable pageable);
 
+	@Query("SELECT c FROM CoffeeChatsEntity  c WHERE c.recipientUser.userId = :recipientUserId")
+	List<CoffeeChatsEntity> findAllCoffeeChatsByRecipientUserIdWithPageable(@Param("recipientUserId") Long recipientUserId, Pageable pageable);
+
 }
diff --git a/src/main/java/com/flow/main/service/coffeeChats/CoffeeChatsGetAllService.java b/src/main/java/com/flow/main/service/coffeeChats/CoffeeChatsGetAllService.java
@@ -2,10 +2,11 @@
 
 import org.springframework.data.domain.Pageable;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.springframework.stereotype.Service;
 
-import com.flow.main.dto.controller.coffeeChats.request.CoffeeChatsGetAllRequestDto;
 import com.flow.main.dto.controller.coffeeChats.response.CoffeeChatsGetAllResponseDto;
 import com.flow.main.dto.jpa.coffeeChats.CoffeeChatsDto;
 import com.flow.main.dto.jpa.users.UsersDto;
@@ -23,8 +24,18 @@ public class CoffeeChatsGetAllService {
 
 	public CoffeeChatsGetAllResponseDto getAllWithPageable(String email, Pageable pageable) {
 		UsersDto usersDto = usersService.findByEmail(email);
-		List<CoffeeChatsDto> coffeeChatsDtoList = coffeeChatsService.getAllByInitiatorUserIdWithPageable(usersDto.getUserId(), pageable);
-		return CoffeeChatsGetAllResponseDto.builder().coffeeChat(coffeeChatsDtoList).pageable(pageable).build();
+		List<CoffeeChatsDto> coffeeChatsDtoListInitiator = coffeeChatsService.getAllByInitiatorUserIdWithPageable(usersDto.getUserId(), pageable);
+		List<CoffeeChatsDto> coffeeChatsDtoListRecipient = coffeeChatsService.getAllByRecipientUserIdWithPageable(usersDto.getUserId(), pageable);
+
+		List<CoffeeChatsDto> combinedList = Stream.concat(
+				coffeeChatsDtoListInitiator.stream(),
+				coffeeChatsDtoListRecipient.stream()
+		).collect(Collectors.toList());
+
+		return CoffeeChatsGetAllResponseDto.builder()
+				.coffeeChat(combinedList)
+				.pageable(pageable)
+				.build();
 	}
 
 }
diff --git a/src/main/java/com/flow/main/service/coffeeChats/persistence/CoffeeChatsService.java b/src/main/java/com/flow/main/service/coffeeChats/persistence/CoffeeChatsService.java
@@ -25,6 +25,11 @@ public List<CoffeeChatsDto> getAllByInitiatorUserIdWithPageable(Long initiatorUs
 		return coffeeChatsMapper.toListDto(coffeeChatsRepository.findAllCoffeeChatsByInitiatorUserIdWithPageable(initiatorUserId, pageable));
 	}
 
+    @Transactional(readOnly = true)
+	public List<CoffeeChatsDto> getAllByRecipientUserIdWithPageable(Long recipientUserId, Pageable pageable) {
+		return coffeeChatsMapper.toListDto(coffeeChatsRepository.findAllCoffeeChatsByRecipientUserIdWithPageable(recipientUserId, pageable));
+	}
+
 	@Transactional
 	public CoffeeChatsDto save(CoffeeChatsDto coffeeChatsDto) {
 		CoffeeChatsEntity coffeeChatsEntity = coffeeChatsMapper.toEntity(coffeeChatsDto);