Skip to content

[FEAT] 피드 글 POST, PUT 응답에 images 추가 #405

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
EunjeongHeo merged 1 commit into from
Oct 4, 2025
Merged

[FEAT] 피드 글 POST, PUT 응답에 images 추가 #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 10 additions & 11 deletions src/main/java/org/websoso/WSSServer/controller/FeedController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@
import org.websoso.WSSServer.dto.comment.CommentUpdateRequest;
import org.websoso.WSSServer.dto.comment.CommentsGetResponse;
import org.websoso.WSSServer.dto.feed.FeedCreateRequest;
import org.websoso.WSSServer.dto.feed.FeedGetResponse;
import org.websoso.WSSServer.dto.feed.FeedImageCreateRequest;
import org.websoso.WSSServer.dto.feed.FeedCreateResponse;
import org.websoso.WSSServer.dto.feed.FeedImageUpdateRequest;
import org.websoso.WSSServer.dto.feed.FeedGetResponse;
import org.websoso.WSSServer.dto.feed.FeedUpdateRequest;
import org.websoso.WSSServer.dto.feed.FeedsGetResponse;
import org.websoso.WSSServer.dto.feed.FeedImageCreateRequest;
import org.websoso.WSSServer.dto.feed.InterestFeedsGetResponse;
import org.websoso.WSSServer.dto.popularFeed.PopularFeedsGetResponse;
import org.websoso.WSSServer.service.FeedService;
Expand All @@ -48,13 +49,12 @@ public class FeedController {

@PostMapping
@PreAuthorize("isAuthenticated()")
public ResponseEntity<Void> createFeed(@AuthenticationPrincipal User user,
@Valid @RequestPart("feed") FeedCreateRequest request,
@Valid @ModelAttribute FeedImageCreateRequest requestImage) {
feedService.createFeed(user, request, requestImage);
public ResponseEntity<FeedCreateResponse> createFeed(@AuthenticationPrincipal User user,
@Valid @RequestPart("feed") FeedCreateRequest request,
@Valid @ModelAttribute FeedImageCreateRequest requestImage) {
return ResponseEntity
.status(CREATED)
.build();
.body(feedService.createFeed(user, request, requestImage));
}

@GetMapping("/{feedId}")
Expand All @@ -79,14 +79,13 @@ public ResponseEntity<FeedsGetResponse> getFeeds(@AuthenticationPrincipal User u

@PutMapping("/{feedId}")
@PreAuthorize("isAuthenticated() and @authorizationService.validate(#feedId, #user, T(org.websoso.WSSServer.domain.Feed))")
public ResponseEntity<Void> updateFeed(@AuthenticationPrincipal User user,
public ResponseEntity<FeedCreateResponse> updateFeed(@AuthenticationPrincipal User user,
@PathVariable("feedId") Long feedId,
@Valid @RequestPart("feed") FeedUpdateRequest request,
@Valid @ModelAttribute FeedImageUpdateRequest requestImage) {
feedService.updateFeed(feedId, request, requestImage);
return ResponseEntity
.status(NO_CONTENT)
.build();
.status(OK)
.body(feedService.updateFeed(feedId, request, requestImage));
}

@DeleteMapping("/{feedId}")
Expand Down
21 changes: 21 additions & 0 deletions src/main/java/org/websoso/WSSServer/dto/feed/FeedCreateResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.websoso.WSSServer.dto.feed;

import org.websoso.WSSServer.domain.FeedImage;

import java.util.Comparator;
import java.util.List;

public record FeedCreateResponse(
Integer imagesCount,
List<String> imageUrls
) {
public static FeedCreateResponse of(List<FeedImage> images) {
return new FeedCreateResponse(
images.size(),
images.stream()
.sorted(Comparator.comparing(FeedImage::getSequence))
.map(FeedImage::getUrl)
.toList()
);
}
}
21 changes: 7 additions & 14 deletions src/main/java/org/websoso/WSSServer/service/FeedService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,7 @@
import org.websoso.WSSServer.dto.comment.CommentCreateRequest;
import org.websoso.WSSServer.dto.comment.CommentUpdateRequest;
import org.websoso.WSSServer.dto.comment.CommentsGetResponse;
import org.websoso.WSSServer.dto.feed.FeedCreateRequest;
import org.websoso.WSSServer.dto.feed.FeedGetResponse;
import org.websoso.WSSServer.dto.feed.FeedImageCreateRequest;
import org.websoso.WSSServer.dto.feed.FeedImageDeleteEvent;
import org.websoso.WSSServer.dto.feed.FeedImageUpdateRequest;
import org.websoso.WSSServer.dto.feed.FeedInfo;
import org.websoso.WSSServer.dto.feed.FeedUpdateRequest;
import org.websoso.WSSServer.dto.feed.FeedsGetResponse;
import org.websoso.WSSServer.dto.feed.InterestFeedGetResponse;
import org.websoso.WSSServer.dto.feed.InterestFeedsGetResponse;
import org.websoso.WSSServer.dto.feed.UserFeedGetResponse;
import org.websoso.WSSServer.dto.feed.UserFeedsGetResponse;
import org.websoso.WSSServer.dto.feed.*;
import org.websoso.WSSServer.dto.novel.NovelGetResponseFeedTab;
import org.websoso.WSSServer.dto.user.UserBasicInfo;
import org.websoso.WSSServer.exception.exception.CustomFeedException;
Expand Down Expand Up @@ -104,7 +93,7 @@ public class FeedService {
private final CommentRepository commentRepository;
private final ReportedCommentRepository reportedCommentRepository;

public void createFeed(User user, FeedCreateRequest request, FeedImageCreateRequest imagesRequest) {
public FeedCreateResponse createFeed(User user, FeedCreateRequest request, FeedImageCreateRequest imagesRequest) {
List<FeedImage> feedImages = processFeedImages(imagesRequest.images());

Optional.ofNullable(request.novelId())
Expand All @@ -118,9 +107,11 @@ public void createFeed(User user, FeedCreateRequest request, FeedImageCreateRequ
feedImages);
feedRepository.save(feed);
feedCategoryService.createFeedCategory(feed, request.relevantCategories());

return FeedCreateResponse.of(feedImages);
}

public void updateFeed(Long feedId, FeedUpdateRequest request, FeedImageUpdateRequest imagesRequest) {
public FeedCreateResponse updateFeed(Long feedId, FeedUpdateRequest request, FeedImageUpdateRequest imagesRequest) {
Feed feed = getFeedOrException(feedId);

List<FeedImage> oldImages = new ArrayList<>(feed.getImages());
Expand All @@ -143,6 +134,8 @@ public void updateFeed(Long feedId, FeedUpdateRequest request, FeedImageUpdateRe
.map(FeedImage::getUrl)
.toList();
eventPublisher.publishEvent(new FeedImageDeleteEvent(oldImageUrls));

return FeedCreateResponse.of(feedImages);
}

private List<FeedImage> processFeedImages(List<MultipartFile> images) {
Expand Down
Loading