From de40d9d0d3885bcfe4095c9b545ddaf7e1fe5fe3 Mon Sep 17 00:00:00 2001 From: HongGit Date: Tue, 25 Mar 2025 19:01:05 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[fix/#106]=20=EC=83=88=EB=81=BC=EB=AC=B8?= =?UTF-8?q?=ED=95=AD=20=EC=A0=9C=EC=B6=9C=20=EC=97=86=EC=96=B4=EB=8F=84=20?= =?UTF-8?q?=ED=95=B4=EC=84=A4=20=EC=A1=B0=ED=9A=8C=EA=B0=80=EB=8A=A5?= =?UTF-8?q?=ED=95=98=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/submit/service/CommentaryGetService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/moplus/moplus_server/client/submit/service/CommentaryGetService.java b/src/main/java/com/moplus/moplus_server/client/submit/service/CommentaryGetService.java index cbbb9140..2c826e2a 100644 --- a/src/main/java/com/moplus/moplus_server/client/submit/service/CommentaryGetService.java +++ b/src/main/java/com/moplus/moplus_server/client/submit/service/CommentaryGetService.java @@ -1,6 +1,8 @@ package com.moplus.moplus_server.client.submit.service; import com.moplus.moplus_server.admin.publish.domain.Publish; +import com.moplus.moplus_server.client.submit.domain.ChildProblemSubmit; +import com.moplus.moplus_server.client.submit.domain.ChildProblemSubmitStatus; import com.moplus.moplus_server.client.submit.domain.ProblemSubmit; import com.moplus.moplus_server.client.submit.dto.response.ChildProblemDetailResponse; import com.moplus.moplus_server.client.submit.dto.response.CommentaryGetResponse; @@ -56,8 +58,10 @@ public CommentaryGetResponse getCommentary(Long publishId, Long problemId) { .map(cp -> ChildProblemDetailResponse.of( cp.getImageUrl(), cp.getPrescriptionImageUrls(), - childProblemSubmitRepository.findByMemberIdAndPublishIdAndChildProblemIdElseThrow(memberId, publishId, - cp.getId()).getStatus() + childProblemSubmitRepository.findByMemberIdAndPublishIdAndChildProblemId(memberId, publishId, + cp.getId()) + .map(ChildProblemSubmit::getStatus) + .orElse(ChildProblemSubmitStatus.NOT_STARTED) )).toList(); // 처방 정보 생성 From f59e40340b2c7f58537e1a36f2144f94d1de914f Mon Sep 17 00:00:00 2001 From: HongGit Date: Tue, 25 Mar 2025 19:04:45 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[fix/#106]=20=ED=86=A0=ED=81=B0=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=A9=A4=EB=B2=84=EC=A1=B0=ED=9A=8C=ED=95=98?= =?UTF-8?q?=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ClientSubmitController.java | 27 ++++++++++++------- .../controller/CommentaryGetController.java | 9 ++++--- .../submit/service/ClientSubmitService.java | 15 ++++------- .../submit/service/CommentaryGetService.java | 3 +-- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/moplus/moplus_server/client/submit/controller/ClientSubmitController.java b/src/main/java/com/moplus/moplus_server/client/submit/controller/ClientSubmitController.java index 25c495cc..21153ccc 100644 --- a/src/main/java/com/moplus/moplus_server/client/submit/controller/ClientSubmitController.java +++ b/src/main/java/com/moplus/moplus_server/client/submit/controller/ClientSubmitController.java @@ -8,6 +8,8 @@ import com.moplus.moplus_server.client.submit.dto.request.ProblemSubmitCreateRequest; import com.moplus.moplus_server.client.submit.dto.request.ProblemSubmitUpdateRequest; import com.moplus.moplus_server.client.submit.service.ClientSubmitService; +import com.moplus.moplus_server.global.annotation.AuthUser; +import com.moplus.moplus_server.member.domain.Member; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -29,43 +31,48 @@ public class ClientSubmitController { @PostMapping("problemSubmit") @Operation(summary = "문항 제출 생성", description = "문항 제출을 '진행중'으로 생성합니다.") public ResponseEntity createProblemSubmit( - @RequestBody ProblemSubmitCreateRequest request + @RequestBody ProblemSubmitCreateRequest request, + @AuthUser Member member ) { - clientSubmitService.createProblemSubmit(request); + clientSubmitService.createProblemSubmit(member.getId(), request); return ResponseEntity.ok(null); } @PutMapping("problemSubmit") @Operation(summary = "문항 제출 업데이트", description = "제출한 답안을 바탕으로 문항 제출의 상태를 업데이트합니다.") public ResponseEntity updateProblemSubmit( - @RequestBody ProblemSubmitUpdateRequest request + @RequestBody ProblemSubmitUpdateRequest request, + @AuthUser Member member ) { - return ResponseEntity.ok(clientSubmitService.updateProblemSubmit(request)); + return ResponseEntity.ok(clientSubmitService.updateProblemSubmit(member.getId(), request)); } @PostMapping("childProblemSubmit") @Operation(summary = "새끼문항 제출 생성", description = "문항에 속한 새끼문항들을 '시작전'으로 생성합니다.") public ResponseEntity createProblemSubmit( - @RequestBody ChildProblemSubmitCreateRequest request + @RequestBody ChildProblemSubmitCreateRequest request, + @AuthUser Member member ) { - clientSubmitService.createChildProblemSubmit(request); + clientSubmitService.createChildProblemSubmit(member.getId(), request); return ResponseEntity.ok(null); } @PutMapping("childProblemSubmit") @Operation(summary = "새끼문항 제출 업데이트", description = "제출한 답안을 바탕으로 문항 제출의 상태를 업데이트합니다.") public ResponseEntity updateChildProblemSubmit( - @RequestBody ChildProblemSubmitUpdateRequest request + @RequestBody ChildProblemSubmitUpdateRequest request, + @AuthUser Member member ) { - return ResponseEntity.ok(clientSubmitService.updateChildProblemSubmit(request)); + return ResponseEntity.ok(clientSubmitService.updateChildProblemSubmit(member.getId(), request)); } @PutMapping("childProblemSubmit/incorrect") @Operation(summary = "새끼문항 제출 틀림 업데이트", description = "새끼문항 제출의 상태를 틀림으로 업데이트합니다.") public ResponseEntity updateChildProblemSubmitIncorrect( - @RequestBody ChildProblemSubmitUpdateIncorrectRequest request + @RequestBody ChildProblemSubmitUpdateIncorrectRequest request, + @AuthUser Member member ) { - clientSubmitService.updateChildProblemSubmitIncorrect(request); + clientSubmitService.updateChildProblemSubmitIncorrect(member.getId(), request); return ResponseEntity.ok(null); } } diff --git a/src/main/java/com/moplus/moplus_server/client/submit/controller/CommentaryGetController.java b/src/main/java/com/moplus/moplus_server/client/submit/controller/CommentaryGetController.java index b46ad78a..025566c9 100644 --- a/src/main/java/com/moplus/moplus_server/client/submit/controller/CommentaryGetController.java +++ b/src/main/java/com/moplus/moplus_server/client/submit/controller/CommentaryGetController.java @@ -2,6 +2,8 @@ import com.moplus.moplus_server.client.submit.dto.response.CommentaryGetResponse; import com.moplus.moplus_server.client.submit.service.CommentaryGetService; +import com.moplus.moplus_server.global.annotation.AuthUser; +import com.moplus.moplus_server.member.domain.Member; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -23,8 +25,9 @@ public class CommentaryGetController { @Operation(summary = "해설 조회", description = "문항 별 해설/처방을 조회합니다.") public ResponseEntity getCommentary( @RequestParam(value = "publishId", required = false) Long publishId, - @RequestParam(value = "problemId", required = false) Long problemId - ) { - return ResponseEntity.ok(commentaryGetService.getCommentary(publishId, problemId)); + @RequestParam(value = "problemId", required = false) Long problemId, + @AuthUser Member member + ) { + return ResponseEntity.ok(commentaryGetService.getCommentary(member.getId(), publishId, problemId)); } } diff --git a/src/main/java/com/moplus/moplus_server/client/submit/service/ClientSubmitService.java b/src/main/java/com/moplus/moplus_server/client/submit/service/ClientSubmitService.java index f6ebd580..11c4066e 100644 --- a/src/main/java/com/moplus/moplus_server/client/submit/service/ClientSubmitService.java +++ b/src/main/java/com/moplus/moplus_server/client/submit/service/ClientSubmitService.java @@ -34,8 +34,7 @@ public class ClientSubmitService { private final ChildProblemRepository childProblemRepository; @Transactional - public void createProblemSubmit(ProblemSubmitCreateRequest request) { - Long memberId = 1L; + public void createProblemSubmit(Long memberId, ProblemSubmitCreateRequest request) { // 존재하는 발행인지 검증 publishRepository.existsByIdElseThrow(request.publishId()); @@ -52,8 +51,7 @@ public void createProblemSubmit(ProblemSubmitCreateRequest request) { } @Transactional - public ProblemSubmitStatus updateProblemSubmit(ProblemSubmitUpdateRequest request) { - Long memberId = 1L; + public ProblemSubmitStatus updateProblemSubmit(Long memberId, ProblemSubmitUpdateRequest request) { // 존재하는 발행인지 검증 publishRepository.existsByIdElseThrow(request.publishId()); @@ -73,8 +71,7 @@ public ProblemSubmitStatus updateProblemSubmit(ProblemSubmitUpdateRequest reques } @Transactional - public void createChildProblemSubmit(ChildProblemSubmitCreateRequest request) { - Long memberId = 1L; + public void createChildProblemSubmit(Long memberId, ChildProblemSubmitCreateRequest request) { // 존재하는 발행인지 검증 publishRepository.existsByIdElseThrow(request.publishId()); @@ -115,8 +112,7 @@ public void createChildProblemSubmit(ChildProblemSubmitCreateRequest request) { } @Transactional - public ChildProblemSubmitStatus updateChildProblemSubmit(ChildProblemSubmitUpdateRequest request) { - Long memberId = 1L; + public ChildProblemSubmitStatus updateChildProblemSubmit(Long memberId, ChildProblemSubmitUpdateRequest request) { // 존재하는 발행인지 검증 publishRepository.existsByIdElseThrow(request.publishId()); @@ -136,8 +132,7 @@ public ChildProblemSubmitStatus updateChildProblemSubmit(ChildProblemSubmitUpdat } @Transactional - public void updateChildProblemSubmitIncorrect(ChildProblemSubmitUpdateIncorrectRequest request) { - Long memberId = 1L; + public void updateChildProblemSubmitIncorrect(Long memberId, ChildProblemSubmitUpdateIncorrectRequest request) { // 존재하는 발행인지 검증 publishRepository.existsByIdElseThrow(request.publishId()); diff --git a/src/main/java/com/moplus/moplus_server/client/submit/service/CommentaryGetService.java b/src/main/java/com/moplus/moplus_server/client/submit/service/CommentaryGetService.java index 2c826e2a..140c6474 100644 --- a/src/main/java/com/moplus/moplus_server/client/submit/service/CommentaryGetService.java +++ b/src/main/java/com/moplus/moplus_server/client/submit/service/CommentaryGetService.java @@ -35,8 +35,7 @@ public class CommentaryGetService { private final ChildProblemSubmitRepository childProblemSubmitRepository; @Transactional(readOnly = true) - public CommentaryGetResponse getCommentary(Long publishId, Long problemId) { - Long memberId = 1L; + public CommentaryGetResponse getCommentary(Long memberId, Long publishId, Long problemId) { // 발행 조회 Publish publish = publishRepository.findByIdElseThrow(publishId);