Merge pull request #78 from team-Ollie/fix/60-searchChallenge

[fix/60-searchChallenge] 챌린지 검색시 이미 참여 중인 챌린지 제외
team-Ollie · Jun 29, 2024 · a12c603 · a12c603
2 parents eb0e917 + 4401be6
commit a12c603
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/src/main/java/ollie/wecare/challenge/repository/ChallengeAttendanceRepository.java b/src/main/java/ollie/wecare/challenge/repository/ChallengeAttendanceRepository.java
@@ -10,5 +10,6 @@
 @Repository
 public interface ChallengeAttendanceRepository extends JpaRepository<ChallengeAttendance, Long> {
    List<ChallengeAttendance> findByUser_UserIdx(Long userIdx);
-   List<ChallengeAttendance> findByUser_UserIdxAndChallenge_ChallengeIdxAndAttendanceDateBetween(Long userIdx, Long challengeIdx, LocalDateTime start, LocalDateTime last);
+   List<ChallengeAttendance> findByUser_UserIdxAndChallenge_ChallengeIdx(Long userIdx, Long challengeIdx);
+   List<ChallengeAttendance> findByUser_UserIdxAndChallenge_ChallengeIdxAndAttendanceDateBetweenOrderByAttendanceDate(Long userIdx, Long challengeIdx, LocalDateTime start, LocalDateTime last);
 }
diff --git a/src/main/java/ollie/wecare/challenge/service/ChallengeService.java b/src/main/java/ollie/wecare/challenge/service/ChallengeService.java
@@ -27,6 +27,7 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
+@Transactional
 public class ChallengeService {
 
     private final ChallengeAttendanceRepository challengeAttendanceRepository;
@@ -39,8 +40,10 @@ public class ChallengeService {
      * 참여 중인 챌린지 조회
      * */
     public List<GetChallengesRes> getMyChallenges() throws BaseException {
-        Long tmpUserIdx = 1L;
-        List<ChallengeAttendance> participationList = challengeAttendanceRepository.findByUser_UserIdx(tmpUserIdx);
+        //TODO : 특정 get 요청만 인증받지 않도록 변경
+        Long userIdx = authService.getUserIdx();
+        if(userIdx == null) throw new BaseException(INVALID_ACCESS_TOKEN);
+        List<ChallengeAttendance> participationList = challengeAttendanceRepository.findByUser_UserIdx(userIdx);
         Long participationNum = (long)participationList.size();
 
         Set<Challenge> challengeSet = new HashSet<>();
@@ -54,14 +57,13 @@ public List<GetChallengesRes> getMyChallenges() throws BaseException {
     /*
      * 챌린지 인증
      * */
-    //@Transactional
     public void attendChallenge(AttendChallengeReq attendChallengeReq) throws BaseException {
         Challenge challenge = challengeRepository.findById(attendChallengeReq.getChallengeIdx()).orElseThrow(()-> new BaseException(INVALID_CHALLENGE_IDX));
         if(!challenge.getAttendanceCode().equals(attendChallengeReq.getAttendanceCode()))
             throw new BaseException(INVALID_ATTENDANCE_CODE);
         else {
             ChallengeAttendance challengeAttendance = ChallengeAttendance.builder()
-                    .user(userRepository.findById(authService.getUserIdx()).orElseThrow(()->new BaseException(INVALID_USER_IDX)))
+                    .user(userRepository.findById(authService.getUserIdx()).orElseThrow(()->new BaseException(INVALID_ACCESS_TOKEN)))
                     .challenge(challengeRepository.findById(attendChallengeReq.getChallengeIdx()).orElseThrow(()-> new BaseException(INVALID_CHALLENGE_IDX)))
                     .attendanceDate(LocalDateTime.now()).build();
             challengeAttendanceRepository.save(challengeAttendance);
@@ -74,26 +76,35 @@ public void attendChallenge(AttendChallengeReq attendChallengeReq) throws BaseEx
     @Transactional
     public void participateChallenge(PostChallengeReq postChallengeReq) throws BaseException {
         ChallengeAttendance challengeAttendance = ChallengeAttendance.builder()
-                .user(userRepository.findById(authService.getUserIdx()).orElseThrow(()->new BaseException(INVALID_USER_IDX)))
+                .user(userRepository.findById(authService.getUserIdx()).orElseThrow(()->new BaseException(INVALID_ACCESS_TOKEN)))
                 .challenge(challengeRepository.findById(postChallengeReq.getChallengeIdx()).orElseThrow(()-> new BaseException(INVALID_CHALLENGE_IDX)))
                 .attendanceDate(LocalDateTime.now()).build();
         challengeAttendanceRepository.save(challengeAttendance);
-        //TODO : 이미 참여중인 챌린지 처리
     }
 
     /*
      * 챌린지 검색
      * */
     public List<GetChallengesRes> getChallenges(String searchWord) {
-        return challengeRepository.findByNameContaining(searchWord).stream().map(challenge -> GetChallengesRes.fromChallenge(challenge, 0L)).toList();
+        Long userIdx = authService.getUserIdx();
+        if(userIdx == null) throw new BaseException(INVALID_ACCESS_TOKEN);
+        List<Challenge> challenges = challengeRepository.findByNameContaining(searchWord);
+        List<Challenge> challengeResult = new ArrayList<>();
+        for(Challenge challenge : challenges) {
+            List<ChallengeAttendance> challengeAttendances = challengeAttendanceRepository.findByUser_UserIdxAndChallenge_ChallengeIdx(userIdx, challenge.getChallengeIdx());
+            if(challengeAttendances == null || challengeAttendances.isEmpty())
+                challengeResult.add(challenge);
+        }
+
+        return challengeResult.stream().map(challenge -> GetChallengesRes.fromChallenge(challenge, 0L)).toList();
     }
 
     /*
      * 챌린지 참여 현황 조회(월별)
      * */
     public List<GetAttendanceRes> getAttendance(Long challengeIdx, Long year, Long month) {
         Long userIdx = authService.getUserIdx();
-        if(userIdx == null) throw new BaseException(INVALID_USER_IDX);
+        if(userIdx == null) throw new BaseException(INVALID_ACCESS_TOKEN);
         int y = year != null && year > 0 ? year.intValue() : LocalDateTime.now().getYear();
         int m = month != null && month > 0 ? month.intValue() : LocalDateTime.now().getMonthValue();
 
@@ -108,8 +119,9 @@ public List<GetAttendanceRes> getAttendance(Long challengeIdx, Long year, Long m
             firstDay = YearMonth.from(LocalDateTime.now().toLocalDate()).atDay(1).atStartOfDay();
             lastDay = YearMonth.from(LocalDateTime.now().toLocalDate()).atEndOfMonth().atStartOfDay();
         }*/
-        return challengeAttendanceRepository.findByUser_UserIdxAndChallenge_ChallengeIdxAndAttendanceDateBetween(userIdx, challengeIdx, firstDay, lastDay)
+        return challengeAttendanceRepository.findByUser_UserIdxAndChallenge_ChallengeIdxAndAttendanceDateBetweenOrderByAttendanceDate(userIdx, challengeIdx, firstDay, lastDay)
                 .stream()
+                .skip(1L)
                 .map(challengeAttendance -> GetAttendanceRes.fromAttendance(challengeAttendance))
                 .collect(Collectors.toList());
     }