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

[Refactor] Solved userId token 이용 처리 #30

Merged
merged 2 commits into from
Apr 16, 2024
Merged

[Refactor] Solved userId token 이용 처리 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b08c9f
refactor(Solved): Solved userId token 이용 처리
moomint8 Apr 16, 2024
f0860bb
Merge branch 'develop' of https://github.com/Triumers/Newsnippet-Back…
moomint8 Apr 16, 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
2 changes: 2 additions & 0 deletions src/main/java/org/triumers/newsnippetback/Application/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ public interface AuthService {
void modifyPassword(PasswordDTO passwordDTO) throws WrongPasswordException, WrongInputTypeException;

void updateSolvedQuiz(boolean isCorrect);

public int getUserId();
}
5 changes: 5 additions & 0 deletions src/main/java/org/triumers/newsnippetback/Application/service/AuthServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ public void updateSolvedQuiz(boolean isCorrect) {
userRepository.save(user);
}

@Override
public int getUserId() {
return userRepository.findByEmail(SecurityContextHolder.getContext().getAuthentication().getName()).getId();
}

private User userMapper(AuthDTO request) {
User user = new User();

Expand Down
11 changes: 4 additions & 7 deletions src/main/java/org/triumers/newsnippetback/Application/service/SolvedServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public SolvedDTO findSelectedOptionAndCompareAnswer(SolvedRequest solvedRequest)

modelMapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);

int userId = solvedRequest.getUserId();
int userId = authService.getUserId();
int quizId = solvedRequest.getQuizId();
String seletedOption = solvedRequest.getSelectedOption();

Expand Down Expand Up @@ -87,7 +87,7 @@ public List<Solved> findSolvedQuizListByUserId(SolvedRequest solvedRequest) {
/* 설명. 사용자의 ID와 문제 ID로 문제 내용 불러오기 */
@Override
public SolvedDTO findSolvedQuizByUserIdAndQuizId(SolvedRequest solvedRequest) {
int userId = solvedRequest.getUserId();
int userId = authService.getUserId();
int quizId = solvedRequest.getQuizId();

Solved solvedQuiz = solvedRepository.findSelectedOptionByUserIdAndQuizId(userId, quizId);
Expand Down Expand Up @@ -118,7 +118,7 @@ public SolvedDTO findSolvedQuizByUserIdAndQuizId(SolvedRequest solvedRequest) {

@Override
public List<Solved> findCorrectQuizByUserIdAndSolvedDate(SolvedResultRequest solvedResultRequest) {
int userId = solvedResultRequest.getUserId();
int userId = authService.getUserId();
boolean isCorrect = solvedResultRequest.isCorrect();
LocalDate solvedDate = solvedResultRequest.getSolvedDate();

Expand All @@ -129,8 +129,7 @@ public List<Solved> findCorrectQuizByUserIdAndSolvedDate(SolvedResultRequest sol

@Override
public List<SolvedDTO> findSolvedQuizListByUserIdAndDate(SolvedRequest solvedRequest) {
System.out.println(solvedRequest);
int userId = solvedRequest.getUserId();
int userId = authService.getUserId();
LocalDate solvedDate = solvedRequest.getSolvedDate();

List<Solved> solvedList = solvedRepository.findSolvedQuizByUserIdAndSolvedDate(userId, solvedDate);
Expand Down Expand Up @@ -161,6 +160,4 @@ public List<SolvedDTO> findSolvedQuizListByUserIdAndDate(SolvedRequest solvedReq

return solvedDTOList;
}


}
Loading