Skip to content

Commit

Permalink
Merge pull request #56 from IT-Cotato/feat/53-post-draft
Browse files Browse the repository at this point in the history
[FEATURE] 임시 저장 기능 구현 (이어서 작성 기능은 구현 필요)
  • Loading branch information
u-genuine authored Jan 30, 2025
2 parents 1a6ac5b + f70a8a5 commit 275e746
Show file tree
Hide file tree
Showing 29 changed files with 569 additions and 67 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.cotato.kampus.domain.auth.applicaon.AuthService;
import com.cotato.kampus.domain.auth.application.AuthService;
import com.cotato.kampus.domain.auth.dto.request.SignupRequest;
import com.cotato.kampus.domain.auth.dto.response.SignupResponse;
import com.cotato.kampus.global.common.dto.DataResponse;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cotato.kampus.domain.auth.applicaon;
package com.cotato.kampus.domain.auth.application;

import org.springframework.stereotype.Service;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cotato.kampus.domain.auth.applicaon;
package com.cotato.kampus.domain.auth.application;

import java.util.Date;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
public class ImageValidator {

public List<MultipartFile> filterValidImages(List<MultipartFile> images) {
if (images == null) {
return List.of(); // null인 경우 빈 리스트 반환
}

return images.stream()
.filter(image -> image != null && image.getOriginalFilename() != null && !image.getOriginalFilename().isEmpty())
.toList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,30 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.cotato.kampus.domain.post.application.PostService;
import com.cotato.kampus.domain.post.dto.request.DraftDeleteRequest;
import com.cotato.kampus.domain.post.dto.request.PostCreateRequest;
import com.cotato.kampus.domain.post.dto.request.PostDraftRequest;
import com.cotato.kampus.domain.post.dto.request.PostUpdateRequest;
import com.cotato.kampus.domain.post.dto.response.MyPostResponse;
import com.cotato.kampus.domain.post.dto.response.PostCreateResponse;
import com.cotato.kampus.domain.post.dto.response.PostDeleteResponse;
import com.cotato.kampus.domain.post.dto.response.PostDetailResponse;
import com.cotato.kampus.domain.post.dto.response.PostDraftSliceFindResponse;
import com.cotato.kampus.domain.post.dto.response.PostDraftCreateResponse;
import com.cotato.kampus.domain.post.dto.response.PostSliceFindResponse;
import com.cotato.kampus.global.common.dto.DataResponse;
import com.cotato.kampus.global.error.exception.ImageException;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;

Expand All @@ -40,7 +46,7 @@ public class PostController {
private final PostService postService;

@PostMapping(value = "", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@Operation(summary = "게시글 생성", description = "게시글 생성 요청입니다.")
@Operation(summary = "게시글 생성", description = "게시글 생성 요청입니다. 사진이 없는 경우 빈 값('')을 보내지 말고, 해당 필드를 생략하거나 값을 보내지 않도록 해주세요.")
public ResponseEntity<DataResponse<PostCreateResponse>> createPost(
@Parameter(description = "Post creation request")
@ModelAttribute PostCreateRequest request) throws ImageException {
Expand All @@ -52,7 +58,7 @@ public ResponseEntity<DataResponse<PostCreateResponse>> createPost(
request.content(),
request.postCategory(),
request.anonymity(),
request.images()
request.images() == null ? List.of() : request.images()
)
)
));
Expand Down Expand Up @@ -108,7 +114,58 @@ public ResponseEntity<DataResponse<Void>> updatePost(
postService.updatePost(postId, request.title(), request.content(), request.postCategory(), request.anonymity(),
request.images() == null ? List.of() : request.images()); // 이미지 없는 경우 빈 리스트로 요청
return ResponseEntity.ok(DataResponse.ok());
}
}

@PostMapping(value = "/draft", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@Operation(summary = "게시글 임시 저장", description = "게시글을 임시 저장합니다. boardId는 필수 값입니다. 사진이 없는 경우 빈 값('')을 보내지 말고, 해당 필드를 생략하거나 값을 보내지 않도록 해주세요.")
public ResponseEntity<DataResponse<PostDraftCreateResponse>> draftPost(
@Parameter(description = "Post creation request")
@Valid @ModelAttribute PostDraftRequest request) throws ImageException {
return ResponseEntity.ok(DataResponse.from(
PostDraftCreateResponse.of(
postService.draftPost(
request.boardId(),
request.title(),
request.content(),
request.postCategory(),
request.images() == null ? List.of() : request.images()
)
)
));
}

@GetMapping(value = "/boards/{boardId}/draft")
@Operation(summary = "임시 저장글 리스트 조회", description = "해당 게시판의 임시 저장글을 최신순으로 조회합니다.")
public ResponseEntity<DataResponse<PostDraftSliceFindResponse>> findDraftPost(
@PathVariable Long boardId,
@RequestParam(required = false, defaultValue = "0") int page
){
return ResponseEntity.ok(DataResponse.from(
PostDraftSliceFindResponse.from(
postService.findPostDrafts(boardId, page)
)
)
);
}

@DeleteMapping(value = "/draft")
@Operation(summary = "임시 저장 게시글 선택 삭제", description = "선택된 임시 저장글들을 삭제합니다.")
public ResponseEntity<DataResponse<Void>> deleteDraftPost(
@RequestBody DraftDeleteRequest request
){
postService.deleteDraftPosts(request.draftPostIds());
return ResponseEntity.ok(DataResponse.ok());
}


@DeleteMapping(value = "boards/{boardId}/draft")
@Operation(summary = "임시 저장 게시글 전체 삭제", description = "특정 게시판의 모든 임시 저장글을 삭제합니다.")
public ResponseEntity<DataResponse<Void>> deleteAllDraftPost(
@PathVariable Long boardId
){
postService.deleteAllDraftPost(boardId);
return ResponseEntity.ok(DataResponse.ok());
}

@GetMapping("/my")
@Operation(summary = "[마이페이지] 내가 쓴 게시글 조회", description = "현재 사용자가 작성한 게시글을 최신순으로 조회합니다.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

import com.cotato.kampus.domain.common.application.ApiUserResolver;
import com.cotato.kampus.domain.common.enums.Anonymity;
import com.cotato.kampus.domain.post.dao.PostDraftRepository;
import com.cotato.kampus.domain.post.domain.PostDraft;
import com.cotato.kampus.domain.post.enums.PostCategory;
import com.cotato.kampus.domain.post.enums.PostStatus;
import com.cotato.kampus.domain.post.dao.PostRepository;
Expand All @@ -20,6 +22,7 @@ public class PostAppender {

private final ApiUserResolver apiUserResolver;
private final PostRepository postRepository;
private final PostDraftRepository postDraftRepository;

@Transactional
public Long append(
Expand All @@ -39,6 +42,7 @@ public Long append(
.content(content)
.likes(0L)
.scraps(0L)
.comments(0L)
.anonymity(anonymity)
.postStatus(PostStatus.PUBLISHED)
.postCategory(postCategory)
Expand All @@ -47,4 +51,24 @@ public Long append(

return postRepository.save(post).getId();
}

@Transactional
public Long draft(
Long boardId,
String title,
String content,
PostCategory postCategory
){
Long userId = apiUserResolver.getUserId();

PostDraft postDraft = PostDraft.builder()
.userId(userId)
.boardId(boardId)
.title(title)
.content(content)
.postCategory(postCategory)
.build();

return postDraftRepository.save(postDraft).getId();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.cotato.kampus.domain.common.application.ApiUserResolver;
import com.cotato.kampus.domain.common.enums.Anonymity;
import com.cotato.kampus.domain.post.domain.Post;
import com.cotato.kampus.domain.post.dto.AnonymousOrPostAuthor;
import com.cotato.kampus.domain.post.dto.PostDto;
import com.cotato.kampus.domain.user.dao.UserRepository;
Expand Down Expand Up @@ -40,10 +41,4 @@ public AnonymousOrPostAuthor getAuthor(PostDto postDto) {
author.getProfileImage());
}
}

public Boolean validatePostAuthor(Long postId, Long userId) {
PostDto post = postFinder.findPost(postId);

return post.userId().equals(userId);
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
package com.cotato.kampus.domain.post.application;

import java.util.List;

import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import com.cotato.kampus.domain.post.dao.PostDraftRepository;
import com.cotato.kampus.domain.post.dao.PostRepository;
import com.cotato.kampus.domain.post.domain.Post;
import com.cotato.kampus.domain.post.domain.PostDraft;
import com.cotato.kampus.global.error.ErrorCode;
import com.cotato.kampus.global.error.exception.AppException;

import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
Expand All @@ -15,9 +21,18 @@
public class PostDeleter {
private final PostRepository postRepository;
private final PostFinder postFinder;
private final PostDraftRepository postDraftRepository;

public void delete(Long postId){
Post post = postFinder.getPost(postId);
postRepository.delete(post);
}

public void deleteDraftAll(List<Long> postDraftIds){
// 임시 저장글 조회
List<PostDraft> drafts = postFinder.findPostDrafts(postDraftIds);

// 일괄 삭제
postDraftRepository.deleteAll(drafts);
}
}
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
package com.cotato.kampus.domain.post.application;

import java.util.ArrayList;
import java.util.List;

import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.Sort;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import com.cotato.kampus.domain.board.application.BoardFinder;
import com.cotato.kampus.domain.common.application.ApiUserResolver;
import com.cotato.kampus.domain.post.dao.PostDraftPhotoRepository;
import com.cotato.kampus.domain.post.dao.PostDraftRepository;
import com.cotato.kampus.domain.post.dao.PostPhotoRepository;
import com.cotato.kampus.domain.post.dao.PostRepository;
import com.cotato.kampus.domain.post.dao.PostScrapRepository;
import com.cotato.kampus.domain.post.domain.Post;
import com.cotato.kampus.domain.post.domain.PostDraft;
import com.cotato.kampus.domain.post.domain.PostDraftPhoto;
import com.cotato.kampus.domain.post.domain.PostPhoto;
import com.cotato.kampus.domain.post.domain.PostScrap;
import com.cotato.kampus.domain.post.dto.MyPostWithPhoto;
import com.cotato.kampus.domain.post.dto.PostDto;
import com.cotato.kampus.domain.post.dto.PostWithPhotos;
import com.cotato.kampus.domain.post.dto.PostDraftWithPhoto;
import com.cotato.kampus.global.common.dto.CustomPageRequest;
import com.cotato.kampus.global.error.ErrorCode;
import com.cotato.kampus.global.error.exception.AppException;
Expand All @@ -35,11 +37,13 @@ public class PostFinder {

private final PostRepository postRepository;
private final PostPhotoRepository postPhotoRepository;
private final PostDraftRepository postDraftRepository;
private static final Integer PAGE_SIZE = 10;
public static final String SORT_PROPERTY = "createdTime";
private final ApiUserResolver apiUserResolver;
private final BoardFinder boardFinder;
private final PostScrapRepository postScrapRepository;
private final PostDraftPhotoRepository postDraftPhotoRepository;

public Post getPost(Long postId) {
return postRepository.findById(postId)
Expand Down Expand Up @@ -107,4 +111,43 @@ public Slice<MyPostWithPhoto> findUserScrapedPosts(int page){
return MyPostWithPhoto.from(post, boardName, postPhoto);
});
}

public Slice<PostDraftWithPhoto> findPostDrafts(Long boardId, Long userId, int page){

CustomPageRequest customPageRequest = new CustomPageRequest(page, PAGE_SIZE, Sort.Direction.DESC);
Slice<PostDraft> postDrafts = postDraftRepository.findAllByBoardIdAndUserIdOrderByCreatedTimeDesc(
boardId,
userId,
customPageRequest.of(SORT_PROPERTY)
);

return postDrafts.map(postDraft -> {
PostDraftPhoto postDraftPhoto = postDraftPhotoRepository.findFirstByPostDraftIdOrderByCreatedTimeDesc(postDraft.getId())
.orElse(null);
return PostDraftWithPhoto.from(postDraft, postDraftPhoto);
});
}

public PostDraft findPostDraft(Long postDraftId) {
return postDraftRepository.findById(postDraftId)
.orElseThrow(() -> new AppException(ErrorCode.POST_NOT_FOUND));
}

public List<PostDraft> findPostDrafts(List<Long> postDraftIds){
List<PostDraft> drafts = postDraftRepository.findAllById(postDraftIds);

if (drafts.size() != postDraftIds.size()) {
throw new AppException(ErrorCode.POST_NOT_FOUND);
}

return drafts;
}

public List<Long> getPostDraftIdsByBoardAndUser(Long boardId, Long userId){
List<PostDraft> postDrafts = postDraftRepository.findAllByBoardIdAndUserId(boardId, userId);

return postDrafts.stream()
.map(PostDraft::getId)
.toList();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import com.cotato.kampus.domain.post.dao.PostDraftPhotoRepository;
import com.cotato.kampus.domain.post.dao.PostPhotoRepository;
import com.cotato.kampus.domain.post.domain.PostDraftPhoto;
import com.cotato.kampus.domain.post.domain.PostPhoto;

import lombok.AccessLevel;
Expand All @@ -17,6 +19,7 @@
public class PostImageAppender {

private final PostPhotoRepository postPhotoRepository;
private final PostDraftPhotoRepository postDraftPhotoRepository;

@Transactional
public void appendAll(Long postId, List<String> imageUrls){
Expand All @@ -29,4 +32,16 @@ public void appendAll(Long postId, List<String> imageUrls){
postPhotoRepository.save(postPhoto);
});
}

@Transactional
public void appendAllDraftImage(Long postDraftId, List<String> imageUrls){
imageUrls.forEach(imageUrl -> {
PostDraftPhoto postDraftPhoto = PostDraftPhoto.builder()
.postDraftId(postDraftId)
.photoUrl(imageUrl)
.build();

postDraftPhotoRepository.save(postDraftPhoto);
});
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.cotato.kampus.domain.post.application;

import java.util.List;

import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import com.cotato.kampus.domain.post.dao.PostDraftPhotoRepository;

import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;

@Component
@Transactional(readOnly = true)
@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
public class PostImageDeleter {

private final PostDraftPhotoRepository postDraftPhotoRepository;

public void deleteAll(List<String> imageUrls){
postDraftPhotoRepository.deleteByPhotoUrlIn(imageUrls);
}
}
Loading

0 comments on commit 275e746

Please sign in to comment.