Study Controller, Service 추가

src/main/java/com/gdgoc/study_group/study/api/StudyController.java

@@ -1,11 +1,10 @@
 package com.gdgoc.study_group.study.api;
 
 import com.gdgoc.study_group.study.application.StudyService;
-import com.gdgoc.study_group.study.dto.StudyCreateRequest;
-import com.gdgoc.study_group.study.dto.StudyCreateResponse;
-import com.gdgoc.study_group.study.dto.StudyDetailResponse;
-import com.gdgoc.study_group.study.dto.StudyListResponse;
+import com.gdgoc.study_group.study.dao.StudyRepository;
+import com.gdgoc.study_group.study.dto.*;
 import java.util.List;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -14,33 +13,50 @@
 public class StudyController {
 
   public final StudyService studyService;
+  private final StudyRepository studyRepository;
 
-  public StudyController(StudyService studyService) {
+  public StudyController(StudyService studyService, StudyRepository studyRepository) {
     this.studyService = studyService;
+    this.studyRepository = studyRepository;
   }
 
   @PostMapping()
   public ResponseEntity<StudyCreateResponse> createStudy(@RequestBody StudyCreateRequest request) {
     StudyCreateResponse newStudy = studyService.createStudy(request);
 
-    return ResponseEntity.ok(newStudy);
+    return ResponseEntity.status(HttpStatus.CREATED).body(newStudy);
   }
 
   @GetMapping()
   public ResponseEntity<List<StudyListResponse>> getStudyList() {
     List<StudyListResponse> studyList = studyService.getStudyList();
 
-    return ResponseEntity.ok(studyList);
+    return ResponseEntity.status(HttpStatus.OK).body(studyList);
   }
 
   @GetMapping("/{studyId}")
-  public ResponseEntity<StudyDetailResponse> getStudyDetail(@PathVariable("studyId") Long studyId) {
+  public ResponseEntity<?> getStudyDetail(@PathVariable("studyId") Long studyId) {
     StudyDetailResponse studyDetail = studyService.getStudyDetail(studyId);
 
     if (studyDetail == null) {
-      return ResponseEntity.notFound().build();
+      MessageResponse messageResponse = MessageResponse.builder().message("해당하는 스터디가 없습니다.").build();
+
+      return ResponseEntity.status(HttpStatus.NOT_FOUND).body(messageResponse);
+    }
+
+    return ResponseEntity.status(HttpStatus.OK).body(studyDetail);
+  }
+
+  @DeleteMapping("/{studyId}")
+  public ResponseEntity<MessageResponse> deleteStudy(@PathVariable("studyId") Long studyId) {
+
+    MessageResponse messageResponse = studyService.deleteStudy(studyId);
+
+    if (messageResponse == null) {
+      messageResponse = MessageResponse.builder().message("스터디가 삭제되었습니다.").build();
+      return ResponseEntity.status(HttpStatus.NOT_FOUND).body(messageResponse);
     }
 
-    return ResponseEntity.ok(studyDetail);
+    return ResponseEntity.status(HttpStatus.OK).body(messageResponse);
   }
 }

src/main/java/com/gdgoc/study_group/study/application/StudyService.java

@@ -6,15 +6,13 @@
 import com.gdgoc.study_group.day.dto.DayDTO;
 import com.gdgoc.study_group.study.dao.StudyRepository;
 import com.gdgoc.study_group.study.domain.Study;
-import com.gdgoc.study_group.study.dto.StudyCreateRequest;
-import com.gdgoc.study_group.study.dto.StudyCreateResponse;
-import com.gdgoc.study_group.study.dto.StudyDetailResponse;
-import com.gdgoc.study_group.study.dto.StudyListResponse;
+import com.gdgoc.study_group.study.dto.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.stereotype.Service;
 
+/** 예외처리 + 권한 확인 아직 안 함.... 빨리 하겠슴다 */
 @Service
 public class StudyService {
 
@@ -24,9 +22,14 @@ public StudyService(StudyRepository studyRepository) {
     this.studyRepository = studyRepository;
   }
 
+  /**
+   * 스터디를 생성합니다.
+   *
+   * @param createRequest 스터디 생성 DTO
+   * @return ResponseDTO 반환
+   */
   public StudyCreateResponse createStudy(StudyCreateRequest createRequest) {
 
-    // 스터디 생성
     Study study =
         Study.builder()
             .name(createRequest.getName())
@@ -66,10 +69,14 @@ public StudyCreateResponse createStudy(StudyCreateRequest createRequest) {
 
     studyRepository.save(study);
 
-    return StudyCreateResponse.builder().message("Study Created").id(study.getId()).build();
+    return StudyCreateResponse.builder().message("스터디가 생성되었습니다").id(study.getId()).build();
   }
 
-  // 스터디 전체 목록 조회
+  /**
+   * 스터디 전체 목록을 조회합니다.
+   *
+   * @return 스터디 전체 목록 리스트
+   */
   public List<StudyListResponse> getStudyList() {
     List<Study> studyList = studyRepository.findAll();
     List<StudyListResponse> listResponse = new ArrayList<>();
@@ -88,7 +95,12 @@ public List<StudyListResponse> getStudyList() {
     return listResponse;
   }
 
-  // 스터디 상세 정보 조회
+  /**
+   * 스터디 상세 정보를 조회합니다.
+   *
+   * @param studyId 조회할 스터디 아이디
+   * @return 스터디 정보 반환
+   */
   public StudyDetailResponse getStudyDetail(Long studyId) {
     Optional<Study> study = studyRepository.findById(studyId);
 
@@ -118,7 +130,7 @@ public StudyDetailResponse getStudyDetail(Long studyId) {
         }
       }
 
-      // day가 있다면 dayDTO로 변환해 responsedp cnrk
+      // day가 있다면 dayDTO로 변환해 response에 추가
       if (study.get().getDays() != null) {
         for (Day day : study.get().getDays()) {
           DayDTO dayDTO = DayDTO.builder().day(day.getDay()).startTime(day.getStartTime()).build();
@@ -130,4 +142,21 @@ public StudyDetailResponse getStudyDetail(Long studyId) {
     }
     return null;
   }
+
+  /**
+   * 스터디장 권한 확인 필요 스터디를 삭제합니다
+   *
+   * @param studyId 삭제할 스터디의 아이디
+   * @return 삭제 완료 메시지를 담은 MessageResponse DTO
+   */
+  public MessageResponse deleteStudy(Long studyId) {
+    Optional<Study> study = studyRepository.findById(studyId);
+
+    if (study.isEmpty()) {
+      return null;
+    }
+
+    studyRepository.deleteById(studyId);
+    return MessageResponse.builder().message("스터디가 삭제되었습니다.").build();
+  }
 }

src/main/java/com/gdgoc/study_group/study/dto/MessageResponse.java

@@ -0,0 +1,10 @@
+package com.gdgoc.study_group.study.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class MessageResponse {
+  private String message;
+}