[feat] 홈/검색 피드 API 구현 최종

src/main/java/com/haejwo/tripcometrue/domain/city/dto/response/CityImageContentResponseDto.java

@@ -6,31 +6,28 @@
 import lombok.Builder;
 
 public record CityImageContentResponseDto(
- Long id,
  Long tripRecordId,
- Integer storedCount,
- String imageUrl
+ String imageUrl,
+ Integer tripRecordStoreCount
 ) {
  @Builder
  public CityImageContentResponseDto {
  }
 
  public static CityImageContentResponseDto fromEntity(TripRecordSchedule entity, TripRecordScheduleImage image) {
  return CityImageContentResponseDto.builder()
- .id(image.getId())
  .tripRecordId(entity.getTripRecord().getId())
- .storedCount(entity.getTripRecord().getStoreCount())
  .imageUrl(image.getImageUrl())
+ .tripRecordStoreCount(entity.getTripRecord().getStoreCount())
  .build();
  }
 
  public static CityImageContentResponseDto fromEntity(TripRecordScheduleImage entity) {
  TripRecord tripRecord = entity.getTripRecordSchedule().getTripRecord();
  return CityImageContentResponseDto.builder()
- .id(entity.getId())
  .tripRecordId(tripRecord.getId())
- .storedCount(tripRecord.getStoreCount())
  .imageUrl(entity.getImageUrl())
+ .tripRecordStoreCount(tripRecord.getStoreCount())
  .build();
  }
 }

src/main/java/com/haejwo/tripcometrue/domain/member/controller/MemberSearchController.java → src/main/java/com/haejwo/tripcometrue/domain/member/controller/MemberReadSearchController.java

@@ -1,26 +1,37 @@
 package com.haejwo.tripcometrue.domain.member.controller;
 
+import com.haejwo.tripcometrue.domain.member.dto.response.MemberCreatorInfoResponseDto;
 import com.haejwo.tripcometrue.domain.member.dto.response.MemberDetailListItemResponseDto;
 import com.haejwo.tripcometrue.domain.member.dto.response.MemberSearchResultWithContentResponseDto;
-import com.haejwo.tripcometrue.domain.member.facade.MemberSearchFacade;
+import com.haejwo.tripcometrue.domain.member.facade.MemberReadSearchFacade;
 import com.haejwo.tripcometrue.global.util.ResponseDTO;
 import com.haejwo.tripcometrue.global.util.SliceResponseDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RequiredArgsConstructor
 @RequestMapping("/v1/members")
 @RestController
-public class MemberSearchController {
+public class MemberReadSearchController {
 
- private final MemberSearchFacade memberSearchFacade;
+ private final MemberReadSearchFacade memberReadSearchFacade;
+
+ @GetMapping("/{memberId}")
+ public ResponseEntity<ResponseDTO<MemberCreatorInfoResponseDto>> memberCreatorInfo(
+ @PathVariable("memberId") Long memberId
+ ) {
+ return ResponseEntity
+ .ok()
+ .body(
+ ResponseDTO.okWithData(
+ memberReadSearchFacade.getCreatorInfo(memberId)
+ )
+ );
+ }
 
  @GetMapping("/list")
  public ResponseEntity<ResponseDTO<MemberSearchResultWithContentResponseDto>> searchByNicknameResultWithContent(
@@ -30,7 +41,7 @@ public ResponseEntity<ResponseDTO<MemberSearchResultWithContentResponseDto>> sea
  .ok()
  .body(
  ResponseDTO.okWithData(
- memberSearchFacade.searchByNicknameResultWithContent(query)
+ memberReadSearchFacade.searchByNicknameResultWithContent(query)
  )
  );
  }
@@ -44,7 +55,19 @@ public ResponseEntity<ResponseDTO<SliceResponseDto<MemberDetailListItemResponseD
  .ok()
  .body(
  ResponseDTO.okWithData(
- memberSearchFacade.searchByNicknamePagination(query, pageable)
+ memberReadSearchFacade.searchByNicknamePagination(query, pageable)
+ )
+ );
+ }
+
+ // 홈 피드 HOT 인기 크리에이터 리스트 조회
+ @GetMapping("/top-list")
+ public ResponseEntity<ResponseDTO<?>> listTopCreators() {
+ return ResponseEntity
+ .ok()
+ .body(
+ ResponseDTO.okWithData(
+ memberReadSearchFacade.listTopMemberCreators()
  )
  );
  }

src/main/java/com/haejwo/tripcometrue/domain/member/dto/response/MemberCreatorInfoResponseDto.java

@@ -0,0 +1,18 @@
+package com.haejwo.tripcometrue.domain.member.dto.response;
+
+import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord.TripRecordListItemResponseDto;
+import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord_schedule_media.TripRecordScheduleVideoListItemResponseDto;
+import lombok.Builder;
+
+import java.util.List;
+
+public record MemberCreatorInfoResponseDto(
+ MemberDetailListItemResponseDto memberDetailInfo,
+ List<TripRecordScheduleVideoListItemResponseDto> videos,
+ List<TripRecordListItemResponseDto> tripRecords
+) {
+
+ @Builder
+ public MemberCreatorInfoResponseDto {
+ }
+}

src/main/java/com/haejwo/tripcometrue/domain/member/dto/response/MemberDetailListItemResponseDto.java

@@ -16,7 +16,7 @@ public record MemberDetailListItemResponseDto(
  public MemberDetailListItemResponseDto {
  }
 
- public static MemberDetailListItemResponseDto of(MemberListItemResponseDto dto, Integer tripRecordTotal, Integer videoTotal) {
+ public static MemberDetailListItemResponseDto of(MemberSimpleResponseDto dto, Integer tripRecordTotal, Integer videoTotal) {
  return MemberDetailListItemResponseDto.builder()
  .memberId(dto.memberId())
  .nickname(dto.nickname())

src/main/java/com/haejwo/tripcometrue/domain/member/dto/response/MemberInfoWithTripRecordsResponseDto.java

@@ -0,0 +1,16 @@
+package com.haejwo.tripcometrue.domain.member.dto.response;
+
+import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord.TripRecordListItemResponseDto;
+import lombok.Builder;
+
+import java.util.List;
+
+public record MemberInfoWithTripRecordsResponseDto(
+ MemberSimpleResponseDto memberInfo,
+ List<TripRecordListItemResponseDto> tripRecords
+) {
+
+ @Builder
+ public MemberInfoWithTripRecordsResponseDto {
+ }
+}

src/main/java/com/haejwo/tripcometrue/domain/member/dto/response/MemberSearchResultWithContentResponseDto.java

@@ -7,7 +7,7 @@
 import java.util.List;
 
 public record MemberSearchResultWithContentResponseDto(
- List<MemberListItemResponseDto> members,
+ List<MemberSimpleResponseDto> members,
  List<TripRecordScheduleVideoListItemResponseDto> videos,
  List<TripRecordListItemResponseDto> tripRecords
 ) {

src/main/java/com/haejwo/tripcometrue/domain/member/dto/response/MemberListItemResponseDto.java → src/main/java/com/haejwo/tripcometrue/domain/member/dto/response/MemberSimpleResponseDto.java

@@ -3,7 +3,7 @@
 import com.haejwo.tripcometrue.domain.member.entity.Member;
 import lombok.Builder;
 
-public record MemberListItemResponseDto(
+public record MemberSimpleResponseDto(
  Long memberId,
  String nickname,
  String introduction,
@@ -12,11 +12,11 @@ public record MemberListItemResponseDto(
 ) {
 
  @Builder
- public MemberListItemResponseDto {
+ public MemberSimpleResponseDto {
  }
 
- public static MemberListItemResponseDto fromEntity(Member entity) {
- return MemberListItemResponseDto.builder()
+ public static MemberSimpleResponseDto fromEntity(Member entity) {
+ return MemberSimpleResponseDto.builder()
  .memberId(entity.getId())
  .nickname(entity.getMemberBase().getNickname())
  .introduction(entity.getIntroduction())

src/main/java/com/haejwo/tripcometrue/domain/member/facade/MemberSearchFacade.java → src/main/java/com/haejwo/tripcometrue/domain/member/facade/MemberReadSearchFacade.java

@@ -1,9 +1,7 @@
 package com.haejwo.tripcometrue.domain.member.facade;
 
-import com.haejwo.tripcometrue.domain.member.dto.response.MemberDetailListItemResponseDto;
-import com.haejwo.tripcometrue.domain.member.dto.response.MemberListItemResponseDto;
-import com.haejwo.tripcometrue.domain.member.dto.response.MemberSearchResultWithContentResponseDto;
-import com.haejwo.tripcometrue.domain.member.service.MemberSearchService;
+import com.haejwo.tripcometrue.domain.member.dto.response.*;
+import com.haejwo.tripcometrue.domain.member.service.MemberReadSearchService;
 import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord.TripRecordListItemResponseDto;
 import com.haejwo.tripcometrue.domain.triprecord.dto.response.triprecord_schedule_media.TripRecordScheduleVideoListItemResponseDto;
 import com.haejwo.tripcometrue.domain.triprecord.service.TripRecordScheduleVideoService;
@@ -14,6 +12,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -22,18 +21,18 @@
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class MemberSearchFacade {
+public class MemberReadSearchFacade {
 
- private final MemberSearchService memberSearchService;
+ private final MemberReadSearchService memberReadSearchService;
  private final TripRecordScheduleVideoService tripRecordScheduleVideoService;
  private final TripRecordService tripRecordService;
 
  public MemberSearchResultWithContentResponseDto searchByNicknameResultWithContent(String nickname) {
- List<MemberListItemResponseDto> members = memberSearchService.searchByNickname(nickname);
+ List<MemberSimpleResponseDto> members = memberReadSearchService.searchByNickname(nickname);
 
  List<Long> memberIds = members
  .stream()
- .map(MemberListItemResponseDto::memberId)
+ .map(MemberSimpleResponseDto::memberId)
  .toList();
 
  List<TripRecordScheduleVideoListItemResponseDto> videos = tripRecordScheduleVideoService.getVideosInMemberIds(memberIds);
@@ -48,16 +47,20 @@ public MemberSearchResultWithContentResponseDto searchByNicknameResultWithConten
 
  public SliceResponseDto<MemberDetailListItemResponseDto> searchByNicknamePagination(String query, Pageable pageable) {
 
- SliceResponseDto<MemberListItemResponseDto> sliceResult = memberSearchService.searchByNickname(query, pageable);
+ SliceResponseDto<MemberSimpleResponseDto> sliceResult = memberReadSearchService.searchByNickname(query, pageable);
 
  List<Long> memberIds = sliceResult.content()
  .stream()
- .map(MemberListItemResponseDto::memberId)
+ .map(MemberSimpleResponseDto::memberId)
  .toList();
 
- Map<Long, List<TripRecordListItemResponseDto>> tripRecordMap = getGroupByMemberIdTripRecordMap(memberIds);
+ Map<Long, List<TripRecordListItemResponseDto>> tripRecordMap = getGroupByMemberIdTripRecordMap(
+ tripRecordService.findTripRecordsWihMemberInMemberIds(memberIds)
+ );
 
- Map<Long, List<TripRecordScheduleVideoListItemResponseDto>> videoMap = getGroupByMemberIdVideoMap(memberIds);
+ Map<Long, List<TripRecordScheduleVideoListItemResponseDto>> videoMap = getGroupByMemberIdVideoMap(
+ tripRecordScheduleVideoService.getVideosInMemberIds(memberIds)
+ );
 
 
  return SliceResponseDto.<MemberDetailListItemResponseDto>builder()
@@ -82,14 +85,61 @@ public SliceResponseDto<MemberDetailListItemResponseDto> searchByNicknamePaginat
  .build();
  }
 
- private Map<Long, List<TripRecordScheduleVideoListItemResponseDto>> getGroupByMemberIdVideoMap(List<Long> memberIds) {
- return tripRecordScheduleVideoService.getVideosInMemberIds(memberIds)
+ public MemberCreatorInfoResponseDto getCreatorInfo(Long memberId) {
+ MemberSimpleResponseDto memberInfo = memberReadSearchService.getMemberSimpleInfo(memberId);
+
+ List<TripRecordScheduleVideoListItemResponseDto> videos = tripRecordScheduleVideoService.getVideosInMemberIds(List.of(memberId));
+ List<TripRecordListItemResponseDto> tripRecords = tripRecordService.findTripRecordsWihMemberInMemberIds(List.of(memberId));
+
+ return MemberCreatorInfoResponseDto.builder()
+ .memberDetailInfo(
+ MemberDetailListItemResponseDto.of(
+ memberInfo, tripRecords.size(), videos.size()
+ )
+ )
+ .videos(videos)
+ .tripRecords(tripRecords)
+ .build();
+ }
+
+ public List<MemberInfoWithTripRecordsResponseDto> listTopMemberCreators() {
+ List<MemberSimpleResponseDto> memberSimpleInfos = memberReadSearchService.listTopMemberSimpleInfos();
+ log.info("memberSimpleInfo");
+
+
+ Map<Long, List<TripRecordListItemResponseDto>> tripRecordMap = getGroupByMemberIdTripRecordMap(
+ tripRecordService.findTripRecordsWihMemberInMemberIds(
+ memberSimpleInfos
+ .stream()
+ .map(MemberSimpleResponseDto::memberId)
+ .toList()
+ )
+ );
+
+ return memberSimpleInfos.stream()
+ .map(memberInfo -> MemberInfoWithTripRecordsResponseDto.builder()
+ .memberInfo(memberInfo)
+ .tripRecords(
+ Objects.nonNull(tripRecordMap.get(memberInfo.memberId())) ?
+ tripRecordMap.get(memberInfo.memberId()) : new ArrayList<>()
+ )
+ .build()
+ )
+ .toList();
+ }
+
+ private Map<Long, List<TripRecordScheduleVideoListItemResponseDto>> getGroupByMemberIdVideoMap(
+ List<TripRecordScheduleVideoListItemResponseDto> tripRecordScheduleVideos
+ ) {
+ return tripRecordScheduleVideos
  .stream()
  .collect(Collectors.groupingBy(TripRecordScheduleVideoListItemResponseDto::memberId));
  }
 
- private Map<Long, List<TripRecordListItemResponseDto>> getGroupByMemberIdTripRecordMap(List<Long> memberIds) {
- return tripRecordService.findTripRecordsWihMemberInMemberIds(memberIds)
+ private Map<Long, List<TripRecordListItemResponseDto>> getGroupByMemberIdTripRecordMap(
+ List<TripRecordListItemResponseDto> tripRecords
+ ) {
+ return tripRecords
  .stream()
  .collect(Collectors.groupingBy(TripRecordListItemResponseDto::memberId));
  }

src/main/java/com/haejwo/tripcometrue/domain/member/service/MemberReadSearchService.java

@@ -0,0 +1,69 @@
+package com.haejwo.tripcometrue.domain.member.service;
+
+import com.haejwo.tripcometrue.domain.member.dto.response.MemberSimpleResponseDto;
+import com.haejwo.tripcometrue.domain.member.exception.UserNotFoundException;
+import com.haejwo.tripcometrue.domain.member.repository.MemberRepository;
+import com.haejwo.tripcometrue.domain.triprecordViewHistory.repository.TripRecordViewHistoryRepository;
+import com.haejwo.tripcometrue.global.util.SliceResponseDto;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Service
+public class MemberReadSearchService {
+
+ private final MemberRepository memberRepository;
+ private final TripRecordViewHistoryRepository tripRecordViewHistoryRepository;
+ private static final int HOME_TOP_CREATORS_SIZE = 10;
+
+ @Transactional(readOnly = true)
+ public MemberSimpleResponseDto getMemberSimpleInfo(Long memberId) {
+ return MemberSimpleResponseDto.fromEntity(
+ memberRepository.findById(memberId)
+ .orElseThrow(UserNotFoundException::new)
+ );
+ }
+
+ @Transactional(readOnly = true)
+ public List<MemberSimpleResponseDto> listTopMemberSimpleInfos() {
+ LocalDate current = LocalDate.now();
+ LocalDateTime start = current.minusDays(3).atStartOfDay();
+ LocalDateTime end = current.minusDays(1).atTime(23, 59, 59);
+
+ return tripRecordViewHistoryRepository
+ .findTopListMembers(start, end, HOME_TOP_CREATORS_SIZE)
+ .stream()
+ .map(dto -> MemberSimpleResponseDto.builder()
+ .memberId(dto.memberId())
+ .nickname(dto.nickname())
+ .introduction(dto.introduction())
+ .profileImageUrl(dto.profileImageUrl())
+ .build()
+ ).toList();
+ }
+
+ @Transactional(readOnly = true)
+ public List<MemberSimpleResponseDto> searchByNickname(String nickname) {
+ return memberRepository
+ .findByNicknameOrderByMemberRating(nickname)
+ .stream()
+ .map(MemberSimpleResponseDto::fromEntity)
+ .toList();
+ }
+
+ @Transactional(readOnly = true)
+ public SliceResponseDto<MemberSimpleResponseDto> searchByNickname(String nickname, Pageable pageable) {
+
+ return SliceResponseDto.of(
+ memberRepository
+ .findByNicknameOrderByMemberRating(nickname, pageable)
+ .map(MemberSimpleResponseDto::fromEntity)
+ );
+ }
+}