feat: 푸쉬 전 커밋

Author: lilyyang0077

.github/workflows/ci.yml

@@ -0,0 +1,32 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: '21'
+          distribution: 'corretto'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x backend/gradlew
+
+      - name: Build with Gradle
+        working-directory: backend
+        run: ./gradlew bootJar -x test
+        env:
+          DB_URL: ${{ secrets.DB_URL }}
+          DB_USER: ${{ secrets.DB_USER }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+          JWT_EXPIRATION: ${{ secrets.JWT_EXPIRATION }}

.github/workflows/deploy.yml

@@ -0,0 +1,64 @@
+name: Deploy to EC2
+
+on:
+  push:
+    branches: [ develop ]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: '21'
+          distribution: 'corretto'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x backend/gradlew
+
+      - name: Build with Gradle
+        working-directory: backend
+        run: ./gradlew bootJar -x test
+        env:
+          DB_URL: ${{ secrets.DB_URL }}
+          DB_USER: ${{ secrets.DB_USER }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+          JWT_EXPIRATION: ${{ secrets.JWT_EXPIRATION }}
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Build and push Docker image
+        working-directory: backend
+        run: |
+          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/piroin-backend:latest .
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/piroin-backend:latest
+
+      - name: Deploy to EC2
+        uses: appleboy/ssh-action@v1.0.0
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USER }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/piroin-backend:latest
+            docker stop piroin-backend || true
+            docker rm piroin-backend || true
+            docker run -d \
+              --name piroin-backend \
+              -p 8080:8080 \
+              -e DB_URL=${{ secrets.DB_URL }} \
+              -e DB_USER=${{ secrets.DB_USER }} \
+              -e DB_PASSWORD=${{ secrets.DB_PASSWORD }} \
+              -e JWT_SECRET=${{ secrets.JWT_SECRET }} \
+              -e JWT_EXPIRATION=${{ secrets.JWT_EXPIRATION }} \
+              ${{ secrets.DOCKERHUB_USERNAME }}/piroin-backend:latest

backend/src/main/java/com/example/Piroin/project/domain/question/controller/QuestionController.java

@@ -12,50 +12,77 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/sessions")
 @RequiredArgsConstructor
 public class QuestionController {
     private final QuestionService questionService;
 
     // 질문 목록 + 이해도 조회
     // GET /api/sessions/{sessionId}/questions?understandingIndex=0
-    @GetMapping("/{sessionId}/questions")
+    @GetMapping("/api/sessions/{sessionId}/questions")
     public ResponseEntity<ApiResponse<QuestionResDTO.QuestionRoomResponse>> getQuestionRoom(
             @PathVariable Long sessionId,
             @RequestParam(defaultValue = "0") int understandingIndex
     ) {
-        QuestionResDTO.QuestionRoomResponse response =
-                questionService.getQuestionRoom(sessionId, understandingIndex);
-
-        return ResponseUtil.success(QuestionSuccessCode.QUESTION_ROOM_OK, response);
+        return ResponseUtil.success(QuestionSuccessCode.QUESTION_ROOM_OK,
+                questionService.getQuestionRoom(sessionId, understandingIndex));
     }
 
-    // 이해도 체크 응답
-    // POST /api/sessions/{sessionId}/understanding-checks/{checkId}/responses
-    @PostMapping("/{sessionId}/understanding-checks/{checkId}/responses")
-    public ResponseEntity<ApiResponse<QuestionResDTO.UnderstandingResponseResult>> respondUnderstandingCheck(
-            @PathVariable Long sessionId,
-            @PathVariable Long checkId,
-            @RequestBody QuestionReqDTO.UnderstandingResponseReq request,
-            @AuthenticationPrincipal Integer userId
+    // 질문 상세 조회
+    // GET /api/questions/{questionId}
+    @GetMapping("/api/questions/{questionId}")
+    public ResponseEntity<ApiResponse<QuestionResDTO.QuestionDetailResponse>> getQuestionDetail(
+            @PathVariable Long questionId,
+            @AuthenticationPrincipal Long userId
     ) {
-        QuestionResDTO.UnderstandingResponseResult response =
-                questionService.respondUnderstandingCheck(sessionId, checkId, request, userId);
-
-        return ResponseUtil.success(QuestionSuccessCode.UNDERSTANDING_RESPONSE_OK, response);
+        return ResponseUtil.success(QuestionSuccessCode.QUESTION_DETAIL_OK,
+                questionService.getQuestionDetail(questionId, userId));
     }
 
     // 질문 등록
     // POST /api/sessions/{sessionId}/questions
-    @PostMapping("/{sessionId}/questions")
+    @PostMapping("/api/sessions/{sessionId}/questions")
     public ResponseEntity<ApiResponse<QuestionResDTO.CreateRes>> createQuestion(
             @PathVariable Long sessionId,
             @RequestBody QuestionReqDTO.CreateReq request,
             @AuthenticationPrincipal Integer userId
     ) {
-        QuestionResDTO.CreateRes response =
-                questionService.createQuestion(userId.longValue(), request, userId);
+        return ResponseUtil.success(QuestionSuccessCode.QUESTION_CREATED,
+                questionService.createQuestion(sessionId, request, Long.valueOf(userId)));
+    }
 
-        return ResponseUtil.success(QuestionSuccessCode.QUESTION_CREATED, response);
+    // 댓글/대댓글 등록
+    // POST /api/questions/{questionId}/comments
+    @PostMapping("/api/questions/{questionId}/comments")
+    public ResponseEntity<ApiResponse<QuestionResDTO.CommentCreateRes>> createComment(
+            @PathVariable Long questionId,
+            @RequestBody QuestionReqDTO.CommentReq request,
+            @AuthenticationPrincipal Long userId
+    ) {
+        return ResponseUtil.success(QuestionSuccessCode.COMMENT_CREATED,
+                questionService.createComment(questionId, request, userId));
+    }
+
+    // 좋아요 토글
+    // POST /api/questions/{questionId}/like
+    @PostMapping("/api/questions/{questionId}/like")
+    public ResponseEntity<ApiResponse<QuestionResDTO.LikeRes>> toggleLike(
+            @PathVariable Long questionId,
+            @AuthenticationPrincipal Long userId
+    ) {
+        return ResponseUtil.success(QuestionSuccessCode.LIKE_TOGGLED,
+                questionService.toggleLike(questionId, userId));
+    }
+
+    // 이해도 체크 응답
+    // POST /api/sessions/{sessionId}/understanding-checks/{checkId}/responses
+    @PostMapping("/api/sessions/{sessionId}/understanding-checks/{checkId}/responses")
+    public ResponseEntity<ApiResponse<QuestionResDTO.UnderstandingResponseResult>> respondUnderstandingCheck(
+            @PathVariable Long sessionId,
+            @PathVariable Long checkId,
+            @RequestBody QuestionReqDTO.UnderstandingResponseReq request,
+            @AuthenticationPrincipal Long userId
+    ) {
+        return ResponseUtil.success(QuestionSuccessCode.UNDERSTANDING_RESPONSE_OK,
+                questionService.respondUnderstandingCheck(sessionId, checkId, request, userId));
     }
 }

backend/src/main/java/com/example/Piroin/project/domain/question/dto/QuestionReqDTO.java

@@ -5,20 +5,24 @@
 import lombok.NoArgsConstructor;
 
 public class QuestionReqDTO {
-    /*
-    질문 등록 요청 바디
-    프론트에서 { "content": "질문 내용" } 형태로 전달
-    */
+
+    // 질문 등록 요청
     @Getter
     @NoArgsConstructor
     public static class CreateReq {
         private String content;
     }
 
-    /*
-    이해도 체크 응답 요청 바디
-    프론트에서 { "choice": "UNDERSTOOD" } 또는 { "choice": "NOT_UNDERSTOOD" } 형태로 전달
-    */
+    // 댓글/대댓글 등록 요청
+    // parentCommentId가 null이면 일반 댓글, 값이 있으면 대댓글
+    @Getter
+    @NoArgsConstructor
+    public static class CommentReq {
+        private String content;
+        private Long parentCommentId;  // 대댓글일 때만 값이 있음, 일반 댓글이면 null
+    }
+
+    // 이해도 체크 응답 요청
     @Getter
     @NoArgsConstructor
     public static class UnderstandingResponseReq {

backend/src/main/java/com/example/Piroin/project/domain/question/dto/QuestionResDTO.java

@@ -10,10 +10,7 @@
 import java.util.List;
 
 public class QuestionResDTO {
-    /*
-    질문 등록 응답
-    anonymous_no는 댓글 작성 시 부여되므로 여기서는 포함 X
-    */
+    // 질문 등록 응답
     @Getter
     @Builder
     public static class CreateRes {
@@ -23,7 +20,6 @@ public static class CreateRes {
         private Integer likeCount;
         private LocalDateTime createdAt;
 
-        // 엔티티 → DTO 변환 메서드
         public static CreateRes from(Question question) {
             return CreateRes.builder()
                     .id(question.getId())
@@ -35,6 +31,52 @@ public static CreateRes from(Question question) {
         }
     }
 
+    // 댓글 등록 응답
+    public record CommentCreateRes(
+            Long commentId,
+            Long questionId,
+            String displayName,
+            String content,
+            LocalDateTime createdAt
+    ) {
+    }
+
+    // 좋아요 토글 응답
+    // isLiked: true면 좋아요 추가된 상태, false면 취소된 상태
+    public record LikeRes(
+            Long id,
+            Integer likeCount,
+            Boolean isLiked
+    ) {
+    }
+
+    // 질문 상세 응답
+    public record QuestionDetailResponse(
+            Long questionId,
+            String displayName,
+            String content,
+            String imageUrl,
+            Boolean isResolved,
+            Boolean isPopular,
+            Integer likeCount,
+            Boolean isLiked,
+            LocalDateTime createdAt,
+            List<CommentResponse> comments
+    ) {
+    }
+
+    // 댓글 조회 응답 (상세 페이지용)
+    public record CommentResponse(
+            Long commentId,
+            String displayName,
+            String content,
+            String imageUrl,
+            LocalDateTime createdAt,
+            List<CommentResponse> replies
+    ) {
+    }
+
+    // 질문 방 전체 응답
     public record QuestionRoomResponse(
             SessionResponse session,
             UnderstandingSliceResponse understanding,

backend/src/main/java/com/example/Piroin/project/domain/question/entity/Question.java

@@ -47,4 +47,24 @@ public class Question {
 
     @Column(name = "deleted_at")
     private LocalDateTime deletedAt;
+
+    // 댓글이 새로 달리면 미해결로 되돌리도록
+    public void markUnresolved() {
+        this.isResolved = false;
+        this.updatedAt = LocalDateTime.now();
+    }
+
+    // 좋아요 추가 시 호출
+    public void increaseLikeCount() {
+        this.likeCount++;
+        this.updatedAt = LocalDateTime.now();
+    }
+
+    // 좋아요 취소 시 호출 (0 아래로 내려가지 않도록 방어)
+    public void decreaseLikeCount() {
+        if (this.likeCount > 0) {
+            this.likeCount--;
+        }
+        this.updatedAt = LocalDateTime.now();
+    }
 }

backend/src/main/java/com/example/Piroin/project/domain/question/exception/code/QuestionSuccessCode.java

@@ -10,8 +10,11 @@
 public enum QuestionSuccessCode implements BaseCode {
 
     QUESTION_ROOM_OK(HttpStatus.OK, "QUESTION200_1", "질문 방 조회에 성공했습니다."),
+    QUESTION_DETAIL_OK(HttpStatus.OK, "QUESTION200_2", "질문 상세 조회에 성공했습니다."),
+    LIKE_TOGGLED(HttpStatus.OK, "QUESTION200_3", "좋아요가 처리되었습니다."),          // ← 추가
+    UNDERSTANDING_RESPONSE_OK(HttpStatus.OK, "QUESTION200_4", "이해도 응답이 반영되었습니다."),
     QUESTION_CREATED(HttpStatus.CREATED, "QUESTION201_1", "질문이 등록되었습니다."),
-    UNDERSTANDING_RESPONSE_OK(HttpStatus.OK, "QUESTION200_2", "이해도 응답이 반영되었습니다.");
+    COMMENT_CREATED(HttpStatus.CREATED, "QUESTION201_2", "댓글이 등록되었습니다.");
 
     private final HttpStatus status;
     private final String code;

backend/src/main/java/com/example/Piroin/project/domain/question/repository/QuestionAnonymousIdentityRepository.java

@@ -1,22 +1,21 @@
 package com.example.Piroin.project.domain.question.repository;
 
-import com.example.Piroin.project.domain.question.entity.Question;                  // ← StudySession 대신 Question으로 변경
+import com.example.Piroin.project.domain.question.entity.Question;
 import com.example.Piroin.project.domain.question.entity.QuestionAnonymousIdentity;
 import com.example.Piroin.project.domain.user.entity.User;
+import com.example.Piroin.project.domain.user.enums.Role;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
 
 public interface QuestionAnonymousIdentityRepository extends JpaRepository<QuestionAnonymousIdentity, Long> {
-    /*
-    해당 질문에서 유저의 익명 번호 조회
-    용도: 댓글 작성 시 이미 번호가 있는지 확인
-    */
+
+    // 해당 질문에서 유저의 익명 번호 조회
+    // 용도: 댓글 작성 시 이미 번호가 있는지 확인
     Optional<QuestionAnonymousIdentity> findByQuestionAndUser(Question question, User user);
 
-    /*
-    해당 질문에 현재까지 부여된 익명 번호 수 조회
-    용도: 새 익명 번호 발급 시(현재 수 + 1)
-    */
-    int countByQuestion(Question question);
+    // 해당 질문에서 특정 역할(MEMBER/ADMIN)의 익명 번호 수 조회
+    // 용도: 새 익명 번호 발급 시 역할별로 따로 카운트
+    // MEMBER → 익명1, 익명2... / ADMIN → 운영진1, 운영진2...
+    int countByQuestionAndUser_Role(Question question, Role role);
 }