Skip to content

Commit

Permalink
[fix] 에러 발생 부분 주석 처리
Browse files Browse the repository at this point in the history
  • Loading branch information
ehyeok9 committed Nov 29, 2024
1 parent 5694d6c commit df58c4b
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 63 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

import com.whh.findmuseapi.art.dto.response.ArtHomeResponse;
import com.whh.findmuseapi.art.dto.ArtLikeRequest;
import com.whh.findmuseapi.art.dto.ArtListResponse;
import com.whh.findmuseapi.art.dto.ArtOneResponse;
//import com.whh.findmuseapi.art.dto.ArtListResponse;
//import com.whh.findmuseapi.art.dto.ArtOneResponse;
import com.whh.findmuseapi.art.dto.ArtTicketResponse;
import com.whh.findmuseapi.art.dto.response.ArtOneResponse;
import com.whh.findmuseapi.art.service.ArtService;
import com.whh.findmuseapi.common.constant.ResponseCode;
import com.whh.findmuseapi.common.util.ApiResponse;
Expand All @@ -23,11 +24,11 @@ public class ArtController {
/**
* 날짜, 장르, 정렬 필터 기준 문화예술 전체 불러오기
*/
@GetMapping("/art/list/condition/{userId}")
public ApiResponse<ArtListResponse> getArtByCondition(@PathVariable Long userId, @RequestParam String date, @RequestParam List<String> genre, @RequestParam String sort) {
ArtListResponse response = artService.getArtByCondition(userId, date, genre, sort);
return ApiResponse.createSuccess(ResponseCode.SUCCESS, response);
}
// @GetMapping("/art/list/condition/{userId}")
// public ApiResponse<ArtListResponse> getArtByCondition(@PathVariable Long userId, @RequestParam String date, @RequestParam List<String> genre, @RequestParam String sort) {
// ArtListResponse response = artService.getArtByCondition(userId, date, genre, sort);
// return ApiResponse.createSuccess(ResponseCode.SUCCESS, response);
// }

/**
* 취향 장르별 랜덤 3개 불러오기 - 홈화면
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,24 +63,24 @@ public ApiResponse<List<ArtHistoryResponse>> getUserArtHistory(
) {
return ApiResponse.createSuccess(ResponseCode.SUCCESS, userInfoService.getUserArtHistory(userId, artTypeInfo));
}

@Operation(summary = "마이페이지 : 행사 리뷰 조회")
@GetMapping("/reviews")
public ApiResponse<List<ReviewResponse>> getMyReview(
@AuthenticationPrincipal User user,
@RequestParam String creteria
) {
return ApiResponse.createSuccess(ResponseCode.SUCCESS, userInfoService.getMyReview(user, creteria));
}

@Operation(summary = "마이페이지 : 상대방 행사 리뷰 조회")
@GetMapping("/reviews/{userId}")
public ApiResponse<List<ReviewResponse>> getUserReview(
@PathVariable long userId,
@RequestParam String creteria
) {
return ApiResponse.createSuccess(ResponseCode.SUCCESS, userInfoService.getUserReview(userId, creteria));
}
//
// @Operation(summary = "마이페이지 : 행사 리뷰 조회")
// @GetMapping("/reviews")
// public ApiResponse<List<ReviewResponse>> getMyReview(
// @AuthenticationPrincipal User user,
// @RequestParam String creteria
// ) {
// return ApiResponse.createSuccess(ResponseCode.SUCCESS, userInfoService.getMyReview(user, creteria));
// }
//
// @Operation(summary = "마이페이지 : 상대방 행사 리뷰 조회")
// @GetMapping("/reviews/{userId}")
// public ApiResponse<List<ReviewResponse>> getUserReview(
// @PathVariable long userId,
// @RequestParam String creteria
// ) {
// return ApiResponse.createSuccess(ResponseCode.SUCCESS, userInfoService.getUserReview(userId, creteria));
// }

@Operation(summary = "마이페이지 : 사용자 취향 조회")
@GetMapping("/tastes/{userId}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,42 +138,42 @@ public List<ArtHistoryResponse> getUserArtHistory(long userId, String artTypeInf
return getMyArtHistory(user, artTypeInfo);
}

@Description("행사 리뷰 조회")
@Transactional(readOnly = true)
public List<ReviewResponse> getMyReview(User user, String creteria) {
Infos.ReviewSortType sortType = Infos.ReviewSortType.fromString(creteria);

List<Object[]> reviews;
if (sortType == Infos.ReviewSortType.LATEST) {
reviews = reviewRepository.findAllByUserOrderByCreateDateDesc(user.getId());
}
// else if (sortType == Infos.ReviewSortType.POPULAR) {
// reviews = reviewRepository.findAllByUserOrderByLikeCountDesc(user.getId());
// @Description("행사 리뷰 조회")
// @Transactional(readOnly = true)
// public List<ReviewResponse> getMyReview(User user, String creteria) {
// Infos.ReviewSortType sortType = Infos.ReviewSortType.fromString(creteria);
//
// List<Object[]> reviews;
// if (sortType == Infos.ReviewSortType.LATEST) {
// reviews = reviewRepository.findAllByUserOrderByCreateDateDesc(user.getId());
// }
else {
throw new IllegalArgumentException("지원되지 않는 정렬 기준입니다.");
}

return reviews.stream()
.map(r -> {
ArtReview review = (ArtReview) r[0];
ArtReviewLike reviewLike = (ArtReviewLike) r[1];
return ReviewResponse.toDto(review, reviewLike);
})
.toList();
}

@Description("상대방 행사 리뷰 조회")
@Transactional(readOnly = true)
public List<ReviewResponse> getUserReview(long userId, String creteria) {
User user = userRepository.findById(userId)
.orElseThrow(() -> new RuntimeException("유저를 찾을 수 없습니다."));

if (!user.isShowStatus()) {
throw new RuntimeException("감상내역 비공개 뮤즈에요!");
}
return getMyReview(user, creteria);
}
//// else if (sortType == Infos.ReviewSortType.POPULAR) {
//// reviews = reviewRepository.findAllByUserOrderByLikeCountDesc(user.getId());
//// }
// else {
// throw new IllegalArgumentException("지원되지 않는 정렬 기준입니다.");
// }
//
// return reviews.stream()
// .map(r -> {
// ArtReview review = (ArtReview) r[0];
// ArtReviewLike reviewLike = (ArtReviewLike) r[1];
// return ReviewResponse.toDto(review, reviewLike);
// })
// .toList();
// }

// @Description("상대방 행사 리뷰 조회")
// @Transactional(readOnly = true)
// public List<ReviewResponse> getUserReview(long userId, String creteria) {
// User user = userRepository.findById(userId)
// .orElseThrow(() -> new RuntimeException("유저를 찾을 수 없습니다."));
//
// if (!user.isShowStatus()) {
// throw new RuntimeException("감상내역 비공개 뮤즈에요!");
// }
// return getMyReview(user, creteria);
// }

@Description("레벨 자세히보기")
@Transactional(readOnly = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,14 @@ public class DataInitializer implements CommandLineRunner {

@Override
public void run(String... args) throws Exception {
// 사용자 정보 생성
// User user = User.builder()
// .email("[email protected]")
// .nickname("이혁규")
// .role(Infos.Role.USER)
// .accountId("test_user2")
// .refreshToken("testRefreshToken2")
// .build();

// 사용자 저장
//
// userRepository.save(user);
}
}

0 comments on commit df58c4b

Please sign in to comment.