Skip to content
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
Expand Up @@ -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();
// }


}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ public class UserChallengeHistoryDto {
private String title;
private LocalDate createdAt;
private boolean isCompleted;
private int progressCount;
}
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ public List<UserChallengeHistoryDto> getUserChallengeHistory(Long userId) {
.title(uc.getDailyChallenge().getTitle())
.createdAt(uc.getDailyChallenge().getCreatedAt()) // 여기 변환
.isCompleted(uc.isCompleted())
.progressCount(uc.getProgressCount())
.build())
.toList();

Expand Down
2 changes: 1 addition & 1 deletion server/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ openai:
key: ${OPENAI_API_KEY}

server:
port: 3004
port: 8080

oauth:
google:
Expand Down