diff --git a/server/src/main/java/com/soopgyeol/api/controller/AuthController.java b/server/src/main/java/com/soopgyeol/api/controller/AuthController.java index 2549192..9aff019 100644 --- a/server/src/main/java/com/soopgyeol/api/controller/AuthController.java +++ b/server/src/main/java/com/soopgyeol/api/controller/AuthController.java @@ -84,20 +84,20 @@ public void kakaoAutoLogin(@RequestParam String code, HttpServletResponse respon // 임시 토큰 생성시 활성화 - private final UserRepository userRepository; - private final JwtProvider jwtProvider; - @PostMapping("/dev-login") - public OAuthLoginResponse devLogin(@RequestParam Long userId) { - User user = userRepository.findById(userId) - .orElseThrow(() -> new IllegalArgumentException("유저 없음")); - - String jwt = jwtProvider.createToken(user.getId(), user.getRole()); - - return OAuthLoginResponse.builder() - .jwtToken(jwt) - .isNewUser(false) - .build(); - } +// private final UserRepository userRepository; +// private final JwtProvider jwtProvider; +// @PostMapping("/dev-login") +// public OAuthLoginResponse devLogin(@RequestParam("userId") Long userId) { +// User user = userRepository.findById(userId) +// .orElseThrow(() -> new IllegalArgumentException("유저 없음")); +// +// String jwt = jwtProvider.createToken(user.getId(), user.getRole()); +// +// return OAuthLoginResponse.builder() +// .jwtToken(jwt) +// .isNewUser(false) +// .build(); +// } } diff --git a/server/src/main/java/com/soopgyeol/api/domain/challenge/dto/UserChallengeHistoryDto.java b/server/src/main/java/com/soopgyeol/api/domain/challenge/dto/UserChallengeHistoryDto.java index d7df902..c5affc1 100644 --- a/server/src/main/java/com/soopgyeol/api/domain/challenge/dto/UserChallengeHistoryDto.java +++ b/server/src/main/java/com/soopgyeol/api/domain/challenge/dto/UserChallengeHistoryDto.java @@ -13,4 +13,5 @@ public class UserChallengeHistoryDto { private String title; private LocalDate createdAt; private boolean isCompleted; + private int progressCount; } diff --git a/server/src/main/java/com/soopgyeol/api/service/dailychallenge/UserChallengeServiceImpl.java b/server/src/main/java/com/soopgyeol/api/service/dailychallenge/UserChallengeServiceImpl.java index c5fb862..0e1dc98 100644 --- a/server/src/main/java/com/soopgyeol/api/service/dailychallenge/UserChallengeServiceImpl.java +++ b/server/src/main/java/com/soopgyeol/api/service/dailychallenge/UserChallengeServiceImpl.java @@ -119,6 +119,7 @@ public List getUserChallengeHistory(Long userId) { .title(uc.getDailyChallenge().getTitle()) .createdAt(uc.getDailyChallenge().getCreatedAt()) // 여기 변환 .isCompleted(uc.isCompleted()) + .progressCount(uc.getProgressCount()) .build()) .toList(); diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index 784e4ee..a599472 100644 --- a/server/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -20,7 +20,7 @@ openai: key: ${OPENAI_API_KEY} server: - port: 3004 + port: 8080 oauth: google: