Develop

.github/workflows/deploy.yml

@@ -1,14 +1,16 @@
-name: Deploy to ECR and EC2
+name: CI/CD Pipeline
 
 on:
   push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
+    branches: [ main, develop ]
 
 jobs:
+
   deploy:
+    name: Deploy to EC2
     runs-on: ubuntu-latest
+    # develop 또는 main에 푸시될 때만 실행
+    if: github.event_name == 'push'
 
     steps:
       - name: Checkout code
@@ -43,17 +45,10 @@ jobs:
           username: ubuntu
           key: ${{ secrets.EC2_SSH_KEY }}
           script: |
-            # ECR 로그인
             aws ecr get-login-password --region ap-northeast-2 | docker login --username AWS --password-stdin ${{ steps.login-ecr.outputs.registry }}
-
-            # 최신 이미지 pull
             docker pull ${{ steps.login-ecr.outputs.registry }}/stitch-api:latest
-
-            # 기존 컨테이너 중지 및 제거
             docker stop stitch-api-container || true
             docker rm stitch-api-container || true
-
-            # 새 컨테이너 실행
             docker run -d \
               --name stitch-api-container \
               -p 8080:8080 \
@@ -72,8 +67,6 @@ jobs:
               -e SPRING_MAIL_PASSWORD="${{ secrets.SPRING_MAIL_PASSWORD }}" \
               -e UNIVCERT_API_KEY="${{ secrets.UNIVCERT_API_KEY }}" \
               ${{ steps.login-ecr.outputs.registry }}/stitch-api:latest
-
-            # 컨테이너 시작 확인
             sleep 10
             docker logs stitch-api-container --tail 20
 
@@ -84,9 +77,14 @@ jobs:
           username: ubuntu
           key: ${{ secrets.EC2_SSH_KEY }}
           script: |
-            # 컨테이너 상태 확인
             docker ps -f name=stitch-api-container
-
-            # 애플리케이션 시작 대기 및 로그 확인
             sleep 30
-            docker logs stitch-api-container --tail 10
+            docker logs stitch-api-container --tail 10
+            PUBLIC_IP=$(curl -s ifconfig.me)
+            echo "======================================"
+            echo "🚀 Deployment Completed!"
+            echo "======================================"
+            echo "Branch: ${{ github.ref_name }}"
+            echo "Swagger UI: http://${PUBLIC_IP}:8080/swagger-ui.html"
+            echo "Website: https://stitch-study.site"
+            echo "======================================"

stitch-api/src/main/java/se/sowl/stitchapi/campus/controller/CampusController.java

@@ -21,7 +21,7 @@ public class CampusController {
     private final CampusService campusService;
 
     @Operation(summary = "캠퍼스 목록 조회", description = "모든 캠퍼스의 목록을 조회합니다.")
-    @GetMapping("/list")
+    @GetMapping
     public CommonResponse<List<CampusListResponse>> getCampusList(){
         List<CampusListResponse> campusListResponse = campusService.getAllCampuses();
         return CommonResponse.ok(campusListResponse);

stitch-api/src/main/java/se/sowl/stitchapi/major/contoller/MajorController.java

@@ -2,16 +2,16 @@
 
 
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import se.sowl.stitchapi.common.CommonResponse;
-import se.sowl.stitchapi.major.dto.request.MajorRequest;
 import se.sowl.stitchapi.major.dto.response.MajorDetailResponse;
 import se.sowl.stitchapi.major.dto.response.MajorListResponse;
 import se.sowl.stitchapi.major.dto.response.MajorResponse;
 import se.sowl.stitchapi.major.service.MajorService;
+import se.sowl.stitchdomain.user.domain.CustomOAuth2User;
 
 import java.util.List;
 
@@ -24,25 +24,31 @@ public class MajorController {
     private final MajorService majorService;
 
     @Operation(summary = "전공 목록 조회")
-    @GetMapping("/list")
+    @GetMapping
     public CommonResponse<List<MajorListResponse>> getMajorList() {
         List<MajorListResponse> majorList = majorService.getAllMajors();
         return CommonResponse.ok(majorList);
     }
 
     @Operation(summary = "전공 상세 조회")
-    @GetMapping("/detail")
+    @GetMapping("/{majorId}")
     public CommonResponse<MajorDetailResponse> getMajorDetail(
-            @Parameter(description = "전공 ID", required = true)
-            @RequestParam("majorId") Long majorId) {
+            @PathVariable Long majorId
+    ) {
         MajorDetailResponse response = majorService.getMajorDetail(majorId);
         return CommonResponse.ok(response);
     }
 
     @Operation(summary = "전공 선택")
-    @PostMapping("/select")
-    public CommonResponse<MajorResponse> selectMajor(@RequestBody MajorRequest request) {
-        MajorResponse response = majorService.selectMajor(request);
+    @PutMapping("/{majorId}")
+    public CommonResponse<MajorResponse> selectMajor(
+            @PathVariable Long majorId,
+            @AuthenticationPrincipal CustomOAuth2User currentUser
+    ) {
+        MajorResponse response = majorService.selectMajor(
+                majorId,
+                currentUser.getUserId()
+        );
         return CommonResponse.ok(response);
     }
 }

stitch-api/src/main/java/se/sowl/stitchapi/major/service/MajorService.java

@@ -5,7 +5,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import se.sowl.stitchapi.exception.MajorException;
 import se.sowl.stitchapi.exception.UserException;
-import se.sowl.stitchapi.major.dto.request.MajorRequest;
 import se.sowl.stitchapi.major.dto.response.MajorDetailResponse;
 import se.sowl.stitchapi.major.dto.response.MajorListResponse;
 import se.sowl.stitchapi.major.dto.response.MajorResponse;
@@ -43,8 +42,8 @@ public MajorDetailResponse getMajorDetail(Long majorId){
 
 
     @Transactional
-    public MajorResponse selectMajor(MajorRequest request) {
-        User user = userRepository.findById(request.getUserId())
+    public MajorResponse selectMajor(Long majorId, Long userId) {
+        User user = userRepository.findById(userId)
                 .orElseThrow(UserException.UserNotFoundException::new);
 
         if (!user.isCampusCertified()) {
@@ -54,7 +53,7 @@ public MajorResponse selectMajor(MajorRequest request) {
         UserCamInfo userCamInfo = userCamInfoRepository.findByUser(user)
                 .orElseThrow(UserException.UserCamInfoNotFoundException::new);
 
-        Major newMajor = findMajorById(request.getMajorId());
+        Major newMajor = findMajorById(majorId);
 
 
         // 새 전공 설정

stitch-api/src/main/java/se/sowl/stitchapi/notification/controller/NotificationController.java

@@ -1,17 +1,22 @@
 package se.sowl.stitchapi.notification.controller;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import se.sowl.stitchapi.common.CommonResponse;
 import se.sowl.stitchapi.notification.dto.NotificationListResponse;
 import se.sowl.stitchapi.notification.dto.NotificationResponse;
 import se.sowl.stitchapi.notification.service.NotificationService;
+import se.sowl.stitchdomain.user.domain.CustomOAuth2User;
 
 import java.util.List;
 
 @RestController
 @RequestMapping("/api/notifications")
 @RequiredArgsConstructor
+@Tag(name = "Notification", description = "알림 관련 API")
 public class NotificationController {
 
     private final NotificationService notificationService;
@@ -21,11 +26,14 @@ public class NotificationController {
      * - 최신순으로 정렬된 알림 목록을 반환
      * - 읽음/안읽음 상태 포함
      */
-    @GetMapping("/list")
+    @Operation(summary = "사용자의 알림 목록 조회", description = "최신순으로 정렬된 알림 목록을 반환합니다.")
+    @GetMapping
     public CommonResponse<List<NotificationListResponse>> getUserNotifications(
-            @RequestParam("userCamInfoId") Long userCamInfoId
+            @AuthenticationPrincipal CustomOAuth2User currentUser
     ){
-        List<NotificationListResponse> responses = notificationService.getUserNotifications(userCamInfoId);
+        List<NotificationListResponse> responses = notificationService.getUserNotifications(
+                currentUser.getUserCamInfoId()
+        );
         return CommonResponse.ok(responses);
     }
 
@@ -34,11 +42,14 @@ public CommonResponse<List<NotificationListResponse>> getUserNotifications(
      * - 알림 뱃지 표시용
      * - 헤더나 네비게이션 바에서 활용
      */
+    @Operation(summary = "읽지 않은 알림 개수 조회", description = "알림 뱃지 표시용")
     @GetMapping("/unread-count")
     public CommonResponse<Integer> getUnreadNotificationCount(
-            @RequestParam("userCamInfoId") Long userCamInfoId
+            @AuthenticationPrincipal CustomOAuth2User currentUser
     ){
-        int count = notificationService.getUnreadNotificationCount(userCamInfoId);
+        int count = notificationService.getUnreadNotificationCount(
+                currentUser.getUserCamInfoId()
+        );
         return CommonResponse.ok(count);
     }
 
@@ -47,12 +58,16 @@ public CommonResponse<Integer> getUnreadNotificationCount(
      * - 알림 클릭 시 상세 정보 확인
      * - 권한 검증 포함 (본인 알림만 조회 가능)
      */
-    @GetMapping("/detail")
+    @Operation(summary = "특정 알림 상세 조회", description = "알림 클릭 시 상세 정보 확인 (본인 알림만 조회 가능)")
+    @GetMapping("/{notificationId}")
     public CommonResponse<NotificationResponse> getNotificationDetail(
-            @RequestParam("notificationId") Long notificationId,
-            @RequestParam("userCamInfoId") Long userCamInfoId
+            @PathVariable Long notificationId,
+            @AuthenticationPrincipal CustomOAuth2User currentUser
     ){
-        NotificationResponse response = notificationService.getNotificationDetail(notificationId, userCamInfoId);
+        NotificationResponse response = notificationService.getNotificationDetail(
+                notificationId,
+                currentUser.getUserCamInfoId()
+        );
         return CommonResponse.ok(response);
     }
 
@@ -61,12 +76,16 @@ public CommonResponse<NotificationResponse> getNotificationDetail(
      * - 특정 알림 하나를 읽음 상태로 변경
      * - 알림 클릭 시 자동으로 읽음 처리되도록 활용
      */
-    @PostMapping("/read")
+    @Operation(summary = "개별 알림 읽음 처리", description = "특정 알림 하나를 읽음 상태로 변경")
+    @PutMapping("/{notificationId}/read")
     public CommonResponse<NotificationResponse> markOneRead(
-            @RequestParam("notificationId") Long notificationId,
-            @RequestParam("userCamInfoId") Long userCamInfoId
+            @PathVariable Long notificationId,
+            @AuthenticationPrincipal CustomOAuth2User currentUser
     ){
-        NotificationResponse response = notificationService.markOneAsRead(notificationId, userCamInfoId);
+        NotificationResponse response = notificationService.markOneAsRead(
+                notificationId,
+                currentUser.getUserCamInfoId()
+        );
         return CommonResponse.ok(response);
     }
 
@@ -75,11 +94,12 @@ public CommonResponse<NotificationResponse> markOneRead(
      * - "모두 읽음" 버튼 기능
      * - 읽지 않은 모든 알림을 일괄 읽음 처리
      */
-    @PostMapping("/read/all")
+    @Operation(summary = "모든 알림 읽음 처리", description = "읽지 않은 모든 알림을 일괄 읽음 처리")
+    @PutMapping("/read-all")
     public CommonResponse<Void> markAllRead(
-            @RequestParam("userCamInfoId") Long userCamInfoId
+            @AuthenticationPrincipal CustomOAuth2User currentUser
     ){
-        notificationService.markAllAsRead(userCamInfoId);
+        notificationService.markAllAsRead(currentUser.getUserCamInfoId());
         return CommonResponse.ok(null);
     }
 
@@ -88,12 +108,16 @@ public CommonResponse<Void> markAllRead(
      * - 개별 알림을 완전히 삭제
      * - 알림 목록에서 제거하고 싶을 때 사용
      */
-    @DeleteMapping("/delete")
+    @Operation(summary = "알림 삭제", description = "개별 알림을 완전히 삭제")
+    @DeleteMapping("/{notificationId}")
     public CommonResponse<Void> deleteNotification(
-            @RequestParam("notificationId") Long notificationId,
-            @RequestParam("userCamInfoId") Long userCamInfoId
+            @PathVariable Long notificationId,
+            @AuthenticationPrincipal CustomOAuth2User currentUser
     ){
-        notificationService.deleteNotification(notificationId, userCamInfoId);
+        notificationService.deleteNotification(
+                notificationId,
+                currentUser.getUserCamInfoId()
+        );
         return CommonResponse.ok(null);
     }
 
@@ -103,6 +127,7 @@ public CommonResponse<Void> deleteNotification(
      * - 스터디 리더/관리자에게 전송
      * - 실시간 SSE 알림과 함께 DB 저장
      */
+    @Operation(summary = "스터디 가입 신청 알림 생성", description = "내부 API - Service에서 호출")
     @PostMapping("/study-apply")
     public CommonResponse<NotificationResponse> createStudyApplyNotification(
             @RequestParam("receiverId") Long receiverId,
@@ -118,6 +143,7 @@ public CommonResponse<NotificationResponse> createStudyApplyNotification(
      * - 신청자에게 전송
      * - 승인 완료 후 자동으로 호출
      */
+    @Operation(summary = "스터디 가입 승인 알림 생성", description = "내부 API - Service에서 호출")
     @PostMapping("/study-approve")
     public CommonResponse<NotificationResponse> createStudyApproveNotification(
             @RequestParam("studyMemberId") Long studyMemberId
@@ -132,6 +158,7 @@ public CommonResponse<NotificationResponse> createStudyApproveNotification(
      * - 신청자에게 전송
      * - 거절 처리 후 자동으로 호출
      */
+    @Operation(summary = "스터디 가입 거절 알림 생성", description = "내부 API - Service에서 호출")
     @PostMapping("/study-reject")
     public CommonResponse<NotificationResponse> createStudyRejectNotification(
             @RequestParam("studyMemberId") Long studyMemberId
@@ -146,6 +173,7 @@ public CommonResponse<NotificationResponse> createStudyRejectNotification(
      * - 게시글 작성자에게 전송 (자신이 단 댓글 제외)
      * - 댓글 작성 후 자동으로 호출
      */
+    @Operation(summary = "새 댓글 알림 생성", description = "내부 API - Service에서 호출")
     @PostMapping("/study-comment")
     public CommonResponse<NotificationResponse> createNewCommentNotification(
             @RequestParam("commentId") Long commentId