Merge branch 'develop' of https://github.com/prgrms-web-devcourse-final-project/WEB5_6_NeogulCoder_BE into feature/EA3-168-study-application

Author: pia01190

src/main/java/grep/neogul_coder/domain/calender/controller/PersonalCalendarController.java

@@ -23,8 +23,8 @@ public class PersonalCalendarController implements PersonalCalendarSpecification
     public ApiResponse<Long> create(
         @PathVariable("userId") Long userId,
         @Valid @RequestBody PersonalCalendarRequest request) {
-        Long calendarId = personalCalendarService.create(userId, request);
-        return ApiResponse.success(calendarId);  // 생성된 일정 ID 반환
+        Long personalCalendarId  = personalCalendarService.create(userId, request);
+        return ApiResponse.success(personalCalendarId );  // 생성된 일정 ID 반환
     }
 
     // 사용자 개인 일정 전체 조회 API

src/main/java/grep/neogul_coder/domain/calender/controller/PersonalCalendarSpecification.java

@@ -18,7 +18,7 @@ public interface PersonalCalendarSpecification {
 
     @Operation(
         summary = "개인 일정 생성",
-        description = "사용자의 개인 일정을 생성합니다.\n\n예: `/api/users/{userId}/calendar`"
+        description = "사용자의 개인 일정을 생성하고, 생성된 개인 일정 ID를 반환합니다. \n\n예: `/api/users/{userId}/calendar`"
     )
     ApiResponse<Long> create(
         @Parameter(name = "userId", description = "사용자 ID", required = true, in = ParameterIn.PATH)

src/main/java/grep/neogul_coder/domain/calender/controller/TeamCalendarController.java

@@ -28,8 +28,8 @@ public ApiResponse<Long> create(
         @PathVariable("studyId") Long studyId,
         @Valid @RequestBody TeamCalendarRequest request
     ) {
-        Long calendarId = teamCalendarService.create(studyId, userId, request);
-        return ApiResponse.success(calendarId);  // 생성된 일정 ID 반환
+        Long teamCalendarId = teamCalendarService.create(studyId, userId, request);
+        return ApiResponse.success(teamCalendarId);  // 생성된 일정 ID 반환
     }
 
     // 전체 일정 조회 API

src/main/java/grep/neogul_coder/domain/calender/controller/TeamCalendarSpecification.java

@@ -45,7 +45,7 @@ ApiResponse<List<TeamCalendarResponse>> findByDate(
 
     @Operation(
         summary = "팀 일정 생성",
-        description = "특정 팀 ID에 새로운 일정을 생성합니다.\n\n" +
+        description = "팀 일정을 생성하고 생성된 팀 일정 ID를 반환합니다.\n\n" +
             "예: `/api/teams/{studyId}/calendar`"
     )
     ApiResponse<Long> create(

src/main/java/grep/neogul_coder/domain/calender/service/PersonalCalendarService.java

@@ -63,7 +63,7 @@ public Long create(Long userId, PersonalCalendarRequest request) {
         Calendar calendar = request.toCalendar();
         PersonalCalendar personalCalendar = new PersonalCalendar(userId, calendar);
         personalCalendarRepository.save(personalCalendar);
-        return calendar.getId();
+        return personalCalendar.getId();
     }
 
     // 개인 일정 수정

src/main/java/grep/neogul_coder/domain/calender/service/TeamCalendarService.java

@@ -66,7 +66,7 @@ public Long create(Long studyId, Long userId, TeamCalendarRequest request) {
         TeamCalendar teamCalendar = new TeamCalendar(studyId, userId, calendar);
         teamCalendarRepository.save(teamCalendar);
 
-        return calendar.getId();
+        return teamCalendar.getId();
     }
 
     @Transactional

src/main/java/grep/neogul_coder/domain/studypost/controller/StudyPostController.java

@@ -10,48 +10,60 @@
 import grep.neogul_coder.global.response.ApiResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
 
 @RequiredArgsConstructor
-@RequestMapping("/api/posts")
+@RequestMapping("/api/studies")
 @RestController
 public class StudyPostController implements StudyPostSpecification {
 
     private final StudyPostService studyPostService;
 
-    @PostMapping
-    public ApiResponse<Long> create(@RequestBody @Valid StudyPostSaveRequest request,
+    @PostMapping("/{study-id}/posts")
+    public ApiResponse<Long> create(@PathVariable("study-id") long studyId,
+                                    @RequestBody @Valid StudyPostSaveRequest request,
                                     @AuthenticationPrincipal Principal userDetails) {
-        long postId = studyPostService.create(request, userDetails.getUserId());
+        long postId = studyPostService.create(request, studyId, userDetails.getUserId());
         return ApiResponse.success(postId);
     }
 
-    @GetMapping("/{postId}")
-    public ApiResponse<StudyPostDetailResponse> findOne(@PathVariable("postId") Long postId) {
-        StudyPostDetailResponse response = studyPostService.findOne(postId);
-        return ApiResponse.success(response);
-    }
-
-    @PostMapping("/studies/{study-id}")
+    @PostMapping("/{study-id}/posts/search")
     public ApiResponse<PostPagingResult> findPagingInfo(@PathVariable("study-id") Long studyId,
                                                         @RequestBody @Valid StudyPostPagingCondition condition) {
         PostPagingResult response = studyPostService.findPagingInfo(condition, studyId);
         return ApiResponse.success(response);
     }
 
-    @PutMapping("/{postId}")
-    public ApiResponse<Void> update(@PathVariable("postId") Long postId,
+    @GetMapping("/posts/{post-id}")
+    public ApiResponse<StudyPostDetailResponse> findOne(@PathVariable("post-id") Long postId) {
+        StudyPostDetailResponse response = studyPostService.findOne(postId);
+        return ApiResponse.success(response);
+    }
+
+    @PutMapping("/posts/{post-id}")
+    public ApiResponse<Void> update(@PathVariable("post-id") Long postId,
                                     @RequestBody @Valid StudyPostUpdateRequest request,
                                     @AuthenticationPrincipal Principal userDetails) {
         studyPostService.update(request, postId, userDetails.getUserId());
         return ApiResponse.noContent();
     }
 
-    @DeleteMapping("/{postId}")
-    public ApiResponse<Void> delete(@PathVariable("postId") Long postId,
+    @DeleteMapping("/posts/{post-id}")
+    public ApiResponse<Void> delete(@PathVariable("post-id") Long postId,
                                     @AuthenticationPrincipal Principal userDetails) {
         studyPostService.delete(postId, userDetails.getUserId());
         return ApiResponse.noContent();
     }
+
+    @PostMapping(value = "/posts/images", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ApiResponse<String> uploadPostImage(@RequestPart("file") MultipartFile file,
+                                               @AuthenticationPrincipal Principal userDetail) throws IOException {
+        String imageUrl = studyPostService.uploadPostImage(file, userDetail.getUserId());
+        return ApiResponse.success(imageUrl);
+    }
 }

src/main/java/grep/neogul_coder/domain/studypost/controller/StudyPostSpecification.java

@@ -11,20 +11,23 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
 
 @Tag(name = "Study-Post", description = "스터디 게시판 API")
 public interface StudyPostSpecification {
 
     @Operation(summary = "게시글 생성", description = "스터디에 새로운 게시글을 작성합니다.")
-    ApiResponse<Long> create(StudyPostSaveRequest request, Principal userDetails);
+    ApiResponse<Long> create(long studyId, StudyPostSaveRequest request, Principal userDetails);
 
     @Operation(
             summary = "게시글 목록 페이징 조회",
             description = """
                     스터디의 게시글을 조건에 따라 페이징하여 조회합니다.
                     
                     ✅ 요청 예시:
-                    `GET /api/posts/studies/{study-id}
+                    `GET /api/studies/{study-id}/posts/search
                     
                     ✅ condition 설명:
                     - `page`: 조회할 페이지 번호 (0부터 시작)
@@ -75,46 +78,46 @@ ApiResponse<PostPagingResult> findPagingInfo(@Parameter(description = "스터디
     @Operation(
             summary = "게시글 상세 조회",
             description = """
-            특정 게시글의 상세 정보를 조회합니다.
-
-            ✅ 요청 예시:
-            `GET /api/posts/{post-id}`
-
-            ✅ 응답 예시:
-            ```json
-            {
-              "data": {
-                "postInfo": {
-                  "postId": 15,
-                  "title": "스터디에 참여해주세요",
-                  "category": "NOTICE",
-                  "content": "매주 월요일 정기모임 진행합니다.",
-                  "createdDate": "2025-07-21T15:32:00",
-                  "commentCount": 3
-                },
-                "comments": [
-                  {
-                    "userId": 3,
-                    "nickname": "너굴코더",
-                    "profileImageUrl": "https://cdn.example.com/profile.jpg",
-                    "id": 100,
-                    "content": "정말 좋은 정보 감사합니다!",
-                    "createdAt": "2025-07-10T14:45:00"
-                  },
-                  {
-                    "userId": 4,
-                    "nickname": "코딩곰",
-                    "profileImageUrl": "https://cdn.example.com/codingbear.png",
-                    "id": 101,
-                    "content": "참석하겠습니다!",
-                    "createdAt": "2025-07-10T15:12:00"
-                  }
-                ],
-                "commentCount": 3
-              }
-            }
-            ```
-            """
+                    특정 게시글의 상세 정보를 조회합니다.
+                    
+                    ✅ 요청 예시:
+                    `GET /api/studies/posts/{post-id}`
+                    
+                    ✅ 응답 예시:
+                    ```json
+                    {
+                      "data": {
+                        "postInfo": {
+                          "postId": 15,
+                          "title": "스터디에 참여해주세요",
+                          "category": "NOTICE",
+                          "content": "매주 월요일 정기모임 진행합니다.",
+                          "createdDate": "2025-07-21T15:32:00",
+                          "commentCount": 3
+                        },
+                        "comments": [
+                          {
+                            "userId": 3,
+                            "nickname": "너굴코더",
+                            "profileImageUrl": "https://cdn.example.com/profile.jpg",
+                            "id": 100,
+                            "content": "정말 좋은 정보 감사합니다!",
+                            "createdAt": "2025-07-10T14:45:00"
+                          },
+                          {
+                            "userId": 4,
+                            "nickname": "코딩곰",
+                            "profileImageUrl": "https://cdn.example.com/codingbear.png",
+                            "id": 101,
+                            "content": "참석하겠습니다!",
+                            "createdAt": "2025-07-10T15:12:00"
+                          }
+                        ],
+                        "commentCount": 3
+                      }
+                    }
+                    ```
+                    """
     )
     ApiResponse<StudyPostDetailResponse> findOne(
             @Parameter(description = "게시글 ID", example = "15") Long postId
@@ -130,4 +133,7 @@ ApiResponse<Void> update(
     @Operation(summary = "게시글 삭제", description = "특정 게시글을 삭제합니다.")
     ApiResponse<Void> delete(@Parameter(description = "게시글 ID", example = "15") Long postId,
                              @AuthenticationPrincipal Principal userDetails);
+
+    @Operation(summary = "스터디 게시글 이미지 등록", description = "게시글에 이미지를 등록 합니다.")
+    ApiResponse<String> uploadPostImage(MultipartFile file, Principal userDetails) throws IOException;
 }

src/main/java/grep/neogul_coder/domain/studypost/controller/dto/request/StudyPostSaveRequest.java

@@ -5,18 +5,13 @@
 import grep.neogul_coder.domain.studypost.StudyPost;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 
 @Getter
 @Schema(description = "스터디 게시글 저장 요청 DTO")
 public class StudyPostSaveRequest {
 
-    @Schema(description = "3", example = "스터디 ID")
-    @NotNull
-    private long studyId;
-
     @Schema(description = "제목", example = "스터디 공지")
     @NotBlank
     private String title;
@@ -33,8 +28,7 @@ private StudyPostSaveRequest() {
     }
 
     @Builder
-    private StudyPostSaveRequest(long studyId, String title, Category category, String content) {
-        this.studyId = studyId;
+    private StudyPostSaveRequest(String title, Category category, String content) {
         this.title = title;
         this.category = category;
         this.content = content;

src/main/java/grep/neogul_coder/domain/studypost/repository/StudyPostQueryRepository.java

@@ -159,7 +159,7 @@ private OrderSpecifier<?> resolveOrderSpecifier(String attributeName, String dir
     }
 
     private BooleanBuilder likeContent(String content) {
-        return nullSafeBuilder(() -> studyPost.content.contains(content));
+        return nullSafeBuilder(() -> studyPost.content.contains(content).or(studyPost.title.contains(content)));
     }
 
     private BooleanBuilder equalsCategory(Category category) {