diff --git a/src/main/java/com/gdgoc/study_group/study/api/StudyController.java b/src/main/java/com/gdgoc/study_group/study/api/StudyController.java index 7509c3d..3845e8f 100644 --- a/src/main/java/com/gdgoc/study_group/study/api/StudyController.java +++ b/src/main/java/com/gdgoc/study_group/study/api/StudyController.java @@ -20,9 +20,10 @@ public StudyController(StudyService studyService, StudyRepository studyRepositor @PostMapping() public ResponseEntity createStudy(@RequestBody StudyCreateRequest request) { - StudyCreateResponse newStudy = studyService.createStudy(1L, request); // 임시 유저 + Long createdStudyId = studyService.createStudy(1L, request); // 임시 유저 - return ResponseEntity.status(HttpStatus.CREATED).body(newStudy); + return ResponseEntity.status(HttpStatus.CREATED) + .body(StudyCreateResponse.builder().id(createdStudyId).build()); } @GetMapping() @@ -37,8 +38,7 @@ public ResponseEntity getStudyDetail(@PathVariable("studyId") Long studyId) { StudyDetailResponse studyDetail = studyService.getStudyDetail(studyId); if (studyDetail == null) { - return ResponseEntity.status(HttpStatus.NOT_FOUND) - .body(MessageResponse.builder().message("해당하는 스터디가 없습니다.").build()); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body("해당하는 스터디가 없습니다."); } return ResponseEntity.status(HttpStatus.OK).body(studyDetail); @@ -47,26 +47,26 @@ public ResponseEntity getStudyDetail(@PathVariable("studyId") Long studyId) { @PatchMapping("/{studyId}") public ResponseEntity updateStudy( @PathVariable("studyId") Long studyId, @RequestBody StudyCreateRequest updateRequest) { + Long updatedStudyId = studyService.updateStudy(studyId, updateRequest); + if (updatedStudyId == null) { - return ResponseEntity.status(HttpStatus.NOT_FOUND) - .body(MessageResponse.builder().message("해당하는 스터디가 없습니다").build()); + return ResponseEntity.status(HttpStatus.NOT_FOUND).build(); } + return ResponseEntity.status(HttpStatus.OK) - .body(StudyCreateResponse.builder().message("스터디가 수정되었습니다.").id(updatedStudyId).build()); + .body(StudyCreateResponse.builder().id(updatedStudyId).build()); } @DeleteMapping("/{studyId}") - public ResponseEntity deleteStudy(@PathVariable("studyId") Long studyId) { + public ResponseEntity deleteStudy(@PathVariable("studyId") Long studyId) { boolean isStudyExist = studyService.deleteStudy(studyId); if (isStudyExist) { - return ResponseEntity.status(HttpStatus.NO_CONTENT) - .body(MessageResponse.builder().message("스터디가 삭제되었습니다.").build()); + return ResponseEntity.status(HttpStatus.NO_CONTENT).body("스터디가 삭제되었습니다."); } - return ResponseEntity.status(HttpStatus.NOT_FOUND) - .body(MessageResponse.builder().message("해당하는 스터디가 없습니다.").build()); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body("해당하는 스터디가 없습니다."); } } diff --git a/src/main/java/com/gdgoc/study_group/study/application/StudyService.java b/src/main/java/com/gdgoc/study_group/study/application/StudyService.java index 4f0ea02..43e1b44 100644 --- a/src/main/java/com/gdgoc/study_group/study/application/StudyService.java +++ b/src/main/java/com/gdgoc/study_group/study/application/StudyService.java @@ -52,7 +52,7 @@ private Day createDay(DayDTO dayDTO, Study study) { * @param createRequest 스터디 생성 DTO * @return ResponseDTO 반환 */ - public StudyCreateResponse createStudy(Long userId, StudyCreateRequest createRequest) { + public Long createStudy(Long userId, StudyCreateRequest createRequest) { Study study = Study.builder() @@ -87,7 +87,7 @@ public StudyCreateResponse createStudy(Long userId, StudyCreateRequest createReq studyRepository.save(study); - return StudyCreateResponse.builder().message("스터디가 생성되었습니다").id(study.getId()).build(); + return study.getId(); } /** diff --git a/src/main/java/com/gdgoc/study_group/study/dto/MessageResponse.java b/src/main/java/com/gdgoc/study_group/study/dto/MessageResponse.java deleted file mode 100644 index fcf398d..0000000 --- a/src/main/java/com/gdgoc/study_group/study/dto/MessageResponse.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.gdgoc.study_group.study.dto; - -import lombok.Builder; -import lombok.Getter; - -@Builder -@Getter -public class MessageResponse { - private String message; -} diff --git a/src/main/java/com/gdgoc/study_group/study/dto/StudyCreateResponse.java b/src/main/java/com/gdgoc/study_group/study/dto/StudyCreateResponse.java index a594f7b..48a8a24 100644 --- a/src/main/java/com/gdgoc/study_group/study/dto/StudyCreateResponse.java +++ b/src/main/java/com/gdgoc/study_group/study/dto/StudyCreateResponse.java @@ -6,6 +6,5 @@ @Getter @Builder public class StudyCreateResponse { - private String message; private Long id; }