feature :: 게시판 첨부파일 기능 추가 #318
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,96 @@ | ||
| package com.kernel360.bbs.service; | ||
|
|
||
| import com.kernel360.bbs.code.BBSErrorCode; | ||
| import com.kernel360.bbs.dto.BBSDto; | ||
| import com.kernel360.bbs.dto.BBSListDto; | ||
| import com.kernel360.bbs.entity.BBS; | ||
| import com.kernel360.bbs.repository.BBSRepository; | ||
| import com.kernel360.exception.BusinessException; | ||
| import com.kernel360.file.entity.File; | ||
| import com.kernel360.file.entity.FileReferType; | ||
| import com.kernel360.file.repository.FileRepository; | ||
| import com.kernel360.member.code.MemberErrorCode; | ||
| import com.kernel360.member.dto.MemberDto; | ||
| import com.kernel360.member.service.MemberService; | ||
| import com.kernel360.utils.file.FileUtils; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.data.domain.Page; | ||
| import org.springframework.data.domain.Pageable; | ||
| import org.springframework.data.domain.Slice; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
| import org.springframework.web.multipart.MultipartFile; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
|
|
||
| @Slf4j | ||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class BBSService { | ||
| private final FileUtils fileUtils; | ||
| private final BBSRepository bbsRepository; | ||
| private final MemberService memberService; | ||
| private final FileRepository fileRepository; | ||
|
|
||
| @Value("${aws.s3.bucket.url}") | ||
| private String bucketUrl; | ||
| private static final String REFERENCE_TYPE = "BBS"; | ||
|
|
||
| public Page<BBSListDto> getBBSWithConditionByPage(String type, String keyword, Pageable pageable) { | ||
|
|
||
| return bbsRepository.getBBSWithConditionByPage(type, keyword, pageable); | ||
| } | ||
|
|
||
| public Slice<BBSListDto> getBBSWithConditionBySlice(String type, String keyword, Pageable pageable) { | ||
|
|
||
| return bbsRepository.getBBSWithConditionBySlice(type, keyword, pageable); | ||
| } | ||
|
|
||
| public BBSDto getBBSView(Long bbsNo) { | ||
| BBS entity = Optional.of(bbsRepository.findOneByBbsNo(bbsNo)) | ||
| .orElseThrow(() -> new BusinessException(BBSErrorCode.FAILED_GET_BBS_VIEW)); | ||
|
|
||
| BBSDto result = BBSDto.from(entity, fileRepository.findByReferenceTypeAndReferenceNo(REFERENCE_TYPE, entity.getBbsNo())); | ||
|
|
||
| return result; | ||
|
|
||
| } | ||
|
|
||
| public Page<BBSDto> getBBSReply(Long upperNo, Pageable pageable) { | ||
|
|
||
| return bbsRepository.findAllByUpperNo(upperNo, pageable).map(entity -> BBSDto.from(entity, fileRepository.findByReferenceTypeAndReferenceNo(REFERENCE_TYPE, entity.getBbsNo()))); | ||
| } | ||
|
|
||
| @Transactional | ||
| public void saveBBS(BBSDto bbsDto, String id, List<MultipartFile> files) { | ||
|
|
||
| MemberDto memberDto = Optional.of(memberService.findByMemberId(id)) | ||
| .orElseThrow(() -> new BusinessException(MemberErrorCode.FAILED_FIND_MEMBER_INFO)); | ||
|
|
||
| BBS bbs = bbsRepository.save(BBS.save(bbsDto.bbsNo(), bbsDto.upperNo(), bbsDto.type(), bbsDto.title(), bbsDto.contents(), true, 0L, memberDto.toEntity())); | ||
|
|
||
| if(Objects.nonNull(files)){ | ||
| uploadFiles(files, bbs.getBbsNo()); | ||
| } | ||
| } | ||
|
|
||
| @Transactional | ||
| public void deleteBBS(Long bbsNo) { | ||
|
|
||
| bbsRepository.deleteByBbsNo(bbsNo); | ||
| } | ||
|
|
||
| private void uploadFiles(List<MultipartFile> files, Long bbsNo) { | ||
| files.stream().forEach(file -> { | ||
| String path = String.join("/", FileReferType.BBS.getDomain(), bbsNo.toString()); | ||
| String fileKey = fileUtils.upload(path, file); | ||
| String fileUrl = String.join("/", bucketUrl, fileKey); | ||
|
|
||
| File fileInfo = fileRepository.save(File.of(null, file.getOriginalFilename(), fileKey, fileUrl, FileReferType.BBS.getCode(), bbsNo)); | ||
| log.info("게시판 파일 등록 -> file_no {}", fileInfo.getFileNo()); | ||
| }); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
byReferenceTypeAndReferenceNo 대신에 좀 더 '파일 리스트'인 게 드러나는 변수명이 좋지 않을까요?