Skip to content

✨ [FEAT/#15] 정답 선택지를 응답에 추가 #17

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

Merged
jaeyeonyy merged 1 commit into from
Dec 19, 2025
Merged

✨ [FEAT/#15] 정답 선택지를 응답에 추가 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/main/java/com/pbl/insaroad/domain/animalmission/controller/AnimalMissionController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -36,7 +36,8 @@ public class AnimalMissionController {
public BaseResponse<AnimalResultResponse> 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);
}
}
1 change: 0 additions & 1 deletion ...in/java/com/pbl/insaroad/domain/animalmission/dto/request/AnimalMissionSubmitRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import java.util.List;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;

Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/pbl/insaroad/domain/animalmission/service/AnimalMissionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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());

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/pbl/insaroad/domain/hangulsign/controller/HangulSignQuizController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/pbl/insaroad/domain/hangulsign/service/HangulSignQuizService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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
Expand Down