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

Jump to bottom

fix: 새벽 4시에 약속 삭제 로직 Lazy 에러 해결 #701

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
+27 −7
Open

fix: 새벽 4시에 약속 삭제 로직 Lazy 에러 해결 #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01a4002
fix: scheduleOverdueMeetings() 트랜잭션 적용
hyeon0208 Oct 11, 2024
6e565a6
test: 새벽 4시 스케줄링 테스트 추가
hyeon0208 Oct 11, 2024
305fb75
style: overdue false인 약속 조회 메서드명 수정
hyeon0208 Oct 11, 2024
31c5426
test: overdue true 변경 테스트 추가
hyeon0208 Oct 11, 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
5 changes: 3 additions & 2 deletions backend/src/main/java/com/ody/meeting/service/MeetingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private Meeting findByInviteCode(String inviteCode) {
.orElseThrow(() -> new OdyNotFoundException("존재하지 않는 초대코드입니다."));
}

public Meeting findById(Long meetingId) {
public Meeting findByIdAndOverdueFalse(Long meetingId) {
return meetingRepository.findByIdAndOverdueFalse(meetingId)
.orElseThrow(() -> new OdyNotFoundException("존재하지 않는 약속입니다."));
}
Expand All @@ -105,7 +105,7 @@ private MeetingFindByMemberResponse makeMeetingFindByMemberResponse(Member membe
}

public MeetingWithMatesResponse findMeetingWithMates(Member member, Long meetingId) {
Meeting meeting = findById(meetingId);
Meeting meeting = findByIdAndOverdueFalse(meetingId);
List<Mate> mates = mateService.findAllByMeetingIdIfMate(member, meeting.getId());
return MeetingWithMatesResponse.of(meeting, mates);
}
Expand All @@ -119,6 +119,7 @@ public MateSaveResponseV2 saveMateAndSendNotifications(MateSaveRequestV2 mateSav
return mateService.saveAndSendNotifications(mateSaveRequest, member, meeting);
}

@Transactional
@Scheduled(cron = "0 0 4 * * *", zone = "Asia/Seoul")
public void scheduleOverdueMeetings() {
meetingRepository.updateAllByNotOverdueMeetings();
Expand Down
29 changes: 24 additions & 5 deletions backend/src/test/java/com/ody/meeting/service/MeetingServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,18 @@
import static org.mockito.ArgumentMatchers.any;

import com.ody.common.BaseServiceTest;
import com.ody.common.DtoGenerator;
import com.ody.common.Fixture;
import com.ody.common.FixtureGenerator;
import com.ody.common.exception.OdyBadRequestException;
import com.ody.common.exception.OdyNotFoundException;
import com.ody.mate.domain.Mate;
import com.ody.mate.dto.request.MateSaveRequestV2;
import com.ody.mate.dto.response.MateResponse;
import com.ody.mate.repository.MateRepository;
import com.ody.meeting.domain.Meeting;
import com.ody.meeting.dto.request.MeetingSaveRequestV1;
import com.ody.meeting.dto.response.MeetingSaveResponseV1;
import com.ody.meeting.dto.response.MeetingWithMatesResponse;
import com.ody.meeting.repository.MeetingRepository;
import com.ody.member.domain.Member;
import com.ody.member.repository.MemberRepository;
import com.ody.notification.domain.message.GroupMessage;
import com.ody.util.TimeUtil;
import java.time.Instant;
Expand All @@ -37,14 +33,15 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.support.CronExpression;

class MeetingServiceTest extends BaseServiceTest {

@Autowired
private MeetingService meetingService;

@Autowired
private FixtureGenerator fixtureGenerator;
private MeetingRepository meetingRepository;

@MockBean
private TaskScheduler taskScheduler;
Expand Down Expand Up @@ -212,4 +209,26 @@ void validateInviteCodeFailWhenAlreadyAttendedMeetingInviteCode() {
assertThatThrownBy(() -> meetingService.validateInviteCode(member, meeting.getInviteCode()))
.isInstanceOf(OdyBadRequestException.class);
}

@DisplayName("오전 4시 마다 약속 시간이 지난 약속들의 상태를 기간 지남으로 변경하고 구독한 topic을 취소한다.")
@Test
void scheduleOverdueMeetings() {
CronExpression expression = CronExpression.parse("0 0 4 * * *");
LocalDateTime dateTime = LocalDateTime.of(2024, 10, 10, 3, 59, 59);
LocalDateTime nextExecutionTime = expression.next(dateTime);

assertAll(
() -> assertThat(LocalDateTime.of(2024, 10, 10, 3, 59, 59)).isNotEqualTo(nextExecutionTime),
() -> assertThat(LocalDateTime.of(2024, 10, 10, 4, 0, 1)).isNotEqualTo(nextExecutionTime),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

카키! CronExpression에 익숙치 않아 몇가지 질문 남깁니다.
expression next는 다음에 작업이 실행될 시간을 반환하는 것으로 알고 있어서 2024-10-10-4시가 nextExecutionTime에 저장되는 것으로 이해했어요.

  • 그렇다면 nextExecution을 위에는 isNotEqualTo로 검증하고 밑에는 isEqualTo로 검증하는 이유가 궁금합니다 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

원래 시간 순서대로 검증을 했는데 isNotEqualTo와 isEqualTo를 모아놓는 것이 가독성이 좋을 것 같다고
개인적인 생각이 들어서 위와 같이 검증순서를 구성했어요
다들 어떤 편이 가독성에 도움이 되실까요 ?? 🤔

() -> assertThat(LocalDateTime.of(2024, 10, 10, 4, 0, 0)).isEqualTo(nextExecutionTime),
() -> assertThat(LocalDateTime.of(2024, 10, 11, 4, 0, 0)).isEqualTo(expression.next(nextExecutionTime))
);

Meeting meeting = fixtureGenerator.generateMeeting(dateTime);
meetingService.scheduleOverdueMeetings();

Meeting findMeeting = meetingRepository.findById(meeting.getId()).get();

assertThat(findMeeting.isOverdue()).isTrue();
}
}
Loading