Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat #153] 채팅 요청 자동 거절 알림 생성 #160

Merged
merged 7 commits into from
Nov 29, 2024
Merged

[feat #153] 채팅 요청 자동 거절 알림 생성 #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
88d350d
[feat] : 자동거절 채팅 Dto 추가
dudxo Nov 28, 2024
741a63f
[feat] : 자동거절 채팅 Dto 조회 쿼리 추가
dudxo Nov 28, 2024
29cdcff
[feat] : 자동거절 시 알림 생성 추가
dudxo Nov 28, 2024
8edf9c5
[feat] : 채팅 요청 자동거절 알림타입 추가
dudxo Nov 28, 2024
8fd3b4a
[refactor] : 조회쿼리가 아닌 rejecChatInquiryDtos를 이용하여 ids 가져오도록 변경
dudxo Nov 29, 2024
979d021
[rename] : 메서드, DTO명 변경
dudxo Nov 29, 2024
a06dfe4
[test] : 채팅요청 자동거절 단위테스트 수정
dudxo Nov 29, 2024
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
22 changes: 22 additions & 0 deletions src/main/java/com/dnd/gongmuin/chat_inquiry/dto/RejectedChatInquiryDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.dnd.gongmuin.chat_inquiry.dto;

import com.dnd.gongmuin.chat_inquiry.domain.ChatInquiry;
import com.dnd.gongmuin.member.domain.Member;
import com.querydsl.core.annotations.QueryProjection;

public record RejectedChatInquiryDto(
Long chatInquiryId,
Member inquirer,
Member answer
) {
@QueryProjection
public RejectedChatInquiryDto(
ChatInquiry chatInquiry
) {
this(
chatInquiry.getId(),
chatInquiry.getInquirer(),
chatInquiry.getAnswerer()
);
}
}
3 changes: 3 additions & 0 deletions src/main/java/com/dnd/gongmuin/chat_inquiry/repository/ChatInquiryQueryRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.springframework.data.domain.Slice;

import com.dnd.gongmuin.chat_inquiry.dto.ChatInquiryResponse;
import com.dnd.gongmuin.chat_inquiry.dto.RejectedChatInquiryDto;
import com.dnd.gongmuin.member.domain.Member;

public interface ChatInquiryQueryRepository {
Expand All @@ -14,4 +15,6 @@ public interface ChatInquiryQueryRepository {
List<Long> getAutoRejectedInquirerIds();

void updateChatInquiryStatusRejected();

List<RejectedChatInquiryDto> getAutoRejectedChatInquiries();
}
15 changes: 15 additions & 0 deletions src/main/java/com/dnd/gongmuin/chat_inquiry/repository/ChatInquiryQueryRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import com.dnd.gongmuin.chat_inquiry.domain.InquiryStatus;
import com.dnd.gongmuin.chat_inquiry.dto.ChatInquiryResponse;
import com.dnd.gongmuin.chat_inquiry.dto.QChatInquiryResponse;
import com.dnd.gongmuin.chat_inquiry.dto.QRejectedChatInquiryDto;
import com.dnd.gongmuin.chat_inquiry.dto.RejectedChatInquiryDto;
import com.dnd.gongmuin.member.domain.Member;
import com.querydsl.core.types.dsl.CaseBuilder;
import com.querydsl.jpa.impl.JPAQueryFactory;
Expand Down Expand Up @@ -54,6 +56,19 @@ public List<Long> getAutoRejectedInquirerIds() {
.fetch();
}

public List<RejectedChatInquiryDto> getAutoRejectedChatInquiries() {
return queryFactory
.select(new QRejectedChatInquiryDto(
chatInquiry
))
.from(chatInquiry)
.where(
chatInquiry.createdAt.loe(LocalDateTime.now().minusWeeks(1)),
chatInquiry.status.eq(InquiryStatus.PENDING)
)
.fetch();
}

public void updateChatInquiryStatusRejected() {
queryFactory.update(chatInquiry)
.set(chatInquiry.status, InquiryStatus.REJECTED)
Expand Down
31 changes: 30 additions & 1 deletion src/main/java/com/dnd/gongmuin/chat_inquiry/service/ChatInquiryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.dnd.gongmuin.chat_inquiry.dto.CreateChatInquiryRequest;
import com.dnd.gongmuin.chat_inquiry.dto.CreateChatInquiryResponse;
import com.dnd.gongmuin.chat_inquiry.dto.RejectChatResponse;
import com.dnd.gongmuin.chat_inquiry.dto.RejectedChatInquiryDto;
import com.dnd.gongmuin.chat_inquiry.exception.ChatInquiryErrorCode;
import com.dnd.gongmuin.chat_inquiry.repository.ChatInquiryRepository;
import com.dnd.gongmuin.chatroom.domain.ChatRoom;
Expand Down Expand Up @@ -128,12 +129,40 @@ public RejectChatResponse rejectChat(Long chatInquiryId, Member answerer) {

@Transactional
public void rejectChatAuto() {
List<Long> rejectedInquirerIds = chatInquiryRepository.getAutoRejectedInquirerIds();
List<RejectedChatInquiryDto> rejectedChatInquiryDtos = chatInquiryRepository.getAutoRejectedChatInquiries();
List<Long> rejectedInquirerIds = getRejectedInquirerIds(rejectedChatInquiryDtos);
chatInquiryRepository.updateChatInquiryStatusRejected();
memberRepository.refundInMemberIds(rejectedInquirerIds, CHAT_REWARD);
creditHistoryService.saveCreditHistoryInMemberIds(
rejectedInquirerIds, CreditType.CHAT_REFUND, CHAT_REWARD
);

autoRejectedChatInquiryNotification(rejectedChatInquiryDtos);
}

private List<Long> getRejectedInquirerIds(List<RejectedChatInquiryDto> rejectedChatInquiryDtos) {
return rejectedChatInquiryDtos.stream()
.map(dto -> dto.inquirer().getId())
.toList();
}

private void autoRejectedChatInquiryNotification(List<RejectedChatInquiryDto> rejectedChatInquiryDtos) {
for (RejectedChatInquiryDto rejectChatInquiry : rejectedChatInquiryDtos) {
eventPublisher.publishEvent( // 채팅 요청자 알림
new NotificationEvent(
NotificationType.AUTO_CHAT_REJECT,
rejectChatInquiry.chatInquiryId(),
rejectChatInquiry.inquirer().getId(),
rejectChatInquiry.inquirer())
);
eventPublisher.publishEvent(
new NotificationEvent( // 채팅 답변자 알림
NotificationType.AUTO_CHAT_REJECT,
rejectChatInquiry.chatInquiryId(),
rejectChatInquiry.answer().getId(),
rejectChatInquiry.answer())
);
}
}

private ChatInquiry getChatInquiryById(Long id) {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/dnd/gongmuin/notification/domain/NotificationType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ public enum NotificationType {
CHOSEN("채택"),
CHAT_REQUEST("채팅신청"),
CHAT_REJECT("채팅거절"),
CHAT_ACCEPT("채팅수락");
CHAT_ACCEPT("채팅수락"),
AUTO_CHAT_REJECT("채팅자동거절");

private final String label;

Expand Down
15 changes: 11 additions & 4 deletions src/test/java/com/dnd/gongmuin/chat_inquiry/service/ChatInquiryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.dnd.gongmuin.chat_inquiry.dto.CreateChatInquiryRequest;
import com.dnd.gongmuin.chat_inquiry.dto.CreateChatInquiryResponse;
import com.dnd.gongmuin.chat_inquiry.dto.RejectChatResponse;
import com.dnd.gongmuin.chat_inquiry.dto.RejectedChatInquiryDto;
import com.dnd.gongmuin.chat_inquiry.repository.ChatInquiryRepository;
import com.dnd.gongmuin.chatroom.domain.ChatRoom;
import com.dnd.gongmuin.chatroom.repository.ChatMessageRepository;
Expand Down Expand Up @@ -286,15 +287,21 @@ void rejectChatWithEventPublish() {
@Test
void rejectChatAuto() {
// given
List<Long> rejectedInquirerIds = List.of(1L, 2L);
given(chatInquiryRepository.getAutoRejectedInquirerIds())
.willReturn(rejectedInquirerIds);
List<RejectedChatInquiryDto> rejectedChatInquiryDtos = List.of(
new RejectedChatInquiryDto(1L, MemberFixture.member(1L), MemberFixture.member(2L)),
new RejectedChatInquiryDto(2L, MemberFixture.member(3L), MemberFixture.member(4L))
);
List<Long> rejectedInquirerIds = rejectedChatInquiryDtos.stream()
.map(dto -> dto.inquirer().getId())
.toList();

given(chatInquiryRepository.getAutoRejectedChatInquiries()).willReturn(rejectedChatInquiryDtos);

// when
chatInquiryService.rejectChatAuto();

// then
verify(chatInquiryRepository).getAutoRejectedInquirerIds();
verify(chatInquiryRepository).getAutoRejectedChatInquiries();
verify(chatInquiryRepository).updateChatInquiryStatusRejected();
verify(memberRepository).refundInMemberIds(rejectedInquirerIds, CHAT_REWARD);
verify(creditHistoryService).saveCreditHistoryInMemberIds(
Expand Down