Merge pull request #59 from devocean-finut/develop

Develop
devocean-finut · Nov 14, 2024 · 8f0027c · 8f0027c
2 parents 9879e6e + aaae2be
commit 8f0027c
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 15 deletions.
diff --git a/src/main/java/com/finut/finut_server/controller/QuizController.java b/src/main/java/com/finut/finut_server/controller/QuizController.java
@@ -151,4 +151,21 @@ public ApiResponse<List<Quiz>> getQuizToLevelTest(HttpServletRequest request, Ht
         return ApiResponse.onFailure("400", "퀴즈 내용을 제대로 가져오지 못했습니다", quiz);
     }
 
+    @Operation(summary = "레벨 테스트 결과 조회", description = "레벨 테스트를 위한 퀴즈 조회 API")
+    @ApiResponses(value = {
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공", content = @Content(mediaType = "application/json",
+                    schema = @Schema(implementation = Quiz.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "퀴즈 내용을 제대로 가지고 오지 못했습니다.",
+                    content = @Content),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "서버 에러, 관리자에게 문의 바랍니다.",
+                    content = @Content(mediaType = "application/json",
+                            schema = @Schema(implementation = ErrorReasonDTO.class)))
+    })
+    @GetMapping("/level/result")
+    public ApiResponse<QuizResponseDTO.quizResultResponseDTO> getQuizLevelResult(@RequestParam int score, HttpServletRequest request, HttpServletResponse response){
+        Users user = usersService.getUserIdByToken(request, response);
+        QuizResponseDTO.quizResultResponseDTO quizLevelResult = quizService.getQuizLevelResult(user.getId(), score);
+        return ApiResponse.onSuccess(quizLevelResult);
+    }
+
 }
diff --git a/src/main/java/com/finut/finut_server/domain/quiz/QuizResponseDTO.java b/src/main/java/com/finut/finut_server/domain/quiz/QuizResponseDTO.java
@@ -1,10 +1,9 @@
 package com.finut.finut_server.domain.quiz;
 
 import com.finut.finut_server.domain.difficulty.DifficultyType;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import com.finut.finut_server.domain.level.LevelName;
+import lombok.*;
+import org.apache.commons.lang3.builder.Diff;
 
 public class QuizResponseDTO {
 
@@ -19,4 +18,13 @@ public static class randomQuizResponseDTO {
         AnswerType answer;
         String description;
     }
+
+    @Builder
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class quizResultResponseDTO {
+        String difficulty;
+    }
 }
diff --git a/src/main/java/com/finut/finut_server/service/QuizService.java b/src/main/java/com/finut/finut_server/service/QuizService.java
@@ -1,8 +1,11 @@
 package com.finut.finut_server.service;
 
+import com.finut.finut_server.domain.difficulty.Difficulty;
 import com.finut.finut_server.domain.difficulty.DifficultyType;
+import com.finut.finut_server.domain.level.Level;
 import com.finut.finut_server.domain.quiz.Quiz;
 import com.finut.finut_server.domain.quiz.QuizRepository;
+import com.finut.finut_server.domain.quiz.QuizResponseDTO;
 import com.finut.finut_server.domain.quizDone.QuizDoneRepository;
 import com.finut.finut_server.domain.user.Users;
 import com.finut.finut_server.domain.user.UsersRepository;
@@ -80,6 +83,27 @@ public List<Quiz> getQuizToLevelTest(Long userId) {
         return uncompletedQuizzes;
     }
 
+    @Transactional
+    public QuizResponseDTO.quizResultResponseDTO getQuizLevelResult(Long userId, int score) {
+        Users users = usersRepository.findById(userId).orElseThrow(() -> new RuntimeException("User not found"));
+        Difficulty difficulty = new Difficulty();
+        QuizResponseDTO.quizResultResponseDTO quizResultResponseDTO = new QuizResponseDTO.quizResultResponseDTO();
+        if(score >= 20){
+            difficulty.setDifficulty(DifficultyType.HI);
+            users.setDifficulty(difficulty);
+            quizResultResponseDTO.setDifficulty("HIGH");
+        } else if(score >= 9){
+            difficulty.setDifficulty(DifficultyType.MI);
+            users.setDifficulty(difficulty);
+            quizResultResponseDTO.setDifficulty("MIDDLE");
+        }
+        else{
+            quizResultResponseDTO.setDifficulty("LOW");
+        }
+        usersRepository.save(users);
+        return quizResultResponseDTO;
+    }
+
     public Optional<Quiz> getQuizByQuizId(Long quizId) {
         return quizRepository.findById(quizId);
 

diff --git a/src/main/java/com/finut/finut_server/service/UsersService.java b/src/main/java/com/finut/finut_server/service/UsersService.java
@@ -79,17 +79,17 @@ public UserResponseDTO.updateAttendance updateAttendDate(Long userId){
                 msg = "연속 5회 출석했습니다!";
             }
 
-            // XP가 100이면 승진하기
-            if(user.getXP() >= 100){
-                user.setXP(user.getXP() - 100);
-                Long newLevelId = user.getLevel().getId() + 1L; // id에 1 증가
-
-                // 증가된 id를 가진 Level 엔티티를 데이터베이스에서 조회하여 user에 설정
-                Level newLevel = levelRepository.findById(newLevelId)
-                        .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 레벨입니다."));
-                user.setLevel(newLevel); // user에 새로운 Level 설정
-                msg = "승진했습니다!";
-            }
+//            // XP가 100이면 승진하기
+//            if(user.getXP() >= 100){
+//                user.setXP(user.getXP() - 100);
+//                Long newLevelId = user.getLevel().getId() + 1L; // id에 1 증가
+//
+//                // 증가된 id를 가진 Level 엔티티를 데이터베이스에서 조회하여 user에 설정
+//                Level newLevel = levelRepository.findById(newLevelId)
+//                        .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 레벨입니다."));
+//                user.setLevel(newLevel); // user에 새로운 Level 설정
+//                msg = "승진했습니다!";
+//            }
 
             usersRepository.save(user);
         }