diff --git a/src/main/java/com/example/farmusfarm/domain/challenge/dto/res/SearchChallengeResponseDto.java b/src/main/java/com/example/farmusfarm/domain/challenge/dto/res/SearchChallengeResponseDto.java index 5ea24f6..f4b296b 100644 --- a/src/main/java/com/example/farmusfarm/domain/challenge/dto/res/SearchChallengeResponseDto.java +++ b/src/main/java/com/example/farmusfarm/domain/challenge/dto/res/SearchChallengeResponseDto.java @@ -10,6 +10,7 @@ public class SearchChallengeResponseDto { private Long challengeId; + private String veggieInfoId; private String veggieName; private String challengeName; private String image; diff --git a/src/main/java/com/example/farmusfarm/domain/challenge/service/ChallengeService.java b/src/main/java/com/example/farmusfarm/domain/challenge/service/ChallengeService.java index 07f6cb2..8e62566 100644 --- a/src/main/java/com/example/farmusfarm/domain/challenge/service/ChallengeService.java +++ b/src/main/java/com/example/farmusfarm/domain/challenge/service/ChallengeService.java @@ -184,6 +184,7 @@ private List streamChallengeListToSearchResult(List< return SearchChallengeResponseDto.of( c.getId(), + c.getVeggieInfoId(), c.getVeggieName(), c.getChallengeName(), c.getImageUrl(), diff --git a/src/main/java/com/example/farmusfarm/domain/user/dto/res/GetUserLevelAndNicknameResponseDto.java b/src/main/java/com/example/farmusfarm/domain/user/dto/res/GetUserLevelAndNicknameResponseDto.java index 29fd6e2..b9645f3 100644 --- a/src/main/java/com/example/farmusfarm/domain/user/dto/res/GetUserLevelAndNicknameResponseDto.java +++ b/src/main/java/com/example/farmusfarm/domain/user/dto/res/GetUserLevelAndNicknameResponseDto.java @@ -11,4 +11,5 @@ public class GetUserLevelAndNicknameResponseDto { private String level; private String nickname; + private String motivation; } diff --git a/src/main/java/com/example/farmusfarm/domain/veggie/controller/VeggieController.java b/src/main/java/com/example/farmusfarm/domain/veggie/controller/VeggieController.java index 5101998..939c5be 100644 --- a/src/main/java/com/example/farmusfarm/domain/veggie/controller/VeggieController.java +++ b/src/main/java/com/example/farmusfarm/domain/veggie/controller/VeggieController.java @@ -63,11 +63,12 @@ public BaseResponseDto getMyVeggieList( return BaseResponseDto.of(SuccessMessage.SUCCESS, veggieService.getMyVeggieList(userId)); } - @GetMapping("/registration") + @GetMapping("/registration/{veggieInfoId}") public BaseResponseDto getMyVeggieListForRegistration( - @RequestHeader("user") Long userId + @RequestHeader("user") Long userId, + @PathVariable String veggieInfoId ) { - return BaseResponseDto.of(SuccessMessage.SUCCESS, veggieService.getMyVeggieListForRegistration(userId)); + return BaseResponseDto.of(SuccessMessage.SUCCESS, veggieService.getMyVeggieListForRegistration(userId, veggieInfoId)); } @GetMapping("/mission") diff --git a/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/GetDayRoutinesResponseDto.java b/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/GetDayRoutinesResponseDto.java index 217f1bb..d324182 100644 --- a/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/GetDayRoutinesResponseDto.java +++ b/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/GetDayRoutinesResponseDto.java @@ -11,6 +11,7 @@ @Getter public class GetDayRoutinesResponseDto { + private Long veggieId; private String veggieNickname; private String color; private List routineList; diff --git a/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/GetMyVeggieListDto.java b/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/GetMyVeggieListDto.java index 3af93ca..5a058c8 100644 --- a/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/GetMyVeggieListDto.java +++ b/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/GetMyVeggieListDto.java @@ -13,5 +13,6 @@ public class GetMyVeggieListDto { private String userNickname; private String level; + private String motivation; private List veggieList; } diff --git a/src/main/java/com/example/farmusfarm/domain/veggie/service/VeggieService.java b/src/main/java/com/example/farmusfarm/domain/veggie/service/VeggieService.java index 139f4f3..79c2f8f 100644 --- a/src/main/java/com/example/farmusfarm/domain/veggie/service/VeggieService.java +++ b/src/main/java/com/example/farmusfarm/domain/veggie/service/VeggieService.java @@ -24,6 +24,7 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; @Service @@ -78,15 +79,15 @@ public GetMyVeggieListDto getMyVeggieList(Long userId) { Utils.compareLocalDate(LocalDate.now(), v.getBirth()))) .collect(Collectors.toList()); - return GetMyVeggieListDto.of(response.getNickname(), response.getLevel(), result); + return GetMyVeggieListDto.of(response.getNickname(), response.getLevel(), response.getMotivation(), result); } - public List getMyVeggieListForRegistration(Long userId) { + public List getMyVeggieListForRegistration(Long userId, String veggieInfoId) { - List veggieList = veggieRepository.findAllByUserId(userId); + List veggieList = veggieRepository.findAllByUserId(userId); return veggieList.stream() - .filter(v -> v.getRegistration() == null) + .filter(v -> v.getRegistration() == null && v.getVeggieInfoId().equals(veggieInfoId)) .map(v -> GetRegistrationVeggieListResponseDto.of( v.getId(), v.getVeggieName(), @@ -150,7 +151,7 @@ public CheckRoutineResponseDto checkRoutine(CheckRoutineRequestDto requestDto) { if (routine.getPeriod() != 0) { Routine newRoutine = createRoutine( - LocalDate.now().plusDays(routine.getPeriod()).toString(), + routine.getDate().plusDays(routine.getPeriod()).toString(), routine.getContent(), routine.getPeriod(), routine.getVeggie() @@ -277,7 +278,7 @@ public GetDayRoutinesResponseDto getRoutineInfo(Veggie veggie, LocalDate date) { .map(r -> GetDayRoutinesDto.of(r.getId(), r.getContent(), r.getPeriod(), r.getIsDone())) .collect(Collectors.toList()); - return GetDayRoutinesResponseDto.of(veggie.getVeggieNickname(), veggie.getColor(),result); + return GetDayRoutinesResponseDto.of(veggie.getId(), veggie.getVeggieNickname(), veggie.getColor(),result); } public String getRandomColorCode() {