-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat : 중앙동아리 클럽 목록 조회 API 구현 및 feed File 로직 리팩토링
- Loading branch information
Showing
8 changed files
with
195 additions
and
71 deletions.
There are no files selected for viewing
This file contains 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 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
46 changes: 46 additions & 0 deletions
46
...in/java/ddingdong/ddingdongBE/domain/feed/controller/dto/response/MyFeedPageResponse.java
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package ddingdong.ddingdongBE.domain.feed.controller.dto.response; | ||
|
|
||
| import ddingdong.ddingdongBE.domain.feed.service.dto.query.FeedListQuery; | ||
| import ddingdong.ddingdongBE.domain.feed.service.dto.query.MyFeedPageQuery; | ||
| import io.swagger.v3.oas.annotations.media.ArraySchema; | ||
| import io.swagger.v3.oas.annotations.media.Schema; | ||
| import java.util.List; | ||
| import lombok.Builder; | ||
|
|
||
| public record MyFeedPageResponse( | ||
| @ArraySchema(schema = @Schema(name = "동아리 피드 정보", implementation = MyFeedPageResponse.class)) | ||
| List<MyFeedListResponse> clubFeeds, | ||
| @Schema(name = "피드 페이지 정보", implementation = PagingResponse.class) | ||
| PagingResponse pagingInfo | ||
| ) { | ||
|
|
||
|
|
||
| public static MyFeedPageResponse from(MyFeedPageQuery myFeedPageQuery) { | ||
| List<MyFeedListResponse> clubFeeds = myFeedPageQuery.feedListQueries().stream() | ||
| .map(MyFeedListResponse::from) | ||
| .toList(); | ||
| return new MyFeedPageResponse(clubFeeds, PagingResponse.from(myFeedPageQuery.pagingQuery())); | ||
| } | ||
|
|
||
| @Builder | ||
| record MyFeedListResponse( | ||
| @Schema(description = "피드 ID", example = "1") | ||
| Long id, | ||
| @Schema(description = "피드 썸네일 CDN URL", example = "https://%s.s3.%s.amazonaws.com/%s/%s/%s") | ||
| String thumbnailCdnUrl, | ||
| @Schema(description = "피드 썸네일 S3 URL", example = "https://%s.s3.%s.amazonaws.com/%s/%s/%s") | ||
| String thumbnailOriginUrl, | ||
| @Schema(description = "피드 타입", example = "IMAGE") | ||
| String feedType | ||
| ) { | ||
|
|
||
| public static MyFeedListResponse from(FeedListQuery feedListQuery) { | ||
| return MyFeedListResponse.builder() | ||
| .id(feedListQuery.id()) | ||
| .thumbnailCdnUrl(feedListQuery.thumbnailCdnUrl()) | ||
| .thumbnailOriginUrl(feedListQuery.thumbnailOriginUrl()) | ||
| .feedType(feedListQuery.feedType()) | ||
| .build(); | ||
| } | ||
| } | ||
| } |
This file contains 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 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 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
80 changes: 80 additions & 0 deletions
80
src/main/java/ddingdong/ddingdongBE/domain/feed/service/FeedFileService.java
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package ddingdong.ddingdongBE.domain.feed.service; | ||
|
|
||
| import ddingdong.ddingdongBE.common.exception.PersistenceException.ResourceNotFound; | ||
| import ddingdong.ddingdongBE.domain.club.entity.Club; | ||
| import ddingdong.ddingdongBE.domain.feed.entity.Feed; | ||
| import ddingdong.ddingdongBE.domain.feed.service.dto.query.ClubProfileQuery; | ||
| import ddingdong.ddingdongBE.domain.feed.service.dto.query.FeedFileUrlQuery; | ||
| import ddingdong.ddingdongBE.domain.feed.service.dto.query.FeedListQuery; | ||
| import ddingdong.ddingdongBE.domain.filemetadata.entity.DomainType; | ||
| import ddingdong.ddingdongBE.domain.filemetadata.entity.FileMetaData; | ||
| import ddingdong.ddingdongBE.domain.filemetadata.service.FileMetaDataService; | ||
| import ddingdong.ddingdongBE.file.service.S3FileService; | ||
| import ddingdong.ddingdongBE.file.service.dto.query.UploadedFileUrlQuery; | ||
| import ddingdong.ddingdongBE.file.service.dto.query.UploadedVideoUrlQuery; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| @Service | ||
| @Transactional(readOnly = true) | ||
| @RequiredArgsConstructor | ||
| public class FeedFileService { | ||
|
|
||
| private final FileMetaDataService fileMetaDataService; | ||
| private final S3FileService s3FileService; | ||
|
|
||
| public FeedListQuery extractFeedThumbnailInfo(Feed feed) { | ||
| FileMetaData fileMetaData = getFileMetaData(feed.getFeedType().getDomainType(), feed.getId()); | ||
| if (feed.isImage()) { | ||
| UploadedFileUrlQuery urlQuery = s3FileService.getUploadedFileUrl(fileMetaData.getFileKey()); | ||
| return new FeedListQuery(feed.getId(), urlQuery.cdnUrl(), urlQuery.originUrl(), feed.getFeedType().name()); | ||
| } | ||
|
|
||
| if (feed.isVideo()) { | ||
| UploadedVideoUrlQuery urlQuery = s3FileService.getUploadedVideoUrl(fileMetaData.getFileKey()); | ||
| return new FeedListQuery(feed.getId(), urlQuery.thumbnailCdnUrl(), urlQuery.thumbnailOriginUrl(), feed.getFeedType().name()); | ||
| } | ||
|
|
||
| throw new IllegalArgumentException("FeedType은 Image 혹은 Video여야 합니다."); | ||
| } | ||
|
|
||
| public FeedFileUrlQuery extractFeedFileInfo(Feed feed) { | ||
| FileMetaData fileMetaData = getFileMetaData(feed.getFeedType().getDomainType(), feed.getId()); | ||
| if (feed.isImage()) { | ||
| UploadedFileUrlQuery urlQuery = s3FileService.getUploadedFileUrl(fileMetaData.getFileKey()); | ||
| return new FeedFileUrlQuery(urlQuery.id(), urlQuery.originUrl(), urlQuery.cdnUrl()); | ||
| } | ||
|
|
||
| if (feed.isVideo()) { | ||
| UploadedVideoUrlQuery urlQuery = s3FileService.getUploadedVideoUrl(fileMetaData.getFileKey()); | ||
| return new FeedFileUrlQuery(fileMetaData.getId().toString(), urlQuery.videoOriginUrl(), urlQuery.videoCdnUrl()); | ||
| } | ||
|
|
||
| throw new IllegalArgumentException("FeedType은 Image 혹은 Video여야 합니다."); | ||
| } | ||
|
|
||
| public ClubProfileQuery extractClubInfo(Club club) { | ||
| String clubName = club.getName(); | ||
| UploadedFileUrlQuery urlQuery = getFileUrl(DomainType.CLUB_PROFILE, club.getId()); | ||
| if (urlQuery == null) { | ||
| return new ClubProfileQuery(club.getId(), clubName, null, null); | ||
| } | ||
| return new ClubProfileQuery(club.getId(), clubName, urlQuery.originUrl(), urlQuery.cdnUrl()); | ||
| } | ||
|
|
||
| private FileMetaData getFileMetaData(DomainType domainType, Long id) { | ||
| return fileMetaDataService.getCoupledAllByDomainTypeAndEntityId(domainType, id) | ||
| .stream() | ||
| .findFirst() | ||
| .orElseThrow(() -> new ResourceNotFound("해당 FileMetaData(feedId: " + id + ")를 찾을 수 없습니다.)")); | ||
| } | ||
|
|
||
| private UploadedFileUrlQuery getFileUrl(DomainType domainType, Long clubId) { | ||
| return fileMetaDataService.getCoupledAllByDomainTypeAndEntityId(domainType, clubId) | ||
| .stream() | ||
| .map(fileMetaData -> s3FileService.getUploadedFileUrl(fileMetaData.getFileKey())) | ||
| .findFirst() | ||
| .orElse(null); | ||
| } | ||
| } |
Oops, something went wrong.