Merge pull request #14 from Team-HoEunLee/feat/13-add-user-area-solved-api

feat(#13) :: 분야별 푼문제 카운트 API

Author: Kgeaun

src/main/java/JavaProject/Dayoung/domain/area/domain/Area.java

@@ -17,5 +17,4 @@ public class Area {
 
     @Column(columnDefinition = "varchar(15)")
     private String areaName;
-
 }

src/main/java/JavaProject/Dayoung/domain/quiz/domain/UserAreaSolved.java

@@ -0,0 +1,40 @@
+package JavaProject.Dayoung.domain.quiz.domain;
+
+import JavaProject.Dayoung.domain.area.domain.Area;
+import JavaProject.Dayoung.domain.user.domain.User;
+import lombok.*;
+
+import javax.persistence.*;
+
+/*
+    사용자별 푼 문제의 분야를 통계, 관리하는 엔티티
+
+    각 사용자가 특정 분야에서 해결한 문제의 수를 추적합니다.
+    User와 Area 엔티티와의 다대일 관계를 통해 통계 정보를 저장합니다.
+ */
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Builder
+public class UserAreaSolved {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "area_id", nullable = false)
+    private Area area;
+
+    @Column(nullable = false)
+    private Long solvedCount;
+
+    // 카운트를 증가시키는 메서드
+    public void incrementSolvedCount() {
+        this.solvedCount++;
+    }
+}

src/main/java/JavaProject/Dayoung/domain/quiz/presentation/UserAreaSolvedController.java

@@ -0,0 +1,28 @@
+package JavaProject.Dayoung.domain.quiz.presentation;
+
+import JavaProject.Dayoung.domain.quiz.presentation.dto.response.UserAreaSolvedResponse;
+import JavaProject.Dayoung.domain.quiz.service.UserAreaSolvedService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@Tag(name = "사용자 분야별 문제 풀이 통계", description = "사용자가 푼 문제의 분야별 통계를 조회")
+@RequestMapping("/user/area-solved")
+public class UserAreaSolvedController {
+
+    private final UserAreaSolvedService userAreaSolvedService;
+
+    @GetMapping("/{user-id}")
+    @Operation(summary = "사용자 분야별 문제 풀이 통계 조회", description = "특정 사용자의 분야별 문제 풀이 통계를 조회합니다.")
+    public List<UserAreaSolvedResponse> getUserAreaSolvedStats(@PathVariable("user-id") Long userId) {
+        return userAreaSolvedService.getUserAreaSolvedStats(userId);
+    }
+}

src/main/java/JavaProject/Dayoung/domain/quiz/presentation/dto/response/UserAreaSolvedResponse.java

@@ -0,0 +1,22 @@
+package JavaProject.Dayoung.domain.quiz.presentation.dto.response;
+
+import JavaProject.Dayoung.domain.area.domain.Area;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.PositiveOrZero;
+
+@Getter
+@Builder
+@AllArgsConstructor
+public class UserAreaSolvedResponse {
+
+    @NotNull(message = "영역은 null일 수 없습니다")
+    private Area area;
+
+    @NotNull(message = "해결한 문제 수는 null일 수 없습니다")
+    @PositiveOrZero(message = "해결한 문제 수는 0 이상이어야 합니다")
+    private Long solvedCount;
+}

src/main/java/JavaProject/Dayoung/domain/quiz/repository/UserAreaSolvedRepository.java

@@ -0,0 +1,20 @@
+package JavaProject.Dayoung.domain.quiz.repository;
+
+import JavaProject.Dayoung.domain.area.domain.Area;
+import JavaProject.Dayoung.domain.quiz.domain.UserAreaSolved;
+import JavaProject.Dayoung.domain.user.domain.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface UserAreaSolvedRepository extends JpaRepository<UserAreaSolved, Long> {
+    Optional<UserAreaSolved> findByUserAndArea(User user, Area area);
+
+    @Query("SELECT uas FROM UserAreaSolved uas WHERE uas.user.id = :userId")
+    List<UserAreaSolved> findAllByUserId(@Param("userId") Long userId);
+}

src/main/java/JavaProject/Dayoung/domain/quiz/service/SolveQuizService.java

@@ -21,34 +21,35 @@
 @Transactional
 @RequiredArgsConstructor
 public class SolveQuizService {
-
     private final UserFacade userFacade;
     private final TemplateConfig templateConfig;
     private final QuizRepository quizRepository;
     private final SolvedQuizRepository solvedQuizRepository;
+    private final UserAreaSolvedService userAreaSolvedService;
 
     public Map<String, String> execute(Long quizId, SolveQuizRequest request) {
-
         Quiz quiz = quizRepository.findQuizById(quizId);
 
         ChatGPTRequest gptRequest = templateConfig.promptMapping(quiz.getQuestion(), request);
         ResponseEntity<ChatGPTResponse> gptResponse = templateConfig.responseMapping(gptRequest);
 
         String responseContent = gptResponse.getBody().getChoices().get(0).getMessage().getContent();
-
         String correctRate = templateConfig.correctRateMatcher(responseContent);
         String feedback = templateConfig.feedbackMatcher(responseContent);
 
+        SolvedQuiz solvedQuiz = solvedQuizRepository.save(SolvedQuiz.builder()
+                .user(userFacade.getCurrentUser())
+                .quiz(quiz)
+                .receivedScore(Long.valueOf(correctRate))
+                .build());
+
+        // 분야별 통계 업데이트
+        userAreaSolvedService.updateUserAreaSolved(solvedQuiz);
+
         Map<String, String> result = new HashMap<>();
         result.put("정답률", correctRate);
         result.put("피드백", feedback);
 
-        solvedQuizRepository.save(SolvedQuiz.builder()
-            .user(userFacade.getCurrentUser())
-            .quiz(quiz)
-            .receivedScore(Long.valueOf(correctRate))
-        .build());
-
         return result;
     }
 }

src/main/java/JavaProject/Dayoung/domain/quiz/service/UserAreaSolvedService.java

@@ -0,0 +1,51 @@
+package JavaProject.Dayoung.domain.quiz.service;
+
+import JavaProject.Dayoung.domain.area.domain.Area;
+import JavaProject.Dayoung.domain.quiz.domain.SolvedQuiz;
+import JavaProject.Dayoung.domain.quiz.domain.UserAreaSolved;
+import JavaProject.Dayoung.domain.quiz.presentation.dto.response.UserAreaSolvedResponse;
+import JavaProject.Dayoung.domain.quiz.repository.UserAreaSolvedRepository;
+import JavaProject.Dayoung.domain.user.domain.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class UserAreaSolvedService {
+
+    private final UserAreaSolvedRepository userAreaSolvedRepository;
+
+    public void updateUserAreaSolved(SolvedQuiz solvedQuiz) {
+        User user = solvedQuiz.getUser();
+        List<Area> areas = solvedQuiz.getQuiz().getArea();
+        if (areas.isEmpty()) {
+            throw new IllegalStateException("퀴즈에 지정된 분야가 없습니다.");
+        }
+        Area area = areas.get(0);
+
+        UserAreaSolved userAreaSolved = userAreaSolvedRepository.findByUserAndArea(user, area)
+                .orElse(UserAreaSolved.builder()
+                        .user(user)
+                        .area(area)
+                        .solvedCount(0L)
+                        .build());
+
+        userAreaSolved.incrementSolvedCount();
+        userAreaSolvedRepository.save(userAreaSolved);
+    }
+
+    @Transactional(readOnly = true)
+    public List<UserAreaSolvedResponse> getUserAreaSolvedStats(Long userId) {
+        return userAreaSolvedRepository.findAllByUserId(userId).stream()
+                .map(userAreaSolved -> UserAreaSolvedResponse.builder()
+                        .area(userAreaSolved.getArea())
+                        .solvedCount(userAreaSolved.getSolvedCount())
+                        .build())
+                .collect(Collectors.toList());
+    }
+}