Fix/#80 common

.github/workflows/deploy.yml

@@ -0,0 +1,59 @@
+name: Deploy to EC2 with Docker hub
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      # 소스코드 체크아웃
+      - name: Checkout code
+        uses: actions/[email protected]
+
+      # Docker hub 로그인
+      - name: Log in to Docker Hub
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      # Docker 이미지 빌드 및 푸시
+      - name: Build and push Docker images
+        uses: docker/[email protected]
+        with:
+          context: .  # Dockerfile 위치
+          file: ./Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKER_USERNAME }}/hyetaek-on:latest
+
+
+
+      # 3. EC2에서 환경 변수를 설정하고 애플리케이션 실행
+      - name: Run jar on EC2 with environment variables
+        uses: appleboy/[email protected]
+        with:
+          host: ${{secrets.EC2_HOST}}
+          username: ${{secrets.EC2_USERNAME}}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          port: 22
+          script: |
+            # Docker Hub 로그인
+            echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+            # 최신 이미지 가져오기
+            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/hyetaek-on:latest
+            # 기존 컨테이너 중지 및 삭제
+            sudo docker stop hyetaek-on || true
+            sudo docker rm hyetaek-on || true
+            # 새 컨테이너 실행
+            sudo docker run -d \
+            --name hyetaek-on \
+            --env SPRING_PROFILES_ACTIVE=prod,s3Bucket \
+            --env-file ${{ secrets.EC2_TARGET_PATH }}/.env \
+            --network hyetaekon-network \
+            -p 8080:8080 \
+            -v ${{ secrets.EC2_TARGET_PATH }}/logs:/app/logs \
+            ${{ secrets.DOCKER_USERNAME }}/hyetaek-on:latest

build.gradle

@@ -66,9 +66,13 @@ dependencies {
 	runtimeOnly 'com.mysql:mysql-connector-j'
 
 	// MongoDB
-	/*implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
-	implementation 'org.mongodb:mongodb-driver-sync'
-	implementation 'org.mongodb:mongodb-driver-core'*/
+	implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
+//	implementation 'org.mongodb:mongodb-driver-sync'
+//	implementation 'org.mongodb:mongodb-driver-core'
+
+	// Caffeine
+	implementation 'org.springframework.boot:spring-boot-starter-cache'
+	implementation 'com.github.ben-manes.caffeine:caffeine'
 
 	// redis
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'

src/main/java/com/hyetaekon/hyetaekon/HyetaekonApplication.java

@@ -4,10 +4,12 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
 @EnableJpaAuditing
 @SpringBootApplication
 @EnableScheduling
+@EnableMongoRepositories
 public class HyetaekonApplication {
 
 	public static void main(String[] args) {

src/main/java/com/hyetaekon/hyetaekon/answer/controller/AnswerController.java

@@ -2,10 +2,14 @@
 
 import com.hyetaekon.hyetaekon.answer.dto.AnswerDto;
 import com.hyetaekon.hyetaekon.answer.service.AnswerService;
+import com.hyetaekon.hyetaekon.common.jwt.CustomUserDetails;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -15,27 +19,47 @@ public class AnswerController {
 
     private final AnswerService answerService;
 
+    // 답변 목록 조회
+    // 게시글의 답변 목록 조회
+    @GetMapping
+    public ResponseEntity<Page<AnswerDto>> getAnswersByPostId(
+        @PathVariable("postId") Long postId,
+        @RequestParam(defaultValue = "0") int page,
+        @RequestParam(defaultValue = "5") int size) {
+
+        Pageable pageable = PageRequest.of(page, size);
+        Page<AnswerDto> answers = answerService.getAnswersByPostId(postId, pageable);
+        return ResponseEntity.ok(answers);
+    }
+
     // 답변 작성
     @PostMapping
-    @PreAuthorize("hasRole('USER')")
-    public ResponseEntity<AnswerDto> createAnswer(@PathVariable Long postId, @RequestBody AnswerDto answerDto) {
-        AnswerDto createdAnswer = answerService.createAnswer(postId, answerDto);
+    public ResponseEntity<AnswerDto> createAnswer(
+        @PathVariable("postId") Long postId,
+        @RequestBody AnswerDto answerDto,
+        @AuthenticationPrincipal CustomUserDetails userDetails) {
+        AnswerDto createdAnswer = answerService.createAnswer(postId, answerDto, userDetails.getId());
         return ResponseEntity.status(HttpStatus.CREATED).body(createdAnswer);
     }
 
     // 답변 채택
     @PutMapping("/{answerId}/select")
-    @PreAuthorize("hasRole('USER')")
-    public ResponseEntity<Void> selectAnswer(@PathVariable Long answerId) {
-        answerService.selectAnswer(answerId);
+    public ResponseEntity<Void> selectAnswer(
+        @PathVariable("postId") Long postId,
+        @PathVariable("answerId") Long answerId,
+        @AuthenticationPrincipal CustomUserDetails userDetails) {
+        // 로그인한 사용자의 ID를 서비스에 전달
+        answerService.selectAnswer(postId, answerId, userDetails.getId());
         return ResponseEntity.ok().build();
     }
 
-    // 답변 삭제 (관리자만 가능)
-    @DeleteMapping("/admin/answers/{answerId}")
-    @PreAuthorize("hasRole('ADMIN')")
-    public ResponseEntity<Void> deleteAnswer(@PathVariable Long answerId) {
-        answerService.deleteAnswer(answerId);
+    // 답변 삭제 (관리자와 작성자만 가능)
+    @DeleteMapping("/{answerId}")
+    public ResponseEntity<Void> deleteAnswer(
+            @PathVariable("postId") Long postId,
+            @PathVariable("answerId") Long answerId,
+            @AuthenticationPrincipal CustomUserDetails userDetails) {
+        answerService.deleteAnswer(postId, answerId, userDetails.getId(), userDetails.getRole());
         return ResponseEntity.noContent().build();
     }
 }

src/main/java/com/hyetaekon/hyetaekon/answer/dto/AnswerDto.java

@@ -8,6 +8,7 @@ public class AnswerDto {
     private Long id;
     private Long postId;
     private Long userId;
+    private String nickname;
     private String content;
     private LocalDateTime createdAt;
     private boolean selected;

src/main/java/com/hyetaekon/hyetaekon/answer/entity/Answer.java

@@ -1,33 +1,69 @@
 package com.hyetaekon.hyetaekon.answer.entity;
 
+import com.hyetaekon.hyetaekon.common.util.BaseEntity;
+import com.hyetaekon.hyetaekon.post.entity.Post;
+import com.hyetaekon.hyetaekon.user.entity.User;
 import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
 import java.time.LocalDateTime;
 
+
 @Entity
 @Getter
 @Setter
+@Builder
 @NoArgsConstructor
+@AllArgsConstructor
 @Table(name = "answer")
+@EntityListeners(AuditingEntityListener.class)
 public class Answer {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id; // 답변 ID
 
-    @Column(name = "post_id", nullable = false)
-    private Long postId; // 게시글 ID
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "post_id")
+    private Post post;
 
-    @Column(name = "user_id", nullable = false)
-    private Long userId; // 회원 ID
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private User user;
 
     @Column(name = "content", columnDefinition = "TEXT", nullable = false)
     private String content; // 답변 내용
 
-    @Column(name = "created_at", nullable = false)
-    private LocalDateTime createdAt; // 생성일
-
     @Column(name = "selected", nullable = false)
     private boolean selected; // 채택 여부
+
+    @CreatedDate
+    @Column(name = "created_at", nullable = false, updatable = false)
+    private LocalDateTime createdAt;
+
+    @Column(name = "deleted_at")
+    private LocalDateTime deletedAt;
+
+    @Column(name = "suspend_at")
+    private LocalDateTime suspendAt;
+
+    // 삭제 처리
+    public void delete() {
+        this.deletedAt = LocalDateTime.now();
+    }
+
+    // 정지 처리
+    public void suspend() {
+        this.suspendAt = LocalDateTime.now();
+    }
+
+    public String getDisplayContent() {
+        if (this.deletedAt != null) {
+            return "삭제된 답변입니다.";
+        } else if (this.suspendAt != null) {
+            return "관리자에 의해 삭제된 답변입니다.";
+        }
+        return content;
+    }
 }

src/main/java/com/hyetaekon/hyetaekon/answer/mapper/AnswerMapper.java

@@ -4,16 +4,15 @@
 import com.hyetaekon.hyetaekon.answer.entity.Answer;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
+import org.mapstruct.ReportingPolicy;
 
-@Mapper(componentModel = "spring")
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
 public interface AnswerMapper {
-    AnswerMapper INSTANCE = Mappers.getMapper(AnswerMapper.class);
-
+    @Mapping(target = "content", expression = "java(answer.getDisplayContent())")
+    @Mapping(source = "user.id", target = "userId")
+    @Mapping(source = "post.id", target = "postId")
+    @Mapping(source = "user.nickname", target = "nickname")
     AnswerDto toDto(Answer answer);
 
-    @Mapping(target = "id", ignore = true)  // id는 자동 생성되므로 무시
-    @Mapping(target = "selected", ignore = true)  // 기본값 false 처리
-    @Mapping(target = "createdAt", ignore = true) // createdAt 자동 설정
     Answer toEntity(AnswerDto answerDto);
 }

src/main/java/com/hyetaekon/hyetaekon/answer/repository/AnswerRepository.java

@@ -1,9 +1,28 @@
 package com.hyetaekon.hyetaekon.answer.repository;
 
 import com.hyetaekon.hyetaekon.answer.entity.Answer;
+import com.hyetaekon.hyetaekon.post.entity.Post;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface AnswerRepository extends JpaRepository<Answer, Long> {
+    // 페이지네이션 적용한 답변 목록 조회 (post 객체 사용)
+    Page<Answer> findByPost(Post post, Pageable pageable);
+
+    // 채택 여부 및 등록일 기준 정렬된 페이징 처리된 답변 목록 조회
+    Page<Answer> findByPostOrderBySelectedDescCreatedAtDesc(Post post, Pageable pageable);
+
+    // 삭제된 답변만 조회 (관리자용)
+    Page<Answer> findByPostAndDeletedAtIsNotNull(Post post, Pageable pageable);
+
+    // 정지된 답변만 조회 (관리자용)
+    Page<Answer> findByPostAndSuspendAtIsNotNull(Post post, Pageable pageable);
+
+    // 통계용 카운팅 메서드들
+    long countByPost(Post post);
+    long countByPostAndDeletedAtIsNotNull(Post post);
+    long countByPostAndSuspendAtIsNotNull(Post post);
 }