메인 머지(10/10) Merge pull request #183

sso0om · web-flow · commit a840e30aec3e · 2025-10-10T11:15:36.000+09:00
메인 머지(10/10) - CORS 설정 포함
diff --git a/back/src/main/java/com/back/domain/mentoring/mentoring/service/MentoringStorage.java b/back/src/main/java/com/back/domain/mentoring/mentoring/service/MentoringStorage.java
@@ -63,21 +63,10 @@ public boolean hasReservationsForMentoring(Long mentoringId) {
         return reservationRepository.existsByMentoringId(mentoringId);
     }
 
-    public boolean hasMentorSlotsForMentor(Long mentorId) {
-        return mentorSlotRepository.existsByMentorId(mentorId);
-    }
-
     public boolean hasReservationForMentorSlot(Long slotId) {
         return reservationRepository.existsByMentorSlotId(slotId);
     }
 
-
-    // ===== 데이터 조작 메서드 =====
-
-    public void deleteMentorSlotsData(Long mentorId) {
-        mentorSlotRepository.deleteAllByMentorId(mentorId);
-    }
-
     public MentoringSession getMentoringSessionBySessionUuid(String mentoringSessionId) {
         return mentoringSessionRepository.findBySessionUrl(mentoringSessionId)
             .orElseThrow(() -> new ServiceException("404", "세션을 찾을 수 없습니다."));
diff --git a/back/src/main/java/com/back/domain/mentoring/reservation/dto/ReservationDto.java b/back/src/main/java/com/back/domain/mentoring/reservation/dto/ReservationDto.java
@@ -2,7 +2,6 @@
 
 import com.back.domain.mentoring.reservation.constant.ReservationStatus;
 import com.back.domain.mentoring.reservation.entity.Reservation;
-import com.back.domain.mentoring.session.entity.MentoringSession;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.time.LocalDateTime;
@@ -23,20 +22,17 @@ public record ReservationDto(
     @Schema(description = "시작 일시")
     LocalDateTime startDateTime,
     @Schema(description = "종료 일시")
-    LocalDateTime endDateTime,
-    @Schema(description = "멘토링 세션 ID")
-    Long mentoringSessionId
+    LocalDateTime endDateTime
 ) {
-    public static ReservationDto from(Reservation reservation, MentoringSession mentoringSession) {
+    public static ReservationDto from(Reservation reservation) {
         return new ReservationDto(
             reservation.getId(),
             reservation.getStatus(),
             reservation.getMentoring().getId(),
             reservation.getMentoring().getTitle(),
             reservation.getMentorSlot().getId(),
             reservation.getMentorSlot().getStartDateTime(),
-            reservation.getMentorSlot().getEndDateTime(),
-            mentoringSession != null ? mentoringSession.getId() : null
+            reservation.getMentorSlot().getEndDateTime()
         );
     }
 }
diff --git a/back/src/main/java/com/back/domain/mentoring/reservation/entity/Reservation.java b/back/src/main/java/com/back/domain/mentoring/reservation/entity/Reservation.java
@@ -7,6 +7,7 @@
 import com.back.domain.mentoring.reservation.constant.ReservationStatus;
 import com.back.domain.mentoring.reservation.error.ReservationErrorCode;
 import com.back.domain.mentoring.slot.entity.MentorSlot;
+import com.back.global.app.AppConfig;
 import com.back.global.exception.ServiceException;
 import com.back.global.jpa.BaseEntity;
 import jakarta.persistence.*;
@@ -132,6 +133,10 @@ private void ensureCanComplete() {
         if(!this.status.canComplete()) {
             throw new ServiceException(ReservationErrorCode.CANNOT_COMPLETE);
         }
+        // 개발·테스트 환경에서는 검증 스킵 (Swagger 테스트 허용)
+        if (AppConfig.isDev() || AppConfig.isTest()) {
+            return;
+        }
         // 시작 이후 완료 가능 (조기 종료 허용)
         if (!mentorSlot.isPast()) {
             throw new ServiceException(ReservationErrorCode.MENTORING_NOT_STARTED);
diff --git a/back/src/main/java/com/back/domain/mentoring/reservation/service/ReservationService.java b/back/src/main/java/com/back/domain/mentoring/reservation/service/ReservationService.java
@@ -48,10 +48,7 @@ public Page<ReservationDto> getReservations(Member member, int page, int size) {
         } else {
             reservations = reservationRepository.findAllByMenteeMember(member, pageable);
         }
-        return reservations.map(r -> {
-            MentoringSession mentoringSession = mentoringSessionService.getMentoringSessionByReservation(r);
-            return ReservationDto.from(r, mentoringSession);
-        });
+        return reservations.map(ReservationDto::from);
     }
 
     @Transactional(readOnly = true)
@@ -66,28 +63,24 @@ public ReservationResponse getReservation(Member member, Long reservationId) {
 
     @Transactional
     public ReservationResponse createReservation(Mentee mentee, ReservationRequest reqDto) {
-        try {
-            Mentoring mentoring = mentoringStorage.findMentoring(reqDto.mentoringId());
-            MentorSlot mentorSlot = mentoringStorage.findMentorSlot(reqDto.mentorSlotId());
+        Mentoring mentoring = mentoringStorage.findMentoring(reqDto.mentoringId());
+        MentorSlot mentorSlot = mentoringStorage.findMentorSlot(reqDto.mentorSlotId());
 
-            DateTimeValidator.validateStartTimeNotInPast(mentorSlot.getStartDateTime());
-            validateMentorSlotStatus(mentorSlot, mentee);
-            validateOverlappingTimeForMentee(mentee, mentorSlot);
+        DateTimeValidator.validateStartTimeNotInPast(mentorSlot.getStartDateTime());
+        validateMentorSlotStatus(mentorSlot, mentee);
+        validateOverlappingTimeForMentee(mentee, mentorSlot);
 
-            Reservation reservation = Reservation.builder()
-                .mentoring(mentoring)
-                .mentee(mentee)
-                .mentorSlot(mentorSlot)
-                .preQuestion(reqDto.preQuestion())
-                .build();
-            reservationRepository.save(reservation);
+        Reservation reservation = Reservation.builder()
+            .mentoring(mentoring)
+            .mentee(mentee)
+            .mentorSlot(mentorSlot)
+            .preQuestion(reqDto.preQuestion())
+            .build();
+        reservationRepository.save(reservation);
 
-            mentorSlot.updateStatus(MentorSlotStatus.PENDING);
+        mentorSlot.updateStatus(MentorSlotStatus.PENDING);
 
-            return ReservationResponse.from(reservation);
-        } catch (OptimisticLockException e) {
-            throw new ServiceException(ReservationErrorCode.CONCURRENT_RESERVATION_CONFLICT);
-        }
+        return ReservationResponse.from(reservation);
     }
 
     @Transactional
@@ -98,10 +91,9 @@ public ReservationResponse approveReservation(Mentor mentor, Long reservationId)
             reservation.approve(mentor);
             reservation.getMentorSlot().updateStatus(MentorSlotStatus.APPROVED);
 
-            // 예약이 승인되면 세션을 생성한다.
             MentoringSession mentoringSession = mentoringSessionService.create(reservation);
 
-            return ReservationResponse.from(reservation);
+            return ReservationResponse.from(reservation, mentoringSession);
         } catch (OptimisticLockException e) {
             throw new ServiceException(ReservationErrorCode.CONCURRENT_APPROVAL_CONFLICT);
         }
diff --git a/back/src/main/java/com/back/domain/mentoring/session/controller/MentoringSessionController.java b/back/src/main/java/com/back/domain/mentoring/session/controller/MentoringSessionController.java
@@ -5,45 +5,47 @@
 import com.back.domain.mentoring.session.service.MentoringSessionManager;
 import com.back.global.rq.Rq;
 import com.back.global.rsData.RsData;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/sessions")
+@Tag(name = "MentoringSessionController", description = "멘토링 세션 API - 화상 채팅으로 멘토링 진행")
 public class MentoringSessionController {
     private final MentoringSessionManager mentoringSessionManager;
     private final Rq rq;
 
-    //세션참여 URL발급
     @GetMapping("/{sessionId}/url")
+    @Operation(summary = "세션참여 URL 발급", description = "세션 참여를 위한 URL을 발급합니다.")
     public RsData<GetSessionUrlResponse> getSessionUrl(@PathVariable Long sessionId) {
         GetSessionUrlResponse response = mentoringSessionManager.getSessionUrl(sessionId);
         return new RsData<>("200", "요청완료", response);
     }
 
-    //세션 상세 정보(참여 현황?, 제목 등등?)
     @GetMapping("/{sessionId}")
+    @Operation(summary = "세션 상세 정보", description = "세션 제목, 멘토, 멘티, 메시지 목록 등 세션의 상세 정보를 조회합니다.")
     public RsData<GetSessionInfoResponse> getSessionDetail(@PathVariable Long sessionId) {
         GetSessionInfoResponse response = mentoringSessionManager.getSessionDetail(sessionId);
         return new RsData<>("200", "요청완료", response);
     }
 
-    //세션 열기
     @PutMapping("/{sessionId}")
     @PreAuthorize("hasRole('MENTOR')")
+    @Operation(summary = "세션 열기", description = "세션을 열어 멘토링을 진행합니다.")
     public RsData<OpenSessionResponse> openSession(@PathVariable Long sessionId) {
         Member member = rq.getActor();
         OpenSessionRequest openSessionRequest = new OpenSessionRequest(sessionId);
         OpenSessionResponse response = mentoringSessionManager.openSession(member, openSessionRequest);
         return new RsData<>("200", "세션 오픈 완료", response);
     }
 
-    //세션종료
     @DeleteMapping("/{sessionId}")
     @PreAuthorize("hasRole('MENTOR')")
+    @Operation(summary = "세션 종료", description = "세션을 닫아 멘토링을 종료합니다.")
     public RsData<CloseSessionResponse> closeSession(@PathVariable Long sessionId) {
         Member member = rq.getActor();
         DeleteSessionRequest deleteSessionRequest = new DeleteSessionRequest(sessionId);
diff --git a/back/src/main/java/com/back/domain/mentoring/session/dto/ChatMessageRequest.java b/back/src/main/java/com/back/domain/mentoring/session/dto/ChatMessageRequest.java
@@ -1,10 +1,12 @@
 package com.back.domain.mentoring.session.dto;
 
 import com.back.domain.mentoring.session.entity.MessageType;
-import com.back.domain.mentoring.session.entity.SenderRole;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 public record ChatMessageRequest(
+        @Schema(description = "메시지 타입", example = "TEXT")
         MessageType type,
+        @Schema(description = "메시지 내용", example = "msg")
         String content
 ) {
 }
diff --git a/back/src/main/java/com/back/domain/mentoring/session/dto/ChatMessageResponse.java b/back/src/main/java/com/back/domain/mentoring/session/dto/ChatMessageResponse.java
@@ -1,10 +1,15 @@
 package com.back.domain.mentoring.session.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 import java.time.LocalDateTime;
 
 public record ChatMessageResponse(
+        @Schema(description = "작성자명")
         String senderName,
+        @Schema(description = "메시지 내용")
         String content,
+        @Schema(description = "작성일시")
         LocalDateTime createdAt
 ) {
 }
diff --git a/back/src/main/java/com/back/domain/mentoring/session/dto/CloseSessionResponse.java b/back/src/main/java/com/back/domain/mentoring/session/dto/CloseSessionResponse.java
@@ -1,8 +1,13 @@
 package com.back.domain.mentoring.session.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public record CloseSessionResponse(
+        @Schema(description = "세션 URL")
         String sessionUrl,
+        @Schema(description = "멘토링 제목")
         String mentoringTitle,
+        @Schema(description = "세션 상태")
         String status
 ) {
 }
diff --git a/back/src/main/java/com/back/domain/mentoring/session/dto/DeleteSessionRequest.java b/back/src/main/java/com/back/domain/mentoring/session/dto/DeleteSessionRequest.java
@@ -1,6 +1,9 @@
 package com.back.domain.mentoring.session.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public record DeleteSessionRequest(
+        @Schema(description = "세션 ID")
         Long sessionId
 ) {
 }
diff --git a/back/src/main/java/com/back/domain/mentoring/session/dto/GetSessionInfoResponse.java b/back/src/main/java/com/back/domain/mentoring/session/dto/GetSessionInfoResponse.java
@@ -1,9 +1,15 @@
 package com.back.domain.mentoring.session.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public record GetSessionInfoResponse(
+        @Schema(description = "멘토링 제목")
         String mentoringTitle,
+        @Schema(description = "멘토 이름")
         String mentorName,
+        @Schema(description = "멘티 이름")
         String menteeName,
+        @Schema(description = "세션 상태")
         String sessionStatus
 ) {
 }
diff --git a/back/src/main/java/com/back/domain/mentoring/session/dto/GetSessionUrlResponse.java b/back/src/main/java/com/back/domain/mentoring/session/dto/GetSessionUrlResponse.java
@@ -1,6 +1,9 @@
 package com.back.domain.mentoring.session.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public record GetSessionUrlResponse(
+        @Schema(description = "세션 URL")
         String sessionUrl
 ) {
 }
diff --git a/back/src/main/java/com/back/domain/mentoring/session/dto/OpenSessionRequest.java b/back/src/main/java/com/back/domain/mentoring/session/dto/OpenSessionRequest.java
@@ -1,6 +1,9 @@
 package com.back.domain.mentoring.session.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public record OpenSessionRequest(
+        @Schema(description = "세션 ID")
         Long sessionId
 ) {
 }
diff --git a/back/src/main/java/com/back/domain/mentoring/session/dto/OpenSessionResponse.java b/back/src/main/java/com/back/domain/mentoring/session/dto/OpenSessionResponse.java
@@ -1,8 +1,13 @@
 package com.back.domain.mentoring.session.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public record OpenSessionResponse(
+        @Schema(description = "세션 URL")
         String sessionUrl,
+        @Schema(description = "멘토링 제목")
         String mentoringTitle,
+        @Schema(description = "세션 상태")
         String status
 ) {
 }
diff --git a/back/src/main/java/com/back/domain/mentoring/session/service/MentoringSessionManager.java b/back/src/main/java/com/back/domain/mentoring/session/service/MentoringSessionManager.java
@@ -7,6 +7,8 @@
 import com.back.domain.mentoring.reservation.entity.Reservation;
 import com.back.domain.mentoring.session.dto.*;
 import com.back.domain.mentoring.session.entity.MentoringSession;
+import com.back.domain.mentoring.slot.constant.MentorSlotStatus;
+import com.back.domain.mentoring.slot.entity.MentorSlot;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +51,11 @@ public CloseSessionResponse closeSession(Member requestUser, DeleteSessionReques
         Mentor mentor = memberStorage.findMentorByMember(requestUser);
         MentoringSession session = mentoringSessionService.getMentoringSession(deleteRequest.sessionId());
         MentoringSession closedSession = mentoringSessionService.save(session.closeSession(mentor));
+
+        Reservation reservation = closedSession.getReservation();
+        reservation.complete();
+        MentorSlot slot = reservation.getMentorSlot();
+        slot.updateStatus(MentorSlotStatus.COMPLETED);
         return new CloseSessionResponse(closedSession.getSessionUrl(), closedSession.getMentoring().getTitle(), closedSession.getStatus().toString());
     }
 }
diff --git a/back/src/main/java/com/back/domain/post/comment/controller/PostCommentController.java b/back/src/main/java/com/back/domain/post/comment/controller/PostCommentController.java
@@ -28,7 +28,7 @@ public class PostCommentController {
     private final Rq rq;
     private final PostCommentService postCommentService;
 
-    @Operation(summary = "댓글 생성")
+    @Operation(summary = "댓글 생성", description = "comment는 공백이나 Null이 될 수 없습니다. comment의 글자 수 제한은 없습니다.")
     @PostMapping("/post/{post_id}")
     public RsData<Void> createComment(@PathVariable Long post_id,
                                       @Valid @RequestBody CommentCreateRequest commentCreateRequest
@@ -41,24 +41,23 @@ public RsData<Void> createComment(@PathVariable Long post_id,
 
     @Operation(summary = "댓글 다건 조회")
     @GetMapping("/post/{post_id}")
-    @Transactional(readOnly = true)
     public RsData<List<CommentAllResponse>> getAllPostComment(@PathVariable Long post_id) {
         List<CommentAllResponse> postAllResponse = postCommentService.getAllPostCommentResponse(post_id);
-        return new RsData<>("200", "게시글 다건 조회 성공", postAllResponse);
+        return new RsData<>("200", "댓글 조회 성공", postAllResponse);
     }
 
-    @Operation(summary = "댓글 삭제")
+    @Operation(summary = "댓글 삭제", description = "commentId는 공백이나 Null이 될 수 없습니다.")
     @DeleteMapping("/post/{post_id}/comment")
     public RsData<Void> removePostComment(@PathVariable @Positive Long post_id
             , @RequestBody @Valid CommentDeleteRequest commentDeleteRequest) {
         Member member = rq.getActor();
 
         postCommentService.removePostComment(post_id, commentDeleteRequest, member);
 
-        return new RsData<>("200", "게시글 삭제 성공", null);
+        return new RsData<>("200", "댓글 삭제 성공", null);
     }
 
-    @Operation(summary = "댓글 수정")
+    @Operation(summary = "댓글 수정", description = "commentId, content는 공백이나 Null이 될 수 없습니다. content의 글자 수 제한은 없습니다. ")
     @PutMapping("/post/{post_id}/comment/")
     public RsData<Void> updatePostComment(@PathVariable Long post_id
             , @Valid @RequestBody CommentModifyRequest commentModifyRequest) {
diff --git a/back/src/main/java/com/back/domain/post/comment/dto/CommentCreateRequest.java b/back/src/main/java/com/back/domain/post/comment/dto/CommentCreateRequest.java
@@ -4,8 +4,6 @@
 
 
 public record CommentCreateRequest(
-        String role,
-
         @NotBlank(message = "댓글을 입력해주세요")
         String comment
 ) {
diff --git a/back/src/main/java/com/back/domain/post/comment/service/PostCommentService.java b/back/src/main/java/com/back/domain/post/comment/service/PostCommentService.java
@@ -27,6 +27,10 @@ public class PostCommentService {
     public void createComment(Member member, Long postId, CommentCreateRequest commentCreateRequest) {
         Post post = postRepository.findById(postId).orElseThrow(() -> new ServiceException("400", "해당 Id의 게시글이 없습니다."));
 
+        if ( commentCreateRequest.comment() == null || commentCreateRequest.comment().isEmpty()) {
+            throw new ServiceException("400", "댓글은 비어 있을 수 없습니다.");
+        }
+
         PostComment postComment = PostComment.builder()
                 .post(post)
                 .content(commentCreateRequest.comment())
diff --git a/back/src/main/java/com/back/global/security/SecurityConfig.java b/back/src/main/java/com/back/global/security/SecurityConfig.java
@@ -51,7 +51,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
     public UrlBasedCorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
 
-        configuration.setAllowedOrigins(List.of("http://localhost:3000"));
+        configuration.setAllowedOrigins(List.of("http://localhost:3000", "https://jbmate.vercel.app"));
         configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
 
         configuration.setAllowCredentials(true);
diff --git a/back/src/main/resources/application-prod.yml b/back/src/main/resources/application-prod.yml
@@ -34,7 +34,7 @@ logging:
 custom:
   site:
     cookieDomain: "api.jobmate.info"  # 도메인으로 변경
-    frontUrl: "http://localhost:3000"  # 프론트엔드 도메인으로 변경
+    frontUrl: "https://jbmate.vercel.app"  # 프론트엔드 도메인으로 변경
     backUrl: "https://api.jobmate.info"  # HTTPS로 변경
   cookie:
     httpOnly: true
diff --git a/back/src/test/java/com/back/domain/mentoring/reservation/service/ReservationServiceTest.java b/back/src/test/java/com/back/domain/mentoring/reservation/service/ReservationServiceTest.java
diff --git a/back/src/test/java/com/back/domain/post/comment/PostCommentControllerTest.java b/back/src/test/java/com/back/domain/post/comment/PostCommentControllerTest.java
diff --git a/back/src/test/java/com/back/domain/post/comment/service/PostCommentServiceTest.java b/back/src/test/java/com/back/domain/post/comment/service/PostCommentServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`package com.back.domain.mentoring.session.dto;`
`2`	`2`
	`3`	`+import io.swagger.v3.oas.annotations.media.Schema;`
	`4`	`+`
`3`	`5`	`public record DeleteSessionRequest(`
	`6`	`+ @Schema(description = "세션 ID")`
`4`	`7`	`Long sessionId`
`5`	`8`	`) {`
`6`	`9`	`}`