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

Feat: 챌린지 랜덤 기능 구현 #293

Merged
merged 3 commits into from
Nov 4, 2024
Merged

Feat: 챌린지 랜덤 기능 구현 #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ba5ea4
Feat: 챌린지를 오늘의 날짜에 따라 랜덤으로 2개의 값을 리턴하게 로직 추가
hee9841 Nov 4, 2024
7970548
Rename: 챌린지 서비스 테스트 파일 이름 변경
hee9841 Nov 4, 2024
416c738
Test: 챌린지 리스트 랜덤으로 2개 반환 로직 변경으로 인한 테스트 코드 수정
hee9841 Nov 4, 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
20 changes: 15 additions & 5 deletions src/main/java/com/dnd/runus/application/challenge/ChallengeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@

import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.stream.Collectors;

import static com.dnd.runus.global.constant.TimeConstant.SERVER_TIMEZONE_ID;

Expand All @@ -26,15 +29,22 @@ public List<ChallengesResponse> getChallenges(long memberId) {
.toOffsetDateTime();
OffsetDateTime yesterday = todayMidnight.minusDays(1);

List<ChallengesResponse> challengesResponses;
// 어제 기록이 없으면
if (!runningRecordRepository.hasByMemberIdAndStartAtBetween(memberId, yesterday, todayMidnight)) {
return challengeRepository.findAllIsNotDefeatYesterday().stream()
challengesResponses = challengeRepository.findAllIsNotDefeatYesterday().stream()
.map(ChallengesResponse::from)
.toList();
.collect(Collectors.toList());
} else {
challengesResponses = challengeRepository.findAllChallenges().stream()
.map(ChallengesResponse::from)
.collect(Collectors.toList());
}

return challengeRepository.findAllChallenges().stream()
.map(ChallengesResponse::from)
.toList();
// 랜덤으로 2개 리턴
Random randomWithSeed = new Random(todayMidnight.toEpochSecond());
Collections.shuffle(challengesResponses, randomWithSeed);

return challengesResponses.subList(0, 2);
}
}
12 changes: 6 additions & 6 deletions ...n/challenge/ChallengeDataServiceTest.java → ...ation/challenge/ChallengeServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
import java.util.List;

import static com.dnd.runus.global.constant.TimeConstant.SERVER_TIMEZONE_ID;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given;

@ExtendWith(MockitoExtension.class)
class ChallengeDataServiceTest {
class ChallengeServiceTest {

@Mock
private RunningRecordRepository runningRecordRepository;
Expand All @@ -44,7 +44,7 @@ void setUp() {
member = new Member(MemberRole.USER, "nickname");
}

@DisplayName("어제 기록이 있는경우 챌린지 리스트 조회 : 챌린지 name에 '어제'값이 포함한 값이 있어야함")
@DisplayName("어제 기록이 있는경우 챌린지 리스트 조회 : 챌린지 리스트 크기가 2이어야함")
@Test
void getChallengesWithYesterdayRecords() {
// given
Expand All @@ -65,10 +65,10 @@ void getChallengesWithYesterdayRecords() {
List<ChallengesResponse> challenges = challengeService.getChallenges(member.memberId());

// then
assertTrue(challenges.stream().anyMatch(c -> c.title().contains("어제")));
assertThat(challenges.size()).isEqualTo(2);
}

@DisplayName("어제 기록이 없는 경우 챌린지 리스트 조회 : 챌린지 name에 '어제'값이 포함한 값이 없어야함")
@DisplayName("어제 기록이 없는 경우 챌린지 리스트 조회 : 챌린지 리스트 크기가 2이어야함")
@Test
void getChallengesWithoutYesterdayRecords() {
// given
Expand All @@ -85,6 +85,6 @@ void getChallengesWithoutYesterdayRecords() {
List<ChallengesResponse> challenges = challengeService.getChallenges(member.memberId());

// then
assertTrue(challenges.stream().noneMatch(c -> c.title().contains("어제")));
assertThat(challenges.size()).isEqualTo(2);
}
}