From 7ba1f97c67fb5ecb5b05ebfa08d81bf7ee2d95e8 Mon Sep 17 00:00:00 2001 From: SeYoE Date: Mon, 11 Dec 2023 03:23:49 +0900 Subject: [PATCH] =?UTF-8?q?Style:=20=EC=BD=94=EB=93=9C=20=EB=A6=AC?= =?UTF-8?q?=ED=8F=AC=EB=A7=A4=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../academy/controller/AcademyController.java | 3 ++- .../dto/response/AcademyGetResponse.java | 2 -- .../domain/academy/facade/AcademyFacade.java | 3 ++- .../facade/dto/AcademyDetailFacadeResult.java | 3 +-- .../academy/AcademyQueryRepositoryImpl.java | 5 +---- .../dto/AcademiesByLocationWithScroll.java | 8 ++++--- .../dto/AcademyByLocationWithScroll.java | 3 +-- .../academy/service/AcademyService.java | 8 +++---- .../AcademiesByLocationWithScrollResults.java | 21 +++++++++---------- .../studayserver/domain/like/model/Like.java | 2 -- .../academy/facade/AcademyFacadeTest.java | 11 +++++----- .../DashboardRestControllerTest.java | 4 ++-- .../dashboard/facade/DashboardFacadeTest.java | 2 +- .../service/DashboardServiceTest.java | 2 +- .../controller/ReviewRestControllerTest.java | 1 - .../fixture/academy/AcademyFixture.java | 6 +++--- .../fixture/member/MemberFixture.java | 4 ---- 17 files changed, 39 insertions(+), 49 deletions(-) diff --git a/src/main/java/org/guzzing/studayserver/domain/academy/controller/AcademyController.java b/src/main/java/org/guzzing/studayserver/domain/academy/controller/AcademyController.java index 00fbff40..53670988 100644 --- a/src/main/java/org/guzzing/studayserver/domain/academy/controller/AcademyController.java +++ b/src/main/java/org/guzzing/studayserver/domain/academy/controller/AcademyController.java @@ -46,7 +46,8 @@ public ResponseEntity getAcademy( @PathVariable Long academyId, @MemberId Long memberId ) { - AcademyDetailFacadeResult detailAcademy = academyFacade.getDetailAcademy(AcademyDetailFacadeParam.of(memberId, academyId)); + AcademyDetailFacadeResult detailAcademy = academyFacade.getDetailAcademy( + AcademyDetailFacadeParam.of(memberId, academyId)); return ResponseEntity.status(HttpStatus.OK) .body(AcademyGetResponse.from(detailAcademy)); diff --git a/src/main/java/org/guzzing/studayserver/domain/academy/controller/dto/response/AcademyGetResponse.java b/src/main/java/org/guzzing/studayserver/domain/academy/controller/dto/response/AcademyGetResponse.java index 6bec68ce..604dd681 100644 --- a/src/main/java/org/guzzing/studayserver/domain/academy/controller/dto/response/AcademyGetResponse.java +++ b/src/main/java/org/guzzing/studayserver/domain/academy/controller/dto/response/AcademyGetResponse.java @@ -1,9 +1,7 @@ package org.guzzing.studayserver.domain.academy.controller.dto.response; import java.util.List; - import org.guzzing.studayserver.domain.academy.facade.dto.AcademyDetailFacadeResult; -import org.guzzing.studayserver.domain.academy.service.dto.result.AcademyGetResult; public record AcademyGetResponse( String academyName, diff --git a/src/main/java/org/guzzing/studayserver/domain/academy/facade/AcademyFacade.java b/src/main/java/org/guzzing/studayserver/domain/academy/facade/AcademyFacade.java index dd5a2b2a..9bf9ea52 100644 --- a/src/main/java/org/guzzing/studayserver/domain/academy/facade/AcademyFacade.java +++ b/src/main/java/org/guzzing/studayserver/domain/academy/facade/AcademyFacade.java @@ -28,7 +28,8 @@ public AcademyFacade(RegionService regionService, AcademyService academyService, } @Transactional(readOnly = true) - public AcademiesByLocationWithScrollFacadeResult findByLocationWithScroll(AcademiesByLocationWithScrollFacadeParam param) { + public AcademiesByLocationWithScrollFacadeResult findByLocationWithScroll( + AcademiesByLocationWithScrollFacadeParam param) { AcademiesByLocationWithScrollResults academiesByLocationWithScroll = academyService.findAcademiesByLocationWithScroll( AcademiesByLocationWithScrollFacadeParam.to(param)); diff --git a/src/main/java/org/guzzing/studayserver/domain/academy/facade/dto/AcademyDetailFacadeResult.java b/src/main/java/org/guzzing/studayserver/domain/academy/facade/dto/AcademyDetailFacadeResult.java index 6b116878..a8d6d1ae 100644 --- a/src/main/java/org/guzzing/studayserver/domain/academy/facade/dto/AcademyDetailFacadeResult.java +++ b/src/main/java/org/guzzing/studayserver/domain/academy/facade/dto/AcademyDetailFacadeResult.java @@ -1,11 +1,10 @@ package org.guzzing.studayserver.domain.academy.facade.dto; +import java.util.List; import org.guzzing.studayserver.domain.academy.service.dto.result.AcademyGetResult; import org.guzzing.studayserver.domain.academy.service.dto.result.LessonGetResults; import org.guzzing.studayserver.domain.academy.service.dto.result.ReviewPercentGetResult; -import java.util.List; - public record AcademyDetailFacadeResult( String academyName, String contact, diff --git a/src/main/java/org/guzzing/studayserver/domain/academy/repository/academy/AcademyQueryRepositoryImpl.java b/src/main/java/org/guzzing/studayserver/domain/academy/repository/academy/AcademyQueryRepositoryImpl.java index 6a816086..7f199218 100644 --- a/src/main/java/org/guzzing/studayserver/domain/academy/repository/academy/AcademyQueryRepositoryImpl.java +++ b/src/main/java/org/guzzing/studayserver/domain/academy/repository/academy/AcademyQueryRepositoryImpl.java @@ -2,9 +2,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.Query; - import java.util.List; - import org.guzzing.studayserver.domain.academy.repository.dto.AcademiesByFilterWithScroll; import org.guzzing.studayserver.domain.academy.repository.dto.AcademiesByLocationWithScroll; import org.guzzing.studayserver.domain.academy.repository.dto.AcademyByFilterWithScroll; @@ -67,7 +65,7 @@ public AcademiesByLocationWithScroll findAcademiesByLocation( .addScalar("longitude", StandardBasicTypes.DOUBLE) .addScalar("shuttleAvailable", StandardBasicTypes.STRING) .addScalar("isLiked", StandardBasicTypes.BOOLEAN) - .addScalar("categoryId",StandardBasicTypes.LONG) + .addScalar("categoryId", StandardBasicTypes.LONG) .setResultTransformer((tuple, aliases) -> new AcademyByLocationWithScroll( (Long) tuple[0], (String) tuple[1], @@ -81,7 +79,6 @@ public AcademiesByLocationWithScroll findAcademiesByLocation( )) .getResultList(); - return AcademiesByLocationWithScroll.of( academiesByLocation, isHasNest(academiesByLocation.size(), pageSize) diff --git a/src/main/java/org/guzzing/studayserver/domain/academy/repository/dto/AcademiesByLocationWithScroll.java b/src/main/java/org/guzzing/studayserver/domain/academy/repository/dto/AcademiesByLocationWithScroll.java index e83c672c..1fa6b3c9 100644 --- a/src/main/java/org/guzzing/studayserver/domain/academy/repository/dto/AcademiesByLocationWithScroll.java +++ b/src/main/java/org/guzzing/studayserver/domain/academy/repository/dto/AcademiesByLocationWithScroll.java @@ -3,11 +3,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; public record AcademiesByLocationWithScroll( - Map> academiesByLocation, + Map> academiesByLocation, boolean hasNext ) { @@ -18,7 +17,8 @@ public static AcademiesByLocationWithScroll of( Map> academyIdWithCategories = new ConcurrentHashMap<>(); academiesByLocation.forEach(academyByLocationWithScroll -> { - academyIdWithCategories.computeIfAbsent(AcademyByLocation.of(academyByLocationWithScroll), k -> new ArrayList<>()) + academyIdWithCategories.computeIfAbsent(AcademyByLocation.of(academyByLocationWithScroll), + k -> new ArrayList<>()) .add(academyByLocationWithScroll.categoryId()); }); @@ -27,6 +27,7 @@ public static AcademiesByLocationWithScroll of( hasNext ); } + public record AcademyByLocation( Long academyId, String academyName, @@ -37,6 +38,7 @@ public record AcademyByLocation( String shuttleAvailable, boolean isLiked ) { + public static AcademyByLocation of(AcademyByLocationWithScroll academyByLocationWithScroll) { return new AcademyByLocation( academyByLocationWithScroll.academyId(), diff --git a/src/main/java/org/guzzing/studayserver/domain/academy/repository/dto/AcademyByLocationWithScroll.java b/src/main/java/org/guzzing/studayserver/domain/academy/repository/dto/AcademyByLocationWithScroll.java index fc948a9d..5db34668 100644 --- a/src/main/java/org/guzzing/studayserver/domain/academy/repository/dto/AcademyByLocationWithScroll.java +++ b/src/main/java/org/guzzing/studayserver/domain/academy/repository/dto/AcademyByLocationWithScroll.java @@ -1,7 +1,5 @@ package org.guzzing.studayserver.domain.academy.repository.dto; -import java.util.Objects; - public record AcademyByLocationWithScroll( Long academyId, String academyName, @@ -13,4 +11,5 @@ public record AcademyByLocationWithScroll( boolean isLiked, Long categoryId ) { + } diff --git a/src/main/java/org/guzzing/studayserver/domain/academy/service/AcademyService.java b/src/main/java/org/guzzing/studayserver/domain/academy/service/AcademyService.java index be02a66c..8480fcae 100644 --- a/src/main/java/org/guzzing/studayserver/domain/academy/service/AcademyService.java +++ b/src/main/java/org/guzzing/studayserver/domain/academy/service/AcademyService.java @@ -3,7 +3,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import org.guzzing.studayserver.domain.academy.model.Academy; import org.guzzing.studayserver.domain.academy.model.Lesson; import org.guzzing.studayserver.domain.academy.repository.academy.AcademyRepository; @@ -40,8 +39,8 @@ public class AcademyService { private final AcademyCategoryRepository academyCategoryRepository; public AcademyService(AcademyRepository academyRepository, LessonRepository lessonRepository, - ReviewCountRepository reviewCountRepository, - AcademyCategoryRepository academyCategoryRepository) { + ReviewCountRepository reviewCountRepository, + AcademyCategoryRepository academyCategoryRepository) { this.academyRepository = academyRepository; this.lessonRepository = lessonRepository; this.reviewCountRepository = reviewCountRepository; @@ -68,7 +67,8 @@ public AcademyGetResult getAcademy(Long academyId) { } @Transactional(readOnly = true) - public AcademiesByLocationWithScrollResults findAcademiesByLocationWithScroll(AcademiesByLocationWithScrollParam param) { + public AcademiesByLocationWithScrollResults findAcademiesByLocationWithScroll( + AcademiesByLocationWithScrollParam param) { String diagonal = GeometryUtil.makeDiagonal(param.baseLatitude(), param.baseLongitude(), DISTANCE); AcademiesByLocationWithScroll academiesByLocation = academyRepository.findAcademiesByLocation( diff --git a/src/main/java/org/guzzing/studayserver/domain/academy/service/dto/result/AcademiesByLocationWithScrollResults.java b/src/main/java/org/guzzing/studayserver/domain/academy/service/dto/result/AcademiesByLocationWithScrollResults.java index 05b9981a..678a0ad1 100644 --- a/src/main/java/org/guzzing/studayserver/domain/academy/service/dto/result/AcademiesByLocationWithScrollResults.java +++ b/src/main/java/org/guzzing/studayserver/domain/academy/service/dto/result/AcademiesByLocationWithScrollResults.java @@ -1,9 +1,7 @@ package org.guzzing.studayserver.domain.academy.service.dto.result; import java.util.List; -import java.util.Map; import org.guzzing.studayserver.domain.academy.repository.dto.AcademiesByLocationWithScroll; -import org.guzzing.studayserver.domain.academy.repository.dto.AcademyByLocationWithScroll; import org.guzzing.studayserver.domain.academy.util.CategoryInfo; public record AcademiesByLocationWithScrollResults( @@ -17,13 +15,13 @@ public static AcademiesByLocationWithScrollResults to( academiesByLocationWithScroll .academiesByLocation() .keySet() - .stream() - .map(academyByLocation-> - AcademiesByLocationResultWithScroll.from( - academyByLocation, - academiesByLocationWithScroll.academiesByLocation(). - get(academyByLocation))) - .toList(), + .stream() + .map(academyByLocation -> + AcademiesByLocationResultWithScroll.from( + academyByLocation, + academiesByLocationWithScroll.academiesByLocation(). + get(academyByLocation))) + .toList(), academiesByLocationWithScroll.hasNext()); } @@ -39,8 +37,9 @@ public record AcademiesByLocationResultWithScroll( boolean isLiked ) { - public static AcademiesByLocationResultWithScroll from(AcademiesByLocationWithScroll.AcademyByLocation academyByLocationWithScroll, - List categories) { + public static AcademiesByLocationResultWithScroll from( + AcademiesByLocationWithScroll.AcademyByLocation academyByLocationWithScroll, + List categories) { return new AcademiesByLocationResultWithScroll( academyByLocationWithScroll.academyId(), academyByLocationWithScroll.academyName(), diff --git a/src/main/java/org/guzzing/studayserver/domain/like/model/Like.java b/src/main/java/org/guzzing/studayserver/domain/like/model/Like.java index c9423bb6..4c9f7258 100644 --- a/src/main/java/org/guzzing/studayserver/domain/like/model/Like.java +++ b/src/main/java/org/guzzing/studayserver/domain/like/model/Like.java @@ -3,9 +3,7 @@ import static jakarta.persistence.FetchType.LAZY; import static lombok.AccessLevel.PROTECTED; -import jakarta.persistence.Column; import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; diff --git a/src/test/java/org/guzzing/studayserver/domain/academy/facade/AcademyFacadeTest.java b/src/test/java/org/guzzing/studayserver/domain/academy/facade/AcademyFacadeTest.java index 2d28724d..b8e9aedd 100644 --- a/src/test/java/org/guzzing/studayserver/domain/academy/facade/AcademyFacadeTest.java +++ b/src/test/java/org/guzzing/studayserver/domain/academy/facade/AcademyFacadeTest.java @@ -1,5 +1,9 @@ package org.guzzing.studayserver.domain.academy.facade; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE; + import jakarta.transaction.Transactional; import org.guzzing.studayserver.domain.academy.facade.dto.AcademyDetailFacadeParam; import org.guzzing.studayserver.domain.academy.facade.dto.AcademyDetailFacadeResult; @@ -24,10 +28,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertAll; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE; - @Transactional @SpringBootTest(webEnvironment = NONE) @Import(TestDatabaseConfig.class) @@ -103,7 +103,8 @@ void getDetailAcademy() { () -> assertThat(detailAcademy.contact()).isEqualTo(savedAcademyAboutSungnam.getContact()), () -> assertThat(detailAcademy.expectedFee()).isEqualTo(savedAcademyAboutSungnam.getMaxEducationFee()), () -> assertThat(detailAcademy.fullAddress()).isEqualTo(savedAcademyAboutSungnam.getFullAddress()), - () -> assertThat(detailAcademy.shuttleAvailability()).isEqualTo(savedAcademyAboutSungnam.getShuttleAvailability()) + () -> assertThat(detailAcademy.shuttleAvailability()).isEqualTo( + savedAcademyAboutSungnam.getShuttleAvailability()) ); } diff --git a/src/test/java/org/guzzing/studayserver/domain/dashboard/controller/DashboardRestControllerTest.java b/src/test/java/org/guzzing/studayserver/domain/dashboard/controller/DashboardRestControllerTest.java index cf94a744..895b5852 100644 --- a/src/test/java/org/guzzing/studayserver/domain/dashboard/controller/DashboardRestControllerTest.java +++ b/src/test/java/org/guzzing/studayserver/domain/dashboard/controller/DashboardRestControllerTest.java @@ -34,11 +34,11 @@ import org.guzzing.studayserver.domain.child.service.ChildAccessService; import org.guzzing.studayserver.domain.dashboard.controller.dto.request.DashboardPostRequest; import org.guzzing.studayserver.domain.dashboard.controller.dto.request.DashboardPutRequest; -import org.guzzing.studayserver.testutil.JwtTestConfig; -import org.guzzing.studayserver.testutil.fixture.dashboard.DashboardFixture; import org.guzzing.studayserver.domain.dashboard.model.Dashboard; import org.guzzing.studayserver.domain.member.service.MemberAccessService; +import org.guzzing.studayserver.testutil.JwtTestConfig; import org.guzzing.studayserver.testutil.WithMockCustomOAuth2LoginUser; +import org.guzzing.studayserver.testutil.fixture.dashboard.DashboardFixture; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/guzzing/studayserver/domain/dashboard/facade/DashboardFacadeTest.java b/src/test/java/org/guzzing/studayserver/domain/dashboard/facade/DashboardFacadeTest.java index 3222b40b..339bf154 100644 --- a/src/test/java/org/guzzing/studayserver/domain/dashboard/facade/DashboardFacadeTest.java +++ b/src/test/java/org/guzzing/studayserver/domain/dashboard/facade/DashboardFacadeTest.java @@ -13,12 +13,12 @@ import org.guzzing.studayserver.domain.dashboard.facade.dto.DashboardPatchResult; import org.guzzing.studayserver.domain.dashboard.facade.dto.DashboardPostResult; import org.guzzing.studayserver.domain.dashboard.facade.dto.DashboardPutResult; -import org.guzzing.studayserver.testutil.fixture.dashboard.DashboardFixture; import org.guzzing.studayserver.domain.dashboard.model.Dashboard; import org.guzzing.studayserver.domain.dashboard.service.dto.request.DashboardPostParam; import org.guzzing.studayserver.domain.dashboard.service.dto.request.DashboardPutParam; import org.guzzing.studayserver.domain.member.service.MemberAccessService; import org.guzzing.studayserver.global.exception.DashboardException; +import org.guzzing.studayserver.testutil.fixture.dashboard.DashboardFixture; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/guzzing/studayserver/domain/dashboard/service/DashboardServiceTest.java b/src/test/java/org/guzzing/studayserver/domain/dashboard/service/DashboardServiceTest.java index 7c77ac82..13d8b6fa 100644 --- a/src/test/java/org/guzzing/studayserver/domain/dashboard/service/DashboardServiceTest.java +++ b/src/test/java/org/guzzing/studayserver/domain/dashboard/service/DashboardServiceTest.java @@ -6,12 +6,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.guzzing.studayserver.testutil.fixture.dashboard.DashboardFixture; import org.guzzing.studayserver.domain.dashboard.model.Dashboard; import org.guzzing.studayserver.domain.dashboard.service.dto.request.DashboardPostParam; import org.guzzing.studayserver.domain.dashboard.service.dto.request.DashboardPutParam; import org.guzzing.studayserver.domain.dashboard.service.dto.response.DashboardResult; import org.guzzing.studayserver.global.exception.DashboardException; +import org.guzzing.studayserver.testutil.fixture.dashboard.DashboardFixture; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/guzzing/studayserver/domain/review/controller/ReviewRestControllerTest.java b/src/test/java/org/guzzing/studayserver/domain/review/controller/ReviewRestControllerTest.java index 0f8045a0..06bacb84 100644 --- a/src/test/java/org/guzzing/studayserver/domain/review/controller/ReviewRestControllerTest.java +++ b/src/test/java/org/guzzing/studayserver/domain/review/controller/ReviewRestControllerTest.java @@ -2,7 +2,6 @@ import static com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper.document; import static com.epages.restdocs.apispec.ResourceDocumentation.resource; -import static com.nimbusds.oauth2.sdk.token.AccessTokenType.BEARER; import static org.guzzing.studayserver.testutil.JwtTestConfig.AUTHORIZATION_HEADER; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName; diff --git a/src/test/java/org/guzzing/studayserver/testutil/fixture/academy/AcademyFixture.java b/src/test/java/org/guzzing/studayserver/testutil/fixture/academy/AcademyFixture.java index 7b054bbc..d5178437 100644 --- a/src/test/java/org/guzzing/studayserver/testutil/fixture/academy/AcademyFixture.java +++ b/src/test/java/org/guzzing/studayserver/testutil/fixture/academy/AcademyFixture.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; - import org.guzzing.studayserver.domain.academy.facade.dto.AcademyDetailFacadeParam; import org.guzzing.studayserver.domain.academy.model.Academy; import org.guzzing.studayserver.domain.academy.model.AcademyCategory; @@ -114,8 +113,9 @@ public static ReviewCount reviewCountDefault(Academy academy) { return ReviewCount.makeDefaultReviewCount(academy); } - public static AcademiesByLocationWithScrollParam academiesByLocationWithScrollParam(double latitude, double longitude) { - return AcademiesByLocationWithScrollParam.of(latitude, longitude, 1L,0 ); + public static AcademiesByLocationWithScrollParam academiesByLocationWithScrollParam(double latitude, + double longitude) { + return AcademiesByLocationWithScrollParam.of(latitude, longitude, 1L, 0); } public static AcademyFilterWithScrollParam academyFilterWithScrollParam( diff --git a/src/test/java/org/guzzing/studayserver/testutil/fixture/member/MemberFixture.java b/src/test/java/org/guzzing/studayserver/testutil/fixture/member/MemberFixture.java index e2803d7d..6eac25eb 100644 --- a/src/test/java/org/guzzing/studayserver/testutil/fixture/member/MemberFixture.java +++ b/src/test/java/org/guzzing/studayserver/testutil/fixture/member/MemberFixture.java @@ -4,10 +4,6 @@ import org.guzzing.studayserver.domain.member.model.NickName; import org.guzzing.studayserver.domain.member.model.vo.MemberProvider; import org.guzzing.studayserver.domain.member.model.vo.RoleType; -import org.guzzing.studayserver.domain.member.repository.MemberRepository; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; public class MemberFixture {