Refactor/#38 post

src/main/java/com/hyetaekon/hyetaekon/common/exception/ErrorCode.java

@@ -40,7 +40,10 @@ public enum ErrorCode {
     // 좋아요
     RECOMMEND_ALREADY_EXISTS(HttpStatus.CONFLICT, "RECOMMEND-001", "이미 좋아요를 누른 게시글입니다."),
     RECOMMEND_NOT_FOUND(HttpStatus.NOT_FOUND, "RECOMMEND-002", "좋아요 정보를 찾을 수 없습니다."),
-    POST_NOT_FOUND(HttpStatus.NOT_FOUND, "POST-001", "해당 게시글을 찾을 수 없습니다."),
+    RECOMMEND_USER_NOT_FOUND(HttpStatus.NOT_FOUND, "RECOMMEND-003", "추천한 유저를 찾을 수 없습니다."),
+
+    // 게시글
+    POST_NOT_FOUND_BY_ID(HttpStatus.NOT_FOUND,"POST-001", "해당 아이디의 게시글을 찾을 수 없습니다"),
 
     // 관심사 선택 제한
     INTEREST_LIMIT_EXCEEDED(HttpStatus.BAD_REQUEST, "INTEREST-001", "관심사는 최대 6개까지만 등록 가능합니다."),

src/main/java/com/hyetaekon/hyetaekon/post/controller/PostController.java

@@ -1,54 +1,75 @@
 package com.hyetaekon.hyetaekon.post.controller;
 
-import com.hyetaekon.hyetaekon.post.dto.PostDto;
+import com.hyetaekon.hyetaekon.common.jwt.CustomUserDetails;
+import com.hyetaekon.hyetaekon.post.dto.*;
+import com.hyetaekon.hyetaekon.post.entity.PostType;
 import com.hyetaekon.hyetaekon.post.service.PostService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 
+@Slf4j
 @RestController
 @RequestMapping("/api/posts")
 @RequiredArgsConstructor
 public class PostController {
 
     private final PostService postService;
 
-    // ✅ 게시글 생성
-    @PostMapping
-    public ResponseEntity<PostDto> createPost(@RequestBody PostDto postDto) {
-        return ResponseEntity.ok(postService.createPost(postDto));
+    // 전체 게시글 목록 조회
+    @GetMapping
+    public ResponseEntity<Page<PostListResponseDto>> getAllPosts(
+        @PageableDefault(page = 0, size = 10) Pageable pageable) {
+        Page<PostListResponseDto> posts = postService.getAllPosts(pageable);
+        return ResponseEntity.ok(posts);
     }
 
-    // ✅ 특정 게시글 조회
-    @GetMapping("/{postId}")
-    public ResponseEntity<PostDto> getPost(@PathVariable Long postId) {
-        return ResponseEntity.ok(postService.getPostById(postId));
+    // PostType에 해당하는 게시글 목록 조회
+    @GetMapping("/type/{postType}")
+    public ResponseEntity<Page<PostListResponseDto>> getPostsByType(
+        @PathVariable PostType postType,
+        @PageableDefault(page = 0, size = 10) Pageable pageable) {
+        Page<PostListResponseDto> posts = postService.getPostsByType(postType, pageable);
+        return ResponseEntity.ok(posts);
     }
 
-    // ✅ 특정 카테고리의 게시글 조회
-    @GetMapping("/category/{categoryId}")
-    public ResponseEntity<List<PostDto>> getPostsByCategory(@PathVariable Long categoryId) {
-        return ResponseEntity.ok(postService.getPostsByCategoryId(categoryId));
+    // User, Admin에 따라 다른 접근 가능
+    // ✅ 특정 게시글 상세 조회
+    @GetMapping("/{postId}")
+    public ResponseEntity<PostDetailResponseDto> getPost(
+        @PathVariable Long postId,
+        @AuthenticationPrincipal CustomUserDetails userDetails) {
+        return ResponseEntity.ok(postService.getPostById(postId, userDetails.getId()));
     }
 
-    // ✅ 모든 게시글 조회
-    @GetMapping
-    public ResponseEntity<List<PostDto>> getAllPosts() {
-        return ResponseEntity.ok(postService.getAllPosts());
+    // ✅ 게시글 생성
+    @PostMapping
+    public ResponseEntity<PostDetailResponseDto> createPost(
+        @RequestBody PostCreateRequestDto requestDto,
+        @AuthenticationPrincipal CustomUserDetails userDetails) {
+        return ResponseEntity.ok(postService.createPost(requestDto, userDetails.getId()));
     }
 
-    // ✅ 게시글 수정
+    // ✅ 게시글 수정 - 본인
     @PutMapping("/{postId}")
-    public ResponseEntity<PostDto> updatePost(@PathVariable Long postId, @RequestBody PostDto postDto) {
-        return ResponseEntity.ok(postService.updatePost(postId, postDto));
+    public ResponseEntity<PostDetailResponseDto> updatePost(
+        @PathVariable Long postId,
+        @RequestBody PostUpdateRequestDto updateDto,
+        @AuthenticationPrincipal CustomUserDetails userDetails) {
+        return ResponseEntity.ok(postService.updatePost(postId, updateDto, userDetails.getId()));
     }
 
-    // ✅ 게시글 삭제 (soft delete 방식 사용 가능)
+    // ✅ 게시글 삭제 (soft delete 방식 사용 가능) - 본인 혹은 관리자
     @DeleteMapping("/{postId}")
-    public ResponseEntity<Void> deletePost(@PathVariable Long postId) {
-        postService.deletePost(postId);
+    public ResponseEntity<Void> deletePost(
+        @PathVariable Long postId, @AuthenticationPrincipal CustomUserDetails userDetails) {
+        postService.deletePost(postId, userDetails.getId(), userDetails.getRole());
         return ResponseEntity.noContent().build();
     }
 }

src/main/java/com/hyetaekon/hyetaekon/post/dto/PostCreateRequestDto.java

@@ -0,0 +1,24 @@
+package com.hyetaekon.hyetaekon.post.dto;
+
+import lombok.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PostCreateRequestDto {
+    private Long nickName;
+    private String title;
+    private String content;
+    private LocalDateTime createdAt;
+    private String postType;
+    private String urlTitle;
+    private String urlPath;
+    private String tags;
+    private List<MultipartFile> images;  // 이미지 파일
+}

src/main/java/com/hyetaekon/hyetaekon/post/dto/PostDto.java → src/main/java/com/hyetaekon/hyetaekon/post/dto/PostDetailResponseDto.java

@@ -1,27 +1,28 @@
 package com.hyetaekon.hyetaekon.post.dto;
 
-import lombok.Getter;
-import lombok.Setter;
+
+import lombok.*;
+
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Getter
 @Setter
-public class PostDto {
-    private Long id;
-    private Long userId;
-    private String publicServiceId;
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PostDetailResponseDto {
+    private Long postId;
+    private Long nickName;  // 작성자 닉네임
     private String title;
     private String content;
     private LocalDateTime createdAt;
-    private LocalDateTime deletedAt; // 삭제일 추가
     private String postType;
-    private String serviceUrl;
     private int recommendCnt;
-    private int viewCount;
+    private int viewCnt;
     private String urlTitle;
     private String urlPath;
     private String tags;
-    private Long categoryId; // 추가됨
     private List<String> imageUrls; // ✅ 이미지 URL 리스트 추가
+    private boolean recommended; // 현재 로그인한 사용자의 추천 여부
 }

src/main/java/com/hyetaekon/hyetaekon/post/dto/PostListResponseDto.java

@@ -0,0 +1,20 @@
+package com.hyetaekon.hyetaekon.post.dto;
+
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PostListResponseDto {
+    private Long postId;
+    private String title;
+    private Long nickName;  // 작성자 닉네임
+    private String content;
+    private LocalDateTime createdAt;
+    private int viewCnt;
+    private String postType;
+}

src/main/java/com/hyetaekon/hyetaekon/post/dto/PostUpdateRequestDto.java

@@ -0,0 +1,24 @@
+package com.hyetaekon.hyetaekon.post.dto;
+
+import lombok.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PostUpdateRequestDto {
+    private Long nickName;
+    private String title;
+    private String content;
+    // private LocalDateTime createdAt;
+    private String postType;
+    private String urlTitle;
+    private String urlPath;
+    private String tags;
+    private List<MultipartFile> images;  // 이미지 파일
+}

src/main/java/com/hyetaekon/hyetaekon/post/entity/Post.java

@@ -1,16 +1,22 @@
 package com.hyetaekon.hyetaekon.post.entity;
 
+import com.hyetaekon.hyetaekon.bookmark.entity.Bookmark;
 import com.hyetaekon.hyetaekon.publicservice.entity.PublicService;
+import com.hyetaekon.hyetaekon.recommend.entity.Recommend;
 import com.hyetaekon.hyetaekon.user.entity.User;
 import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
+
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 @Entity
 @Getter
 @Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @Table(name = "post")
 public class Post {
 
@@ -26,27 +32,36 @@ public class Post {
     @JoinColumn(name = "public_service_id")
     private PublicService publicService;
 
-    @Column(length = 20, nullable = false)  // ✅ 제목 20자 제한
+    @Column(columnDefinition = "VARCHAR(20) CHARACTER SET utf8mb4", nullable = false)  // ✅ 제목 20자 제한
     private String title;
 
-    @Column(length = 500, nullable = false)  // ✅ 내용 500자 제한
+    @Column(columnDefinition = "VARCHAR(500) CHARACTER SET utf8mb4", nullable = false)  // ✅ 내용 500자 제한
     private String content;
 
     private LocalDateTime createdAt = LocalDateTime.now();
 
     private LocalDateTime deletedAt;
 
-    private int recommendCnt;  // 추천수
+    @Builder.Default
+    @Column(name = "recommend_cnt")
+    private int recommendCnt = 0;  // 추천수
+
+    @Builder.Default
+    @Column(name = "view_cnt")
+    private int viewCnt = 0;  // 조회수
 
-    private int viewCount;  // 조회수
+    // TODO: 댓글 생성/수정 시 업데이트
+    @Builder.Default
+    @Column(name = "comment_cnt")
+    private int commentCnt = 0;   // 댓글수
 
-    @Column(name = "post_type")
+    @Column(name = "post_type", nullable = false)
     @Enumerated(EnumType.STRING)  // ✅ ENUM 타입으로 저장 (질문, 자유, 인사)
     private PostType postType;
 
     private String serviceUrl;
 
-    @Column(length = 12)  // ✅ 관련 링크 제목 12자 제한
+    @Column(columnDefinition = "VARCHAR(12) CHARACTER SET utf8mb4")  // ✅ url제목 12자 제한
     private String urlTitle;
 
     private String urlPath;
@@ -57,6 +72,34 @@ public class Post {
     @Column(name = "category_id")
     private Long categoryId;
 
+    @Builder.Default
+    @OneToMany(mappedBy = "post", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<PostImage> postImages = new ArrayList<>();  // ✅ 게시글 이미지와 연결
+
     @OneToMany(mappedBy = "post", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<PostImage> postImages;  // ✅ 게시글 이미지와 연결
+    @Builder.Default
+    private List<Recommend> recommends = new ArrayList<>();
+
+    // 조회수 증가
+    public void incrementViewCnt() {
+        this.viewCnt++;
+    }
+
+    // 추천수 증가
+    public void incrementRecommendCnt() {
+        this.recommendCnt++;
+    }
+
+    // 추천수 감소
+    public void decrementRecommendCnt() {
+        this.recommendCnt = Math.max(0, this.recommendCnt - 1);
+    }
+
+    public void incrementCommentCnt() {
+        this.commentCnt++;
+    }
+
+    public void decrementCommentCnt() {
+        this.commentCnt = Math.max(0, this.commentCnt - 1);
+    }
 }

src/main/java/com/hyetaekon/hyetaekon/post/entity/PostImage.java

@@ -1,12 +1,16 @@
 package com.hyetaekon.hyetaekon.post.entity;
 
 import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
+
+import java.time.LocalDateTime;
 
 @Entity
 @Getter
 @Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class PostImage {
 
     @Id
@@ -19,4 +23,16 @@ public class PostImage {
 
     @Column(name = "image_url", length = 255)
     private String imageUrl;
+
+    private LocalDateTime deletedAt;
+
+    // 이미지가 삭제되었는지 확인하는 메소드
+    public boolean isDeleted() {
+        return deletedAt != null;
+    }
+
+    // Soft delete 처리 메소드
+    public void softDelete() {
+        this.deletedAt = LocalDateTime.now();
+    }
 }

src/main/java/com/hyetaekon/hyetaekon/post/entity/PostType.java

@@ -1,7 +1,16 @@
 package com.hyetaekon.hyetaekon.post.entity;
 
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
 public enum PostType {
-    QUESTION, // 질문 게시판
-    FREE,     // 자유 게시판
-    GREETING  // 인사 게시판
+    QUESTION("질문"),
+    FREE("자유"),
+    GREETING("인사");
+
+    @JsonValue
+    private final String koreanName;
 }