diff --git a/src/main/java/ru/ulstu/is/sbapp/Post/controller/PostDto.java b/src/main/java/ru/ulstu/is/sbapp/Post/controller/PostDto.java index e8e485e..2700d76 100644 --- a/src/main/java/ru/ulstu/is/sbapp/Post/controller/PostDto.java +++ b/src/main/java/ru/ulstu/is/sbapp/Post/controller/PostDto.java @@ -4,6 +4,7 @@ import ru.ulstu.is.sbapp.Comment.model.Comment; import ru.ulstu.is.sbapp.Post.model.Post; import ru.ulstu.is.sbapp.User.model.User; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -16,12 +17,15 @@ public class PostDto { private User user; + private String image; + private List comments = new ArrayList<>(); public PostDto(Post post) { this.Heading = post.getHeading(); this.Content = post.getContent(); + this.image = new String(post.getImage(), StandardCharsets.UTF_8); } @@ -41,6 +45,9 @@ public class PostDto { { return user; } + public String getImage() { + return image; + } public List getComments() { return comments; diff --git a/src/main/java/ru/ulstu/is/sbapp/Post/model/Post.java b/src/main/java/ru/ulstu/is/sbapp/Post/model/Post.java index 6d06474..0cc67ea 100644 --- a/src/main/java/ru/ulstu/is/sbapp/Post/model/Post.java +++ b/src/main/java/ru/ulstu/is/sbapp/Post/model/Post.java @@ -18,10 +18,12 @@ public class Post { @Column @NotBlank(message = "Heading cannot be null") private String Heading; + @NotBlank(message = "Content cannot be null") private String Content; - + @Lob + private byte[] image; @ManyToOne(fetch = FetchType.EAGER,cascade = CascadeType.MERGE) private User user; @@ -36,6 +38,13 @@ public class Post { this.Heading = Heading; this.Content = Content; } + + public Post(String Heading, String Content,byte[] image) + { + this.Heading = Heading; + this.Content = Content; + this.image=image; + } public Long getId() { return id; @@ -62,7 +71,13 @@ public class Post { { return user; } + public byte[] getImage() { + return image; + } + public void setImage(byte[] image) { + this.image = image; + } public void deleteUser() { this.user = null;