Skip to content

Commit

Permalink
Merge pull request #197 from Review-zip/dev
Browse files Browse the repository at this point in the history
[Fix] main merge
  • Loading branch information
hsuush authored Feb 11, 2024
2 parents 358624c + 5c37819 commit 3ebc727
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.example.ReviewZIP.domain.post;

import com.example.ReviewZIP.domain.follow.Follows;
import com.example.ReviewZIP.domain.follow.FollowsRepository;
import com.example.ReviewZIP.domain.image.Images;
import com.example.ReviewZIP.domain.image.ImagesRepository;
import com.example.ReviewZIP.domain.image.dto.response.ImageResponseDto;
import com.example.ReviewZIP.domain.post.dto.request.PostRequestDto;
import com.example.ReviewZIP.domain.post.dto.response.PostResponseDto;
import com.example.ReviewZIP.domain.postHashtag.PostHashtags;
Expand All @@ -19,7 +19,6 @@
import com.example.ReviewZIP.global.response.exception.handler.*;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -65,12 +64,12 @@ public Posts createPost(PostRequestDto postRequestDto) {

Posts savedPost = postsRepository.save(newPost);

for (Long imageId : postRequestDto.getImageIds()) {
Images image = imagesRepository.findById(imageId).orElseThrow(() -> new ImagesHandler(ErrorStatus.IMAGE_NOT_FOUND));
image.setPost(savedPost);
image.setUser(user);
imagesRepository.save(image);
savedPost.getPostImageList().add(image);
for (ImageResponseDto.ImageDto image : postRequestDto.getImageList()) {
Images newImage = imagesRepository.findById(image.getImageId()).orElseThrow(() -> new ImagesHandler(ErrorStatus.IMAGE_NOT_FOUND));
newImage.setPost(savedPost);
newImage.setUser(user);
imagesRepository.save(newImage);
savedPost.getPostImageList().add(newImage);
}
return savedPost;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.example.ReviewZIP.domain.post.dto.request;

import com.example.ReviewZIP.domain.image.dto.response.ImageResponseDto;
import lombok.Getter;

import java.util.ArrayList;
Expand All @@ -10,5 +11,5 @@ public class PostRequestDto {
private Long userId;
private String comment;
private Double point;
private List<Long> imageIds = new ArrayList<>();
private List<ImageResponseDto.ImageDto> imageList = new ArrayList<>();
}

0 comments on commit 3ebc727

Please sign in to comment.