Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ dependencies {

// AWS S3
implementation("io.awspring.cloud:spring-cloud-aws-starter-s3:3.4.0")
implementation("com.amazonaws:aws-java-sdk-s3:1.12.777")

runtimeOnly("com.h2database:h2")
runtimeOnly("com.mysql:mysql-connector-j")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.back.domain.myhistory.dto;

import com.back.domain.post.post.entity.Post;
import com.back.domain.post.post.entity.PostImage;
import com.back.domain.post.post.entity.PostLike;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Builder;
import lombok.Getter;

Expand All @@ -11,7 +13,7 @@
public class MyHistoryLikedPostItemDto {
private Long id;
private String title;
private String imageUrl;
private List<String> imageUrls;
private LocalDateTime likedAt;
private Integer likeCount;
private Integer commentCount;
Expand All @@ -21,7 +23,9 @@ public static MyHistoryLikedPostItemDto from(PostLike pl) {
return MyHistoryLikedPostItemDto.builder()
.id(p.getId())
.title(p.getTitle())
.imageUrl(p.getImageUrl())
.imageUrls(p.getImages().stream()
.map(PostImage::getUrl)
.toList())
.likedAt(pl.getCreatedAt())
.likeCount(p.getLikeCount())
.commentCount(p.getCommentCount())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.back.domain.myhistory.dto;

import com.back.domain.post.post.entity.Post;
import com.back.domain.post.post.entity.PostImage;
import java.util.List;
import lombok.Builder;
import lombok.Getter;

Expand All @@ -11,7 +13,7 @@
public class MyHistoryPostItemDto {
private Long id;
private String title;
private String imageUrl;
private List<String> imageUrls;
private LocalDateTime createdAt;
private Integer likeCount;
private Integer commentCount;
Expand All @@ -20,7 +22,9 @@ public static MyHistoryPostItemDto from(Post p) {
return MyHistoryPostItemDto.builder()
.id(p.getId())
.title(p.getTitle())
.imageUrl(p.getImageUrl())
.imageUrls(p.getImages().stream()
.map(PostImage::getUrl)
.toList())
.createdAt(p.getCreatedAt())
.likeCount(p.getLikeCount())
.commentCount(p.getCommentCount())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,19 @@
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

@RestController
@RequestMapping("/posts")
Expand All @@ -23,15 +32,18 @@ public class PostController {

/**
* 게시글 작성 API
*
* @param reqBody 게시글 작성 요청 DTO
* @param images 첨부 이미지 파일들 (optional)
* @return 작성된 게시글 정보
*/
@PostMapping
@PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@Operation(summary = "게시글 작성")
public RsData<PostResponseDto> createPost(
@Valid @RequestBody PostCreateRequestDto reqBody
@RequestPart("post") @Valid PostCreateRequestDto reqBody,
@RequestPart(value = "images", required = false) List<MultipartFile> images
) {
return RsData.successOf(postService.createPost(reqBody)); // code=200, message="success"
return RsData.successOf(postService.createPost(reqBody, images)); // code=200, message="success"
}

/**
Expand Down Expand Up @@ -66,13 +78,14 @@ public RsData<PostResponseDto> getPost(
* @param reqBody 게시글 수정 요청 DTO
* @return 수정된 게시글 정보
*/
@PatchMapping("/{postId}")
@PatchMapping(value = "/{postId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@Operation(summary = "게시글 수정")
public RsData<PostResponseDto> updatePost(
@PathVariable Long postId,
@Valid @RequestBody PostUpdateRequestDto reqBody
@RequestPart("post") @Valid PostUpdateRequestDto reqBody,
@RequestPart(value = "images", required = false) List<MultipartFile> images
) {
return RsData.successOf(postService.updatePost(postId, reqBody)); // code=200, message="success"
return RsData.successOf(postService.updatePost(postId, reqBody, images)); // code=200, message="success"
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ public record PostCreateRequestDto(
String title,
@NotBlank (message = "내용은 필수입니다.")
String content,
String imageUrl,
String videoUrl,
List<String> tags
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ public record PostUpdateRequestDto(
PostStatus status,
String title,
String content,
String imageUrl,
// 기존 이미지 중 유지할 이미지 ID 목록
List<Long> keepImageIds,
String videoUrl,
List<String> tags
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.back.domain.post.post.dto.response;

import com.back.domain.post.post.entity.Post;
import com.back.domain.post.post.entity.PostImage;
import com.back.domain.post.post.enums.PostStatus;
import java.time.LocalDateTime;
import java.util.List;
Expand All @@ -14,7 +15,7 @@ public record PostResponseDto(
PostStatus status,
String title,
String content,
String imageUrl,
List<String> imageUrls,
String videoUrl,
List<String> tags,
Integer likeCount,
Expand All @@ -32,7 +33,9 @@ public PostResponseDto(Post post) {
post.getStatus(),
post.getTitle(),
post.getContent(),
post.getImageUrl(),
post.getImages().stream()
.map(PostImage::getUrl)
.toList(),
post.getVideoUrl(),
post.getPostTags().stream()
.map(postTag -> postTag.getTag().getName())
Expand Down
20 changes: 15 additions & 5 deletions src/main/java/com/back/domain/post/post/entity/Post.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.back.domain.post.post.entity;

import com.back.domain.post.category.entity.Category;
import com.back.domain.post.comment.entity.Comment;
import com.back.domain.post.post.enums.PostStatus;
import com.back.domain.user.entity.User;
import jakarta.persistence.*;
Expand Down Expand Up @@ -62,9 +63,14 @@ public class Post {
@Column(name = "content", nullable = false, columnDefinition = "TEXT")
private String content;

// 게시글 이미지 URL
@Column(name = "image_url")
private String imageUrl;
// Post → Comment = 1:N
@OneToMany(mappedBy = "post", cascade = CascadeType.ALL, orphanRemoval = true)
private List<Comment> comments = new ArrayList<>();

// Post → PostImage = 1:N
@OneToMany(mappedBy = "post", cascade = CascadeType.ALL, orphanRemoval = true)
@OrderBy("sortOrder ASC") // 조회 시 순서대로 정렬
private List<PostImage> images = new ArrayList<>();

// 게시글 동영상 URL
@Column(name = "video_url")
Expand Down Expand Up @@ -105,8 +111,12 @@ public void updateContent(String content) {
this.content = content;
}

public void updateImage(String imageUrl) {
this.imageUrl = imageUrl;
public void updateImages(List<PostImage> images) {
this.images.clear();
for (PostImage i : images) {
i.updatePost(this);
this.images.add(i);
}
}

public void updateVideo(String videoUrl) {
Expand Down
65 changes: 65 additions & 0 deletions src/main/java/com/back/domain/post/post/entity/PostImage.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package com.back.domain.post.post.entity;

import com.back.domain.post.post.enums.PostImageStatus;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

@Entity
@Getter
@EntityListeners(AuditingEntityListener.class)
@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
@AllArgsConstructor
@Builder
public class PostImage {

// 각 이미지를 구분하는 유일한 번호
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private Long id;

// 해당 이미지가 첨부된 게시글의 고유 식별자
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "post_id")
private Post post;

// 이미지 파일 명
@Column(name = "file_name")
private String fileName;

// 이미지 URL
@Column(name = "url")
private String url;

// 이미지 삭제 상태 (기본값: 게시)
@Builder.Default
@Enumerated(EnumType.STRING)
@Column(name = "status", nullable = false)
private PostImageStatus status = PostImageStatus.POSTED;

// 이미지 순서
@Column(name = "sort_order")
private Integer sortOrder;

public void updatePost(Post post) {
this.post = post;
}

public void updateSortOrder(Integer sortOrder) {
this.sortOrder = sortOrder;
}
}
14 changes: 14 additions & 0 deletions src/main/java/com/back/domain/post/post/enums/PostImageStatus.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.back.domain.post.post.enums;

import lombok.Getter;
import lombok.RequiredArgsConstructor;

@Getter
@RequiredArgsConstructor
public enum PostImageStatus {
POSTED("게시", "이미지가 해당 게시물에 게시된 상태"),
DELETED("삭제", "이미지가 삭제 처리된 상태");

private final String title;
private final String description;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.back.domain.post.post.repository;

import com.back.domain.post.post.entity.PostImage;
import org.springframework.data.jpa.repository.JpaRepository;

public interface PostImageRepository extends JpaRepository<PostImage, Long> {

}
Loading