[EA3-68] chore: develop → main 브랜치 머지

src/main/java/grep/neogulcoder/domain/recruitment/post/controller/RecruitmentPostController.java

@@ -2,7 +2,6 @@
 
 import grep.neogulcoder.domain.recruitment.post.controller.dto.request.RecruitmentPostStatusUpdateRequest;
 import grep.neogulcoder.domain.recruitment.post.controller.dto.request.RecruitmentPostUpdateRequest;
-import grep.neogulcoder.domain.recruitment.post.controller.dto.response.RecruitmentApplicationPagingInfo;
 import grep.neogulcoder.domain.recruitment.post.controller.dto.response.RecruitmentPostInfo;
 import grep.neogulcoder.domain.recruitment.post.controller.dto.response.RecruitmentPostPagingInfo;
 import grep.neogulcoder.domain.recruitment.post.service.RecruitmentPostService;
@@ -76,11 +75,4 @@ public ApiResponse<Long> changeStatus(@PathVariable("recruitment-post-id") long
         long postId = recruitmentPostService.updateStatus(request.toServiceRequest(), recruitmentPostId, userDetails.getUserId());
         return ApiResponse.success(postId);
     }
-
-    @GetMapping("{recruitment-post-id}/applications")
-    public ApiResponse<RecruitmentApplicationPagingInfo> getApplications(@PageableDefault(size = 5) Pageable pageable,
-                                                                         @PathVariable("recruitment-post-id") long recruitmentPostId) {
-        return ApiResponse.success(new RecruitmentApplicationPagingInfo());
-    }
-
 }

src/main/java/grep/neogulcoder/domain/recruitment/post/controller/RecruitmentPostSpecification.java

@@ -2,7 +2,6 @@
 
 import grep.neogulcoder.domain.recruitment.post.controller.dto.request.RecruitmentPostStatusUpdateRequest;
 import grep.neogulcoder.domain.recruitment.post.controller.dto.request.RecruitmentPostUpdateRequest;
-import grep.neogulcoder.domain.recruitment.post.controller.dto.response.RecruitmentApplicationPagingInfo;
 import grep.neogulcoder.domain.recruitment.post.controller.dto.response.RecruitmentPostInfo;
 import grep.neogulcoder.domain.recruitment.post.controller.dto.response.RecruitmentPostPagingInfo;
 import grep.neogulcoder.domain.study.enums.Category;
@@ -144,32 +143,4 @@ ApiResponse<RecruitmentPostPagingInfo> getMyPostPagingInfo(Pageable pageable, Ca
                     """
     )
     ApiResponse<RecruitmentPostPagingInfo> getPagingInfo(Pageable pageable, Category category, StudyType studyType, String keyword);
-
-    @Operation(
-            summary = "스터디 신청한 회원 목록 페이징 조회",
-            description = """
-                    특정 모집글에 신청한 회원 목록을 페이징하여 조회합니다.
-
-                    ✅ 요청 형식:
-                    `GET /recruitment-posts/{id}/applications?page=0&size=5`
-
-                    ✅ 응답 예시:
-                    ```json
-                    {
-                      "applicationInfos": [
-                        {
-                          "nickname": "테스터",
-                          "buddyEnergy": 30,
-                          "createdDate": "2025-07-13T15:30:00",
-                          "applicationReason": "자바를 더 공부 하고싶어요!"
-                        }
-                      ],
-                      "totalPage": 3,
-                      "totalElementCount": 20
-                    }
-                    ```                
-                    """
-    )
-    ApiResponse<RecruitmentApplicationPagingInfo> getApplications(Pageable pageable, long recruitmentPostId);
-
 }

src/main/java/grep/neogulcoder/domain/study/controller/StudyController.java

@@ -46,7 +46,7 @@ public ApiResponse<StudyHeaderResponse> getStudyHeader(@PathVariable("studyId")
 
     @GetMapping("/{studyId}")
     public ApiResponse<StudyResponse> getStudy(@PathVariable("studyId") Long studyId) {
-        return ApiResponse.success(new StudyResponse());
+        return ApiResponse.success(studyService.getStudy(studyId));
     }
 
     @GetMapping("/me/images")
@@ -77,7 +77,7 @@ public ApiResponse<Long> createStudy(@RequestPart("request") @Valid StudyCreateR
         return ApiResponse.success(id);
     }
 
-    @PutMapping("/{studyId}")
+    @PutMapping(value = "/{studyId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ApiResponse<Void> updateStudy(@PathVariable("studyId") Long studyId,
                                          @RequestPart @Valid StudyUpdateRequest request,
                                          @RequestPart(value = "image", required = false) MultipartFile image,

src/main/java/grep/neogulcoder/domain/study/controller/dto/request/StudyCreateRequest.java

@@ -35,7 +35,7 @@ public class StudyCreateRequest {
     private String location;
 
     @NotNull
-    @Schema(description = "시작일", example = "2025-07-15")
+    @Schema(description = "시작일", example = "2025-07-25T10:00:00")
     private LocalDateTime startDate;
 
     @NotNull
@@ -45,14 +45,11 @@ public class StudyCreateRequest {
     @Schema(description = "스터디 소개", example = "자바 스터디입니다.")
     private String introduction;
 
-    @Schema(description = "대표 이미지", example = "http://localhost:8083/image.jpg")
-    private String imageUrl;
-
     private StudyCreateRequest() {}
 
     @Builder
     private StudyCreateRequest(String name, Category category, int capacity, StudyType studyType, String location,
-                               LocalDateTime startDate, LocalDateTime endDate, String introduction, String imageUrl) {
+                               LocalDateTime startDate, LocalDateTime endDate, String introduction) {
         this.name = name;
         this.category = category;
         this.capacity = capacity;
@@ -61,20 +58,19 @@ private StudyCreateRequest(String name, Category category, int capacity, StudyTy
         this.startDate = startDate;
         this.endDate = endDate;
         this.introduction = introduction;
-        this.imageUrl = imageUrl;
     }
 
     public Study toEntity(String imageUrl) {
         return Study.builder()
-                .name(this.name)
-                .category(this.category)
-                .capacity(this.capacity)
-                .studyType(this.studyType)
-                .location(this.location)
-                .startDate(this.startDate)
-                .endDate(this.endDate)
-                .introduction(this.introduction)
-                .imageUrl(imageUrl)
-                .build();
+            .name(this.name)
+            .category(this.category)
+            .capacity(this.capacity)
+            .studyType(this.studyType)
+            .location(this.location)
+            .startDate(this.startDate)
+            .endDate(this.endDate)
+            .introduction(this.introduction)
+            .imageUrl(imageUrl)
+            .build();
     }
 }

src/main/java/grep/neogulcoder/domain/study/controller/dto/request/StudyUpdateRequest.java

@@ -38,22 +38,18 @@ public class StudyUpdateRequest {
     @Schema(description = "스터디 소개", example = "자바 스터디입니다.")
     private String introduction;
 
-    @Schema(description = "대표 이미지", example = "http://localhost:8083/image.jpg")
-    private String imageUrl;
-
     private StudyUpdateRequest() {}
 
     @Builder
-    private StudyUpdateRequest(String name, Category category, int capacity, StudyType studyType, String location,
-                               LocalDateTime startDate, String introduction, String imageUrl) {
+    private StudyUpdateRequest(String name, Category category, int capacity, StudyType studyType,
+                               String location, LocalDateTime startDate, String introduction) {
         this.name = name;
         this.category = category;
         this.capacity = capacity;
         this.studyType = studyType;
         this.location = location;
         this.startDate = startDate;
         this.introduction = introduction;
-        this.imageUrl = imageUrl;
     }
 
     public Study toEntity(String imageUrl) {

src/main/java/grep/neogulcoder/domain/study/controller/dto/response/StudyResponse.java

@@ -1,9 +1,11 @@
 package grep.neogulcoder.domain.study.controller.dto.response;
 
-import grep.neogulcoder.domain.attendance.controller.dto.response.AttendanceResponse;
 import grep.neogulcoder.domain.calender.controller.dto.response.TeamCalendarResponse;
-import grep.neogulcoder.domain.studypost.controller.dto.StudyPostListResponse;
+import grep.neogulcoder.domain.study.Study;
+import grep.neogulcoder.domain.studypost.controller.dto.response.FreePostInfo;
+import grep.neogulcoder.domain.studypost.controller.dto.response.NoticePostInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
 import lombok.Getter;
 
 import java.util.List;
@@ -26,15 +28,39 @@ public class StudyResponse {
     @Schema(description = "스터디 총 게시물 수", example = "10")
     private int totalPostCount;
 
-    @Schema(description = "출석 정보")
-    private List<AttendanceResponse> attendances;
+    @Schema(description = "팀 달력")
+    private List<TeamCalendarResponse> teamCalendars;
 
-    @Schema(description = "출석률", example = "60")
-    private int attendanceRate;
+    @Schema(description = "스터디 공지글 2개")
+    private List<NoticePostInfo> noticePosts;
 
-    @Schema(description = "팀 달력")
-    private List<TeamCalendarResponse> teamCalenders;
+    @Schema(description = "스터디 자유글 3개")
+    private List<FreePostInfo> freePosts;
+
+    @Builder
+    private StudyResponse(int progressDays, int totalDays, int capacity, int currentCount, int totalPostCount,
+                          List<TeamCalendarResponse> teamCalendars, List<NoticePostInfo> noticePosts, List<FreePostInfo> freePosts) {
+        this.progressDays = progressDays;
+        this.totalDays = totalDays;
+        this.capacity = capacity;
+        this.currentCount = currentCount;
+        this.totalPostCount = totalPostCount;
+        this.teamCalendars = teamCalendars;
+        this.noticePosts = noticePosts;
+        this.freePosts = freePosts;
+    }
 
-    @Schema(description = "게시글 리스트")
-    private List<StudyPostListResponse> studyPosts;
+    public static StudyResponse from(Study study, int progressDays, int totalDays, int totalPostCount,
+                                     List<TeamCalendarResponse> teamCalendars, List<NoticePostInfo> noticePosts, List<FreePostInfo> freePosts) {
+        return StudyResponse.builder()
+            .progressDays(progressDays)
+            .totalDays(totalDays)
+            .capacity(study.getCapacity())
+            .currentCount(study.getCurrentCount())
+            .totalPostCount(totalPostCount)
+            .teamCalendars(teamCalendars)
+            .noticePosts(noticePosts)
+            .freePosts(freePosts)
+            .build();
+    }
 }

src/main/java/grep/neogulcoder/domain/study/service/StudyService.java

@@ -1,5 +1,7 @@
 package grep.neogulcoder.domain.study.service;
 
+import grep.neogulcoder.domain.calender.controller.dto.response.TeamCalendarResponse;
+import grep.neogulcoder.domain.calender.service.TeamCalendarService;
 import grep.neogulcoder.domain.recruitment.post.repository.RecruitmentPostRepository;
 import grep.neogulcoder.domain.study.Study;
 import grep.neogulcoder.domain.study.StudyMember;
@@ -12,6 +14,10 @@
 import grep.neogulcoder.domain.study.repository.StudyMemberRepository;
 import grep.neogulcoder.domain.study.repository.StudyQueryRepository;
 import grep.neogulcoder.domain.study.repository.StudyRepository;
+import grep.neogulcoder.domain.studypost.controller.dto.response.FreePostInfo;
+import grep.neogulcoder.domain.studypost.controller.dto.response.NoticePostInfo;
+import grep.neogulcoder.domain.studypost.repository.StudyPostQueryRepository;
+import grep.neogulcoder.domain.studypost.repository.StudyPostRepository;
 import grep.neogulcoder.domain.users.entity.User;
 import grep.neogulcoder.domain.users.repository.UserRepository;
 import grep.neogulcoder.global.exception.business.BusinessException;
@@ -27,6 +33,8 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Optional;
 
@@ -46,6 +54,9 @@ public class StudyService {
     private final RecruitmentPostRepository recruitmentPostRepository;
     private final StudyMemberQueryRepository studyMemberQueryRepository;
     private final UserRepository userRepository;
+    private final StudyPostRepository studyPostRepository;
+    private final StudyPostQueryRepository studyPostQueryRepository;
+    private final TeamCalendarService teamCalendarService;
 
     public StudyItemPagingResponse getMyStudiesPaging(Pageable pageable, Long userId, Boolean finished) {
         Page<StudyItemResponse> page = studyQueryRepository.findMyStudiesPaging(pageable, userId, finished);
@@ -62,12 +73,30 @@ public List<StudyItemResponse> getMyStudies(Long userId) {
     }
 
     public StudyHeaderResponse getStudyHeader(Long studyId) {
-        Study study = studyRepository.findByIdAndActivatedTrue(studyId)
-                .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+        Study study = findValidStudy(studyId);
 
         return StudyHeaderResponse.from(study);
     }
 
+    public StudyResponse getStudy(Long studyId) {
+        Study study = findValidStudy(studyId);
+
+        int progressDays = (int) ChronoUnit.DAYS.between(study.getStartDate().toLocalDate(), LocalDate.now()) + 1;
+        int totalDays = (int) ChronoUnit.DAYS.between(study.getStartDate().toLocalDate(), study.getEndDate().toLocalDate()) + 1;
+        progressDays = Math.max(0, Math.min(progressDays, totalDays));
+        int totalPostCount = studyPostRepository.countByStudyIdAndActivatedTrue(studyId);
+
+        LocalDate now = LocalDate.now();
+        int currentYear = now.getYear();
+        int currentMonth = now.getMonthValue();
+        List<TeamCalendarResponse> teamCalendars = teamCalendarService.findByMonth(studyId, currentYear, currentMonth);
+
+        List<NoticePostInfo> noticePosts = studyPostQueryRepository.findLatestNoticeInfoBy(studyId);
+        List<FreePostInfo> freePosts = studyPostQueryRepository.findLatestFreeInfoBy(studyId);
+
+        return StudyResponse.from(study, progressDays, totalDays, totalPostCount, teamCalendars, noticePosts, freePosts);
+    }
+
     public List<StudyImageResponse> getStudyImages(Long userId) {
         List<Study> myStudiesImage = studyMemberRepository.findStudiesByUserId(userId);
 
@@ -77,8 +106,7 @@ public List<StudyImageResponse> getStudyImages(Long userId) {
     }
 
     public StudyInfoResponse getMyStudyContent(Long studyId, Long userId) {
-        Study study = studyRepository.findByIdAndActivatedTrue(studyId)
-                .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+        Study study = findValidStudy(studyId);
 
         validateStudyMember(studyId, userId);
         validateStudyLeader(studyId, userId);
@@ -118,8 +146,7 @@ public Long createStudy(StudyCreateRequest request, Long userId, MultipartFile i
 
     @Transactional
     public void updateStudy(Long studyId, StudyUpdateRequest request, Long userId, MultipartFile image) throws IOException {
-        Study study = studyRepository.findById(studyId)
-                .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+        Study study = findValidStudy(studyId);
 
         validateLocation(request.getStudyType(), request.getLocation());
         validateStudyMember(studyId, userId);
@@ -142,8 +169,7 @@ public void updateStudy(Long studyId, StudyUpdateRequest request, Long userId, M
 
     @Transactional
     public void deleteStudy(Long studyId, Long userId) {
-        Study study = studyRepository.findById(studyId)
-                .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+        Study study = findValidStudy(studyId);
 
         validateStudyMember(studyId, userId);
         validateStudyLeader(studyId, userId);
@@ -156,12 +182,16 @@ public void deleteStudy(Long studyId, Long userId) {
 
     @Transactional
     public void deleteStudyByAdmin(Long studyId) {
-        Study study = studyRepository.findById(studyId)
-                .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+        Study study = findValidStudy(studyId);
 
         study.delete();
     }
 
+    private Study findValidStudy(Long studyId) {
+        return studyRepository.findById(studyId)
+            .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+    }
+
     private static void validateLocation(StudyType studyType, String location) {
         if ((studyType == StudyType.OFFLINE || studyType == StudyType.HYBRID) && (location == null || location.isBlank())) {
             throw new BusinessException(STUDY_LOCATION_REQUIRED);