Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class ChatRoomResDto {
private String sellerPhoneNumber;
private Long productId;
private String productTitle;
private String productImage;
private String productStatus;
private String productPrice;
private Boolean isActive;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.campick.server.api.chat.repository;

import com.campick.server.api.chat.entity.ChatRoom;
import com.campick.server.api.member.entity.Member;
import com.campick.server.api.product.entity.Product;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
Expand All @@ -24,4 +26,5 @@ public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
"WHERE s.id = :memberId OR b.id = :memberId")
List<ChatRoom> findAllByMemberId(@Param("memberId") Long memberId);

Optional<ChatRoom> findByProductAndSellerAndBuyer(Product product, Member seller, Member buyer);
}
24 changes: 18 additions & 6 deletions src/main/java/com/campick/server/api/chat/service/ChatService.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,18 @@ public Long startChatRoom(ChatRoomReqDto chatRoomReqDto, Long memberId) {
Member seller = product.getSeller();
Member buyer = memberRepository.findById(memberId).orElseThrow(
() -> new NotFoundException(ErrorStatus.MEMBER_NOT_FOUND.getMessage()));
ChatRoom chatRoom = ChatRoom.builder()
.seller(seller)
.buyer(buyer)
.product(product)
.build();
chatRoomRepository.save(chatRoom);

ChatRoom chatRoom = chatRoomRepository.findByProductAndSellerAndBuyer(product, seller, buyer)
.orElse(null);

if (chatRoom == null) {
chatRoom = ChatRoom.builder()
.seller(seller)
.buyer(buyer)
.product(product)
.build();
chatRoomRepository.save(chatRoom);
}
return chatRoom.getId();
}

Expand Down Expand Up @@ -239,6 +244,12 @@ public void broadcastSoldEvent(WebSocketSession session, JsonNode data) {
}

private ChatRoomResDto convertToChatRoomResDto(ChatRoom chatRoom, List<ChatMessage> chatMessages) {
String thumbnailImage = chatRoom.getProduct().getImages().stream()
.filter(ProductImage::getIsThumbnail)
.map(ProductImage::getImageUrl)
.findFirst()
.orElse(null);

ChatRoomResDto chatRoomResDto = new ChatRoomResDto();
chatRoomResDto.setSellerId(chatRoom.getSeller().getId());
chatRoomResDto.setSellerNickname(chatRoom.getSeller().getNickname());
Expand All @@ -248,6 +259,7 @@ private ChatRoomResDto convertToChatRoomResDto(ChatRoom chatRoom, List<ChatMessa
chatRoomResDto.setSellerPhoneNumber(chatRoom.getSeller().getMobileNumber());
chatRoomResDto.setProductId(chatRoom.getProduct().getId());
chatRoomResDto.setProductTitle(chatRoom.getProduct().getTitle());
chatRoomResDto.setProductImage(thumbnailImage);
chatRoomResDto.setProductStatus(chatRoom.getProduct().getStatus().toString());
chatRoomResDto.setProductPrice(chatRoom.getProduct().getCost().toString());
chatRoomResDto.setIsActive(!chatRoom.getIsSellerOut() && !chatRoom.getIsBuyerOut());
Expand Down