Skip to content

[chore] 예약어? 제외한 @Table name어노테이션 제거#137 #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 25, 2025
Merged

[chore] 예약어? 제외한 @Table name어노테이션 제거#137 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
138302f
feat: 게시글 영상 업로드 기능 구현
seok6555 Sep 25, 2025
8f192b0
[feat] 게시글 영상 업로드 기능 구현#127
seok6555 Sep 25, 2025
e41118a
Merge pull request #141 from prgrms-web-devcourse-final-project/refac…
seungwookc97 Sep 25, 2025
7506647
Merge branch 'dev' of https://github.com/prgrms-web-devcourse-final-p…
seungwookc97 Sep 25, 2025
ed0db2e
fix:특수 케이스 제외 table names 명시 제거
seungwookc97 Sep 25, 2025
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: 0 additions & 1 deletion src/main/java/com/back/domain/cocktail/comment/entity/CocktailComment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

@Entity
@Getter
@Table(name = "cocktailcomment")
@EntityListeners(AuditingEntityListener.class)
@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
@AllArgsConstructor
Expand Down
15 changes: 2 additions & 13 deletions src/main/java/com/back/domain/post/category/entity/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
package com.back.domain.post.category.entity;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import jakarta.persistence.*;
import lombok.*;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

@Entity
@Getter
@Setter
@Table(name = "category")
@EntityListeners(AuditingEntityListener.class)
@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
@AllArgsConstructor
Expand Down
18 changes: 3 additions & 15 deletions src/main/java/com/back/domain/post/comment/entity/Comment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,8 @@

import com.back.domain.post.comment.enums.CommentStatus;
import com.back.domain.post.post.entity.Post;
import com.back.domain.post.post.enums.PostStatus;
import com.back.domain.user.entity.User;
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 jakarta.persistence.Table;
import java.time.LocalDateTime;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
Expand All @@ -25,9 +12,10 @@
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import java.time.LocalDateTime;

@Entity
@Getter
@Table(name = "comment")
@EntityListeners(AuditingEntityListener.class)
@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
@AllArgsConstructor
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/back/domain/post/post/dto/request/PostCreateRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public record PostCreateRequestDto(
@NotBlank (message = "내용은 필수입니다.")
String content,
String imageUrl,
String videoUrl,
List<String> tags
) {
}
1 change: 1 addition & 0 deletions src/main/java/com/back/domain/post/post/dto/request/PostUpdateRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public record PostUpdateRequestDto(
String title,
String content,
String imageUrl,
String videoUrl,
List<String> tags
) {
}
2 changes: 2 additions & 0 deletions src/main/java/com/back/domain/post/post/dto/response/PostResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public record PostResponseDto(
String title,
String content,
String imageUrl,
String videoUrl,
List<String> tags,
Integer likeCount,
Integer commentCount,
Expand All @@ -32,6 +33,7 @@ public PostResponseDto(Post post) {
post.getTitle(),
post.getContent(),
post.getImageUrl(),
post.getVideoUrl(),
post.getPostTags().stream()
.map(postTag -> postTag.getTag().getName())
.toList(),
Expand Down
31 changes: 13 additions & 18 deletions src/main/java/com/back/domain/post/post/entity/Post.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,7 @@
import com.back.domain.post.category.entity.Category;
import com.back.domain.post.post.enums.PostStatus;
import com.back.domain.user.entity.User;
import jakarta.persistence.CascadeType;
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 jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
Expand All @@ -28,9 +12,12 @@
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

@Entity
@Getter
@Table(name = "post")
@EntityListeners(AuditingEntityListener.class)
@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
@AllArgsConstructor
Expand Down Expand Up @@ -79,6 +66,10 @@ public class Post {
@Column(name = "image_url")
private String imageUrl;

// 게시글 동영상 URL
@Column(name = "video_url")
private String videoUrl;

@OneToMany(mappedBy = "post", cascade = CascadeType.ALL, orphanRemoval = true)
private List<PostTag> postTags = new ArrayList<>();

Expand Down Expand Up @@ -118,6 +109,10 @@ public void updateImage(String imageUrl) {
this.imageUrl = imageUrl;
}

public void updateVideo(String videoUrl) {
this.videoUrl = videoUrl;
}

public void addTag(Tag tag) {
PostTag postTag = PostTag.create(this, tag);
this.postTags.add(postTag);
Expand Down
25 changes: 5 additions & 20 deletions src/main/java/com/back/domain/post/post/entity/PostLike.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,17 @@

import com.back.domain.post.post.enums.PostLikeStatus;
import com.back.domain.user.entity.User;
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 jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
import java.time.LocalDateTime;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import jakarta.persistence.*;
import lombok.*;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import java.time.LocalDateTime;

@Entity
@Getter
// 같은 사용자(user_id)가 같은 게시글(post_id)을 중복 추천하지 못하도록 DB 레벨에서 보장.
@Table(name = "post_like", uniqueConstraints = {
@Table(uniqueConstraints = {
@UniqueConstraint(columnNames = {"post_id", "user_id"})
})
@EntityListeners(AuditingEntityListener.class)
Expand Down
12 changes: 1 addition & 11 deletions src/main/java/com/back/domain/post/post/entity/PostTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
package com.back.domain.post.post.entity;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
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 jakarta.persistence.Table;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
Expand All @@ -18,7 +9,6 @@

@Entity
@Getter
@Table(name = "post_tag")
@EntityListeners(AuditingEntityListener.class)
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class PostTag {
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/com/back/domain/post/post/entity/Tag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,10 @@
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.*;

@Entity
@Getter
@Table(name = "tag")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
@Builder
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/back/domain/post/post/service/PostService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public PostResponseDto createPost(PostCreateRequestDto reqBody) {
.title(reqBody.title())
.content(reqBody.content())
.imageUrl(reqBody.imageUrl())
.videoUrl(reqBody.videoUrl())
.build();

List<String> tagNames = reqBody.tags();
Expand Down Expand Up @@ -114,6 +115,9 @@ public PostResponseDto updatePost(Long postId, PostUpdateRequestDto reqBody) {
if (reqBody.imageUrl() != null && !reqBody.imageUrl().isBlank()) {
post.updateImage(reqBody.imageUrl());
}
if (reqBody.videoUrl() != null && !reqBody.videoUrl().isBlank()) {
post.updateVideo(reqBody.videoUrl());
}
if (reqBody.tags() != null) {
// 기존 태그들 삭제
post.clearTags();
Expand Down