diff --git a/src/main/java/com/pbl/insaroad/domain/animalmission/controller/AnimalMissionController.java b/src/main/java/com/pbl/insaroad/domain/animalmission/controller/AnimalMissionController.java index 65c06e3..5fd4e03 100644 --- a/src/main/java/com/pbl/insaroad/domain/animalmission/controller/AnimalMissionController.java +++ b/src/main/java/com/pbl/insaroad/domain/animalmission/controller/AnimalMissionController.java @@ -3,7 +3,6 @@ */ package com.pbl.insaroad.domain.animalmission.controller; -import com.pbl.insaroad.domain.game.dto.request.GameRequest.CompleteRequest; import jakarta.validation.Valid; import org.springframework.web.bind.annotation.PostMapping; @@ -14,6 +13,7 @@ import com.pbl.insaroad.domain.animalmission.dto.request.AnimalMissionSubmitRequest; import com.pbl.insaroad.domain.animalmission.dto.response.AnimalResultResponse; import com.pbl.insaroad.domain.animalmission.service.AnimalMissionService; +import com.pbl.insaroad.domain.game.dto.request.GameRequest.CompleteRequest; import com.pbl.insaroad.global.response.BaseResponse; import io.swagger.v3.oas.annotations.Operation; @@ -36,7 +36,8 @@ public class AnimalMissionController { public BaseResponse submitAnimalMission( @Valid @RequestBody AnimalMissionSubmitRequest missionRequest, @Valid @RequestBody CompleteRequest completeRequest) { - AnimalResultResponse result = animalMissionService.submitAnimalMission(missionRequest, completeRequest); + AnimalResultResponse result = + animalMissionService.submitAnimalMission(missionRequest, completeRequest); return BaseResponse.success(result); } } diff --git a/src/main/java/com/pbl/insaroad/domain/animalmission/dto/request/AnimalMissionSubmitRequest.java b/src/main/java/com/pbl/insaroad/domain/animalmission/dto/request/AnimalMissionSubmitRequest.java index c5936a1..90b8c92 100644 --- a/src/main/java/com/pbl/insaroad/domain/animalmission/dto/request/AnimalMissionSubmitRequest.java +++ b/src/main/java/com/pbl/insaroad/domain/animalmission/dto/request/AnimalMissionSubmitRequest.java @@ -5,7 +5,6 @@ import java.util.List; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/pbl/insaroad/domain/animalmission/service/AnimalMissionService.java b/src/main/java/com/pbl/insaroad/domain/animalmission/service/AnimalMissionService.java index c4b07f5..8c83c8a 100644 --- a/src/main/java/com/pbl/insaroad/domain/animalmission/service/AnimalMissionService.java +++ b/src/main/java/com/pbl/insaroad/domain/animalmission/service/AnimalMissionService.java @@ -3,9 +3,6 @@ */ package com.pbl.insaroad.domain.animalmission.service; -import com.pbl.insaroad.domain.game.dto.request.GameRequest.CompleteRequest; -import com.pbl.insaroad.domain.user.entity.User; -import com.pbl.insaroad.domain.user.service.UserService; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -24,7 +21,10 @@ import com.pbl.insaroad.domain.animalmission.dto.response.AnimalResultResponse; import com.pbl.insaroad.domain.animalmission.entity.AnimalType; import com.pbl.insaroad.domain.animalmission.exception.AnimalMissionErrorCode; +import com.pbl.insaroad.domain.game.dto.request.GameRequest.CompleteRequest; +import com.pbl.insaroad.domain.user.entity.User; import com.pbl.insaroad.domain.user.repository.UserRepository; +import com.pbl.insaroad.domain.user.service.UserService; import com.pbl.insaroad.global.exception.CustomException; import lombok.RequiredArgsConstructor; @@ -49,7 +49,8 @@ public class AnimalMissionService { // 동물 미션 제출 처리 메서드 @Transactional - public AnimalResultResponse submitAnimalMission(AnimalMissionSubmitRequest missionRequest, CompleteRequest completeRequest) { + public AnimalResultResponse submitAnimalMission( + AnimalMissionSubmitRequest missionRequest, CompleteRequest completeRequest) { // 0. patternAnimals 중복 검증 validateNoDuplicatePatternAnimals(missionRequest.getPatternAnimals()); diff --git a/src/main/java/com/pbl/insaroad/domain/hangulsign/controller/HangulSignQuizController.java b/src/main/java/com/pbl/insaroad/domain/hangulsign/controller/HangulSignQuizController.java index c116a0a..c177a97 100644 --- a/src/main/java/com/pbl/insaroad/domain/hangulsign/controller/HangulSignQuizController.java +++ b/src/main/java/com/pbl/insaroad/domain/hangulsign/controller/HangulSignQuizController.java @@ -3,7 +3,6 @@ */ package com.pbl.insaroad.domain.hangulsign.controller; -import com.pbl.insaroad.domain.game.dto.request.GameRequest.CompleteRequest; import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; @@ -14,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.pbl.insaroad.domain.game.dto.request.GameRequest.CompleteRequest; import com.pbl.insaroad.domain.hangulsign.dto.request.AnswerRequest; import com.pbl.insaroad.domain.hangulsign.dto.response.AnswerResponse; import com.pbl.insaroad.domain.hangulsign.dto.response.QuizResponse; diff --git a/src/main/java/com/pbl/insaroad/domain/hangulsign/service/HangulSignQuizService.java b/src/main/java/com/pbl/insaroad/domain/hangulsign/service/HangulSignQuizService.java index 49c023f..901c2a8 100644 --- a/src/main/java/com/pbl/insaroad/domain/hangulsign/service/HangulSignQuizService.java +++ b/src/main/java/com/pbl/insaroad/domain/hangulsign/service/HangulSignQuizService.java @@ -3,13 +3,12 @@ */ package com.pbl.insaroad.domain.hangulsign.service; -import com.pbl.insaroad.domain.game.dto.request.GameRequest.CompleteRequest; -import com.pbl.insaroad.domain.user.service.UserService; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.pbl.insaroad.domain.game.dto.request.GameRequest.CompleteRequest; import com.pbl.insaroad.domain.hangulsign.dto.request.AnswerRequest; import com.pbl.insaroad.domain.hangulsign.dto.request.QuizCreateRequest; import com.pbl.insaroad.domain.hangulsign.dto.response.AnswerResponse; @@ -21,6 +20,7 @@ import com.pbl.insaroad.domain.hangulsign.repository.HangulSignQuizRepository; import com.pbl.insaroad.domain.user.entity.User; import com.pbl.insaroad.domain.user.repository.UserRepository; +import com.pbl.insaroad.domain.user.service.UserService; import com.pbl.insaroad.global.exception.CustomException; import lombok.RequiredArgsConstructor; @@ -47,7 +47,8 @@ public QuizResponse getRandomQuiz() { return quizMapper.toQuizResponse(quiz); } - public AnswerResponse submitAnswer(Long quizId, AnswerRequest request, CompleteRequest completeRequest) { + public AnswerResponse submitAnswer( + Long quizId, AnswerRequest request, CompleteRequest completeRequest) { // 사용자 조회 User user = userRepository