diff --git a/src/main/java/com/back/catchmate/domain/enroll/controller/EnrollController.java b/src/main/java/com/back/catchmate/domain/enroll/controller/EnrollController.java index 1eaae7f..0932142 100644 --- a/src/main/java/com/back/catchmate/domain/enroll/controller/EnrollController.java +++ b/src/main/java/com/back/catchmate/domain/enroll/controller/EnrollController.java @@ -98,10 +98,10 @@ public UpdateEnrollInfo rejectEnroll(@PathVariable Long enrollId, return enrollService.rejectEnroll(enrollId, userId); } - @GetMapping("/{enrollId}/description") - @Operation(summary = "보낸 신청 상세 조회 API", description = "보낸 신청의 상세 내용을 조회하는 API 입니다.") - public EnrollDescriptionInfo getEnrollDescriptionById(@PathVariable Long enrollId, + @GetMapping("/{boardId}/description") + @Operation(summary = "보낸 신청 상세 조회 API", description = "내가 특정 게시글에 보낸 신청의 상세 내용을 조회하는 API 입니다.") + public EnrollDescriptionInfo getEnrollDescriptionById(@PathVariable Long boardId, @JwtValidation Long userId) { - return enrollService.getEnrollDescriptionById(enrollId, userId); + return enrollService.getEnrollDescriptionById(boardId, userId); } } diff --git a/src/main/java/com/back/catchmate/domain/enroll/converter/EnrollConverter.java b/src/main/java/com/back/catchmate/domain/enroll/converter/EnrollConverter.java index 23f448b..4310615 100644 --- a/src/main/java/com/back/catchmate/domain/enroll/converter/EnrollConverter.java +++ b/src/main/java/com/back/catchmate/domain/enroll/converter/EnrollConverter.java @@ -147,6 +147,7 @@ public UpdateEnrollInfo toUpdateEnrollInfo(Enroll enroll, AcceptStatus acceptSta public EnrollDescriptionInfo toEnrollDescriptionInfo(Enroll enroll) { return EnrollDescriptionInfo.builder() + .enrollId(enroll.getId()) .description(enroll.getDescription()) .build(); } diff --git a/src/main/java/com/back/catchmate/domain/enroll/dto/EnrollResponse.java b/src/main/java/com/back/catchmate/domain/enroll/dto/EnrollResponse.java index 0e89646..65972c5 100644 --- a/src/main/java/com/back/catchmate/domain/enroll/dto/EnrollResponse.java +++ b/src/main/java/com/back/catchmate/domain/enroll/dto/EnrollResponse.java @@ -111,6 +111,7 @@ public static class CancelEnrollInfo { @NoArgsConstructor @AllArgsConstructor public static class EnrollDescriptionInfo { + private Long enrollId; private String description; } } diff --git a/src/main/java/com/back/catchmate/domain/enroll/service/EnrollServiceImpl.java b/src/main/java/com/back/catchmate/domain/enroll/service/EnrollServiceImpl.java index 641af00..2e45649 100644 --- a/src/main/java/com/back/catchmate/domain/enroll/service/EnrollServiceImpl.java +++ b/src/main/java/com/back/catchmate/domain/enroll/service/EnrollServiceImpl.java @@ -232,11 +232,11 @@ public UpdateEnrollInfo rejectEnroll(Long enrollId, Long userId) throws IOExcept } @Override - public EnrollResponse.EnrollDescriptionInfo getEnrollDescriptionById(Long enrollId, Long userId) { + public EnrollResponse.EnrollDescriptionInfo getEnrollDescriptionById(Long boardId, Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new BaseException(ErrorCode.USER_NOT_FOUND)); - Enroll enroll = enrollRepository.findById(enrollId) + Enroll enroll = enrollRepository.findByUserIdAndBoardIdAndDeletedAtIsNull(user.getId(), boardId) .orElseThrow(() -> new BaseException(ErrorCode.ENROLL_NOT_FOUND)); return enrollConverter.toEnrollDescriptionInfo(enroll);