Skip to content

Commit

Permalink
Style: 코드 리포매팅
Browse files Browse the repository at this point in the history
  • Loading branch information
onetuks committed Dec 10, 2023
1 parent 2736679 commit 7ba1f97
Show file tree
Hide file tree
Showing 17 changed files with 39 additions and 49 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ public ResponseEntity<AcademyGetResponse> 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));
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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],
Expand All @@ -81,7 +79,6 @@ public AcademiesByLocationWithScroll findAcademiesByLocation(
))
.getResultList();


return AcademiesByLocationWithScroll.of(
academiesByLocation,
isHasNest(academiesByLocation.size(), pageSize)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<AcademyByLocation,List<Long>> academiesByLocation,
Map<AcademyByLocation, List<Long>> academiesByLocation,
boolean hasNext
) {

Expand All @@ -18,7 +17,8 @@ public static AcademiesByLocationWithScroll of(
Map<AcademyByLocation, List<Long>> 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());
});

Expand All @@ -27,6 +27,7 @@ public static AcademiesByLocationWithScroll of(
hasNext
);
}

public record AcademyByLocation(
Long academyId,
String academyName,
Expand All @@ -37,6 +38,7 @@ public record AcademyByLocation(
String shuttleAvailable,
boolean isLiked
) {

public static AcademyByLocation of(AcademyByLocationWithScroll academyByLocationWithScroll) {
return new AcademyByLocation(
academyByLocationWithScroll.academyId(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.guzzing.studayserver.domain.academy.repository.dto;

import java.util.Objects;

public record AcademyByLocationWithScroll(
Long academyId,
String academyName,
Expand All @@ -13,4 +11,5 @@ public record AcademyByLocationWithScroll(
boolean isLiked,
Long categoryId
) {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand All @@ -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());
}

Expand All @@ -39,8 +37,9 @@ public record AcademiesByLocationResultWithScroll(
boolean isLiked
) {

public static AcademiesByLocationResultWithScroll from(AcademiesByLocationWithScroll.AcademyByLocation academyByLocationWithScroll,
List<Long> categories) {
public static AcademiesByLocationResultWithScroll from(
AcademiesByLocationWithScroll.AcademyByLocation academyByLocationWithScroll,
List<Long> categories) {
return new AcademiesByLocationResultWithScroll(
academyByLocationWithScroll.academyId(),
academyByLocationWithScroll.academyName(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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)
Expand Down Expand Up @@ -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())
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down

0 comments on commit 7ba1f97

Please sign in to comment.