Skip to content
Merged
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 @@ -11,6 +11,7 @@ public interface CoffeeChatRepository extends JpaRepository<CoffeeChat, Long>, C

// READ
Boolean existsCoffeeChatByMember(Member member);
Boolean existsCoffeeChatByMemberAndIsCoffeeChatActivate(Member member, Boolean isCoffeeChatActivate);
Optional<CoffeeChat> findCoffeeChatByMember(Member member);

// UPDATE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void checkAlreadyExistCoffeeChat(Member member) {
}

public boolean existsCoffeeChat(Member member) {
return coffeeChatRepository.existsCoffeeChatByMember(member);
return coffeeChatRepository.existsCoffeeChatByMemberAndIsCoffeeChatActivate(member, true);
}

public CoffeeChat findCoffeeChatAndCheckIsActivated(Member member, Boolean isMine) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public class CoffeeChatService {
@Transactional
public void sendCoffeeChatRequest(CoffeeChatRequest request, Long senderId) {
InternalUserDetails senderUserDetails = platformService.getInternalUser(senderId);
InternalUserDetails receiverUserDetails = platformService.getInternalUser(senderId);
InternalUserDetails receiverUserDetails = platformService.getInternalUser(request.receiverId());
String replyInfo = getReplyInfo(request, senderUserDetails);

MessageSender senderStrategy = messageSenderFactory.getSender(request.senderEmail(), request.senderPhone());
Expand Down