From 4f9b7141572e6c600885e28890250eb5e95586e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=90=ED=99=8D=EC=84=9D?= <78216059+bayy1216@users.noreply.github.com> Date: Sun, 2 Jun 2024 17:30:41 +0900 Subject: [PATCH] =?UTF-8?q?[Feat]:=20=EC=BD=94=EB=93=9C=20=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../review/ChallengeReviewController.java | 6 +++--- .../challengegroup/review/ChallengeReviewRes.java | 6 +++--- .../zzansuni/infrastructure/S3ImageUploader.java | 2 +- .../challengegroup/challenge/ChallengeRepository.java | 11 ----------- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/review/ChallengeReviewController.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/review/ChallengeReviewController.java index 5ec7f39..d375b9f 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/review/ChallengeReviewController.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/review/ChallengeReviewController.java @@ -45,7 +45,7 @@ public ApiResponse> getCha @Operation(summary = "챌린지 그룹 리뷰 페이징", description = "챌린지 그룹 하위의 모든 챌린지 리뷰 페이징 조회.") @GetMapping("/api/challengeGroups/{challengeGroupId}/reviews") - public ApiResponse> getChallengeReviewsPaging( + public ApiResponse> getChallengeReviewsPaging( @PathVariable Long challengeGroupId, @Valid PagingRequest pagingRequest //TODO SORTING @@ -53,8 +53,8 @@ public ApiResponse page = challengeService.getChallengeReviewsByGroupId( challengeGroupId, pagingRequest.toPageable()); - PagingResponse response = PagingResponse.from( - page, ChallengeReviewRes.ChallengeReviewWithChalengeDto::from + PagingResponse response = PagingResponse.from( + page, ChallengeReviewRes.ChallengeReviewWithChallengeDto::from ); return ApiResponse.success(response); diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/review/ChallengeReviewRes.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/review/ChallengeReviewRes.java index 4a211f3..3e95dd0 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/review/ChallengeReviewRes.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/review/ChallengeReviewRes.java @@ -34,7 +34,7 @@ public static ChallengeReviewDto from( } @Builder - public record ChallengeReviewWithChalengeDto( + public record ChallengeReviewWithChallengeDto( Long challengeId, String challengeTitle, Integer challengeDifficulty, @@ -43,10 +43,10 @@ public record ChallengeReviewWithChalengeDto( Integer rating ) { - public static ChallengeReviewWithChalengeDto from( + public static ChallengeReviewWithChallengeDto from( ChallengeReviewWithChallenge challengeReviewWithChallenge) { var user = UserRes.UserDto.from(challengeReviewWithChallenge.user()); - return ChallengeReviewWithChalengeDto.builder() + return ChallengeReviewWithChallengeDto.builder() .challengeId(challengeReviewWithChallenge.challengeId()) .challengeTitle(challengeReviewWithChallenge.challengeTitle()) .challengeDifficulty(challengeReviewWithChallenge.challengeDifficulty()) diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/S3ImageUploader.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/S3ImageUploader.java index 3600854..3be5398 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/S3ImageUploader.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/S3ImageUploader.java @@ -36,7 +36,7 @@ public String upload(MultipartFile imageFile) { : ""; // 고유한 파일 이름을 생성합니다. - String uniqueFilename = UUID.randomUUID().toString() + extension; + String uniqueFilename = UUID.randomUUID() + extension; // 파일의 InputStream을 가져옵니다. try-with-resources 문을 사용하여 InputStream을 자동으로 닫습니다. try (InputStream inputStream = imageFile.getInputStream()) { diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/challenge/ChallengeRepository.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/challenge/ChallengeRepository.java index f2e8f75..af3b667 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/challenge/ChallengeRepository.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/challenge/ChallengeRepository.java @@ -5,16 +5,5 @@ public interface ChallengeRepository extends JpaRepository { -// /** -// * userId로 현재 진행중인 챌린지 조회
userId로 챌린지를 가져온다. -// */ -// @Query( -// "SELECT new org.haedal.zzansuni.infrastructure.challengegroup.challenge.dto.ChallengeCurrentDto(" -// + "c.id, c.title, ," -// + " c.startDate, c.endDate," -// + " c.participantCount, c.participantLimit, c.status, c.user.id, c.user.nickname, c.user.profileImage) " -// + "FROM Challenge c WHERE c.user.id = :userId") -// Page findAllChallengeCurrent(Long userId, Pageable pageable); - }