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.

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

refactor: 지난 약속에 참여하지 못하도록 예외처리 #474

Merged
merged 2 commits into from
Sep 6, 2024
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
@@ -1,5 +1,6 @@
package com.ody.meeting.service;

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;
Expand All @@ -15,6 +16,8 @@
import com.ody.meeting.repository.MeetingRepository;
import com.ody.member.domain.Member;
import com.ody.util.InviteCodeGenerator;
import com.ody.util.TimeUtil;
import java.time.LocalDateTime;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -85,6 +88,9 @@ public MeetingWithMatesResponse findMeetingWithMates(Member member, Long meeting
@Transactional
public MateSaveResponseV2 saveMateAndSendNotifications(MateSaveRequestV2 mateSaveRequest, Member member) {
Meeting meeting = findByInviteCode(mateSaveRequest.inviteCode());
if (meeting.isEnd()) {
throw new OdyBadRequestException("과거 약속에 참여할 수 없습니다.");
}
return mateService.saveAndSendNotifications(mateSaveRequest, member, meeting);
}
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
package com.ody.meeting.service;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertAll;

import com.ody.common.BaseServiceTest;
import com.ody.common.Fixture;
import com.ody.common.exception.OdyBadRequestException;
import com.ody.common.exception.OdyNotFoundException;
import com.ody.mate.domain.Mate;
import com.ody.mate.domain.Nickname;
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.Location;
import com.ody.meeting.domain.Meeting;
import com.ody.meeting.dto.request.MeetingSaveRequestV1;
import com.ody.meeting.dto.response.MeetingFindByMemberResponse;
Expand Down Expand Up @@ -187,4 +191,48 @@ void findMeetingWithMatesException() {
assertThatThrownBy(() -> meetingService.findMeetingWithMates(member, 1L))
.isInstanceOf(OdyNotFoundException.class);
}

@DisplayName("지나지 않은 약속에 참여가 가능하다")
@Test
void saveMateSuccess() {
Meeting notOverdueMeeting = makeSavedMeetingByRemainingMinutes(1L);
Member member = memberRepository.save(Fixture.MEMBER2);
MateSaveRequestV2 mateSaveRequest = makeMateRequestByMeeting(notOverdueMeeting);

assertThatCode(() -> meetingService.saveMateAndSendNotifications(mateSaveRequest, member))
.doesNotThrowAnyException();
}

@DisplayName("지난 약속에 참여가 불가하다")
@Test
void saveMateFail_When_tryAttendOverdueMeeting() {
Meeting overdueMeeting = makeSavedMeetingByRemainingMinutes(-1L);
Member member = memberRepository.save(Fixture.MEMBER1);
MateSaveRequestV2 mateSaveRequest = makeMateRequestByMeeting(overdueMeeting);

assertThatThrownBy(() -> meetingService.saveMateAndSendNotifications(mateSaveRequest, member))
.isInstanceOf(OdyBadRequestException.class);
}

private MateSaveRequestV2 makeMateRequestByMeeting(Meeting meeting) {
Location origin = Fixture.ORIGIN_LOCATION;
return new MateSaveRequestV2(
InviteCodeGenerator.encode(meeting.getId()),
origin.getAddress(),
origin.getLatitude(),
origin.getLongitude()
);
}

private Meeting makeSavedMeetingByRemainingMinutes(long remainingMinutes) {
LocalDateTime time = TimeUtil.nowWithTrim().plusMinutes(remainingMinutes);
Meeting meeting = new Meeting(
"오디",
time.toLocalDate(),
time.toLocalTime(),
Fixture.TARGET_LOCATION,
"초대코드"
);
return meetingRepository.save(meeting);
}
}
Loading