Skip to content

Commit f364a47

Browse files
committed
fix: 알림 전송 쿼리 수정 (WR9-143) #246
1 parent 1a8ca8d commit f364a47

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/main/java/io/crops/warmletter/domain/share/repository/ShareProposalRepository.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ public interface ShareProposalRepository extends JpaRepository<ShareProposal,Lon
99
@Query("SELECT m.zipCode " +
1010
"FROM ShareProposal proposal " +
1111
"JOIN Member m ON proposal.requesterId = m.id " +
12-
"WHERE proposal.requesterId = :requesterId")
13-
String findZipCodeByRequesterId(Long requesterId);
12+
"WHERE proposal.id = :id " +
13+
"AND proposal.requesterId = :requesterId ")
14+
String findZipCodeByRequesterId(Long id, Long requesterId);
1415

1516
@Query("SELECT m.zipCode " +
1617
"FROM ShareProposal proposal " +
1718
"JOIN Member m ON proposal.recipientId = m.id " +
18-
"WHERE proposal.recipientId = :recipientId")
19-
String findZipCodeByRecipientId(Long recipientId);
19+
"WHERE proposal.id = :id " +
20+
"AND proposal.recipientId = :recipientId ")
21+
String findZipCodeByRecipientId(Long id, Long recipientId);
2022
}

src/main/java/io/crops/warmletter/domain/share/service/ShareProposalService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import io.crops.warmletter.domain.share.repository.*;
1515
import io.crops.warmletter.domain.timeline.dto.request.NotificationRequest;
1616
import io.crops.warmletter.domain.timeline.enums.AlarmType;
17-
import io.crops.warmletter.domain.timeline.facade.NotificationFacade;
1817
import lombok.RequiredArgsConstructor;
1918
import org.springframework.context.ApplicationEventPublisher;
2019
import org.springframework.stereotype.Service;
@@ -79,8 +78,8 @@ public ShareProposalStatusResponse approveShareProposal(Long shareProposalId) {
7978
.build();
8079
sharePost = sharePostRepository.save(sharePost);
8180
// 알림 전송(양쪽 다)
82-
String requestZipCode = shareProposalRepository.findZipCodeByRequesterId(shareProposal.getRequesterId());
83-
String recipientZipCode = shareProposalRepository.findZipCodeByRecipientId(shareProposal.getRecipientId());
81+
String requestZipCode = shareProposalRepository.findZipCodeByRequesterId(shareProposalId, shareProposal.getRequesterId());
82+
String recipientZipCode = shareProposalRepository.findZipCodeByRecipientId(shareProposalId, shareProposal.getRecipientId());
8483
notificationPublisher.publishEvent(NotificationRequest.builder()
8584
.senderZipCode(recipientZipCode)
8685
.receiverId(shareProposal.getRequesterId())

0 commit comments

Comments
 (0)