From 433cb4ac53c5188db65523f4207a04dd1983e694 Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 14:54:51 +0900 Subject: [PATCH 01/13] =?UTF-8?q?refactor:=20Open=20API=20=ED=99=9C?= =?UTF-8?q?=EC=9A=A9=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/service/OpenApiService.java | 43 ++++++------------- 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/fc/shimpyo_be/domain/product/service/OpenApiService.java b/src/main/java/com/fc/shimpyo_be/domain/product/service/OpenApiService.java index a579b4b9..94918113 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/product/service/OpenApiService.java +++ b/src/main/java/com/fc/shimpyo_be/domain/product/service/OpenApiService.java @@ -22,7 +22,6 @@ import java.nio.charset.StandardCharsets; import java.time.LocalTime; import java.util.ArrayList; -import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.json.JSONArray; @@ -70,8 +69,7 @@ public void init() { @Transactional public void getData(int pageSize, int pageNum) throws JSONException { try { - JSONArray stayArr = getAccommodation(pageSize, pageNum).getJSONObject("items") - .getJSONArray("item"); + JSONArray stayArr = getItems(getAccommodation(pageSize, pageNum)); for (int j = 0; j < stayArr.length(); j++) { try { @@ -96,12 +94,13 @@ public void getData(int pageSize, int pageNum) throws JSONException { saveProductImages(product, images); saveRooms(product, introItem, rooms); } catch (InvalidDataException e) { + log.debug("[OpenAPI] " + stayArr); log.error(e.getMessage()); - log.info("다음 숙소를 조회합니다."); + log.info("[OpenAPI] 다음 숙소를 조회합니다."); } } } catch (Exception e) { - log.error(e.getMessage()); + log.error("[OpenAPI] " + e.getMessage()); throw new OpenApiException(); } } @@ -128,11 +127,7 @@ private JSONObject getAccommodation(int pageSize, int pageNum) throws JSONExcept .build(true).toUri(); ResponseEntity response = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, String.class); - log.info("숙박 정보 조회"); - log.info(response.toString()); - return new JSONObject(response.getBody()) - .getJSONObject("response") - .getJSONObject("body"); + return getBody(response.getBody()); } private JSONObject getCommon(long contentId) throws JSONException { @@ -148,10 +143,7 @@ private JSONObject getCommon(long contentId) throws JSONException { .build(true).toUri(); ResponseEntity commonResponse = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, String.class); - log.info(contentId + "번 데이터 공통 정보 조회" + commonResponse.getBody()); - return new JSONObject(commonResponse.getBody()) - .getJSONObject("response") - .getJSONObject("body"); + return getBody(commonResponse.getBody()); } private JSONObject getIntro(long contentId) throws JSONException { @@ -162,10 +154,7 @@ private JSONObject getIntro(long contentId) throws JSONException { .build(true).toUri(); ResponseEntity introResponse = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, String.class); - log.info(contentId + "번 데이터 소개 정보 조회" + introResponse.getBody()); - return new JSONObject(introResponse.getBody()) - .getJSONObject("response") - .getJSONObject("body"); + return getBody(introResponse.getBody()); } private JSONObject getInfo(long contentId) throws JSONException { @@ -176,10 +165,7 @@ private JSONObject getInfo(long contentId) throws JSONException { .build(true).toUri(); ResponseEntity infoResponse = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, String.class); - log.info(contentId + "번 데이터 반복 정보 조회" + infoResponse.getBody()); - return new JSONObject(infoResponse.getBody()) - .getJSONObject("response") - .getJSONObject("body"); + return getBody(infoResponse.getBody()); } private JSONObject getImages(long contentId) throws JSONException { @@ -191,16 +177,17 @@ private JSONObject getImages(long contentId) throws JSONException { .build(true).toUri(); ResponseEntity imageResponse = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, String.class); - log.info(contentId + "번 데이터 이미지 정보 조회" + imageResponse.getBody()); - return new JSONObject(imageResponse.getBody()) - .getJSONObject("response") - .getJSONObject("body"); + return getBody(imageResponse.getBody()); } private JSONArray getItems(JSONObject jsonObject) { return jsonObject.getJSONObject("items").getJSONArray("item"); } + private JSONObject getBody(String source) { + return new JSONObject(source).getJSONObject("response").getJSONObject("body"); + } + private boolean hasRoom(JSONArray info) throws JSONException { boolean hasRoom = false; for (int i = 0; i < info.length(); i++) { @@ -234,7 +221,6 @@ private Product saveProduct(JSONObject base, JSONObject common, JSONObject intro .sports(intro.get("sports").equals("1")) .seminar(intro.get("seminar").equals("1")) .build(); - Product product = Product.builder() .name(base.getString("title")) .address( @@ -257,7 +243,6 @@ private Product saveProduct(JSONObject base, JSONObject common, JSONObject intro } private void saveProductImages(Product product, JSONArray images) { - List productImages = new ArrayList<>(); for (int k = 0; k < images.length(); k++) { productImageRepository.save(ProductImage.builder() .product(product) @@ -274,13 +259,11 @@ private void saveRooms(Product product, JSONObject intro, JSONArray info) throws } if (Integer.parseInt(roomJson.getString("roomcount")) != 0) { for (int j = 0; j < Integer.parseInt(roomJson.getString("roomcount")); j++) { - System.out.println(intro.toString()); String[] stringCheckIn = intro.getString("checkintime").split(":|;|시"); String[] stringCheckOut = intro.getString("checkouttime").split(":|;|시"); LocalTime checkIn = getTimeFromString(stringCheckIn); LocalTime checkOut = getTimeFromString(stringCheckOut); - System.out.println(roomJson); RoomPrice roomPrice = RoomPrice.builder() .offWeekDaysMinFee(Integer.parseInt( roomJson.getString("roomoffseasonminfee1"))) From d09525395304f8544d21d7e3e6292f7f23a03e3f Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 15:10:15 +0900 Subject: [PATCH 02/13] =?UTF-8?q?refactor:=20=EC=83=9D=EC=84=B1=EC=9E=90?= =?UTF-8?q?=20=EC=A0=91=EA=B7=BC=20=EB=A0=88=EB=B2=A8=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/dto/request/CheckPasswordRequestDto.java | 5 +++-- .../domain/member/dto/request/RefreshRequestDto.java | 5 +++-- .../domain/member/dto/request/SignInRequestDto.java | 8 ++++---- .../domain/member/dto/request/SignUpRequestDto.java | 5 +++-- .../domain/member/dto/request/UpdateMemberRequestDto.java | 5 +++-- .../domain/member/dto/response/MemberResponseDto.java | 5 +++-- .../domain/member/dto/response/SignInResponseDto.java | 5 +++-- .../domain/member/dto/response/TokenResponseDto.java | 5 +++-- 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/CheckPasswordRequestDto.java b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/CheckPasswordRequestDto.java index af1324bc..0bfafe93 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/CheckPasswordRequestDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/CheckPasswordRequestDto.java @@ -1,19 +1,20 @@ package com.fc.shimpyo_be.domain.member.dto.request; import jakarta.validation.constraints.NotBlank; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class CheckPasswordRequestDto { @NotBlank(message = "비밀번호를 입력하세요.") private String password; @Builder - public CheckPasswordRequestDto(String password) { + private CheckPasswordRequestDto(String password) { this.password = password; } } diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/RefreshRequestDto.java b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/RefreshRequestDto.java index 3523d5d6..740aecb6 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/RefreshRequestDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/RefreshRequestDto.java @@ -1,12 +1,13 @@ package com.fc.shimpyo_be.domain.member.dto.request; import jakarta.validation.constraints.NotBlank; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class RefreshRequestDto { @NotBlank(message = "Access Token 을 입력하세요.") @@ -15,7 +16,7 @@ public class RefreshRequestDto { private String refreshToken; @Builder - public RefreshRequestDto(String accessToken, String refreshToken) { + private RefreshRequestDto(String accessToken, String refreshToken) { this.accessToken = accessToken; this.refreshToken = refreshToken; } diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignInRequestDto.java b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignInRequestDto.java index ea765cdf..4be9b0e6 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignInRequestDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignInRequestDto.java @@ -2,14 +2,14 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Size; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class SignInRequestDto { @NotBlank(message = "이메일을 입력하세요.") @@ -19,12 +19,12 @@ public class SignInRequestDto { private String password; @Builder - public SignInRequestDto(String email, String password) { + private SignInRequestDto(String email, String password) { this.email = email; this.password = password; } - public UsernamePasswordAuthenticationToken toAuthentication(){ + public UsernamePasswordAuthenticationToken toAuthentication() { return new UsernamePasswordAuthenticationToken(this.email, this.password); } } diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java index 30dedcd0..0c64bcc9 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java @@ -5,13 +5,14 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class SignUpRequestDto { @NotBlank(message = "이메일을 입력하세요.") @@ -26,7 +27,7 @@ public class SignUpRequestDto { private String passwordConfirm; @Builder - public SignUpRequestDto(String email, String name, String password, String passwordConfirm) { + private SignUpRequestDto(String email, String name, String password, String passwordConfirm) { this.email = email; this.name = name; this.password = password; diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/UpdateMemberRequestDto.java b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/UpdateMemberRequestDto.java index 0bef7927..445f874f 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/UpdateMemberRequestDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/UpdateMemberRequestDto.java @@ -1,11 +1,12 @@ package com.fc.shimpyo_be.domain.member.dto.request; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class UpdateMemberRequestDto { private String password; @@ -13,7 +14,7 @@ public class UpdateMemberRequestDto { private String photoUrl; @Builder - public UpdateMemberRequestDto(String password, String passwordConfirm, String photoUrl) { + private UpdateMemberRequestDto(String password, String passwordConfirm, String photoUrl) { this.password = password; this.passwordConfirm = passwordConfirm; this.photoUrl = photoUrl; diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/dto/response/MemberResponseDto.java b/src/main/java/com/fc/shimpyo_be/domain/member/dto/response/MemberResponseDto.java index 949a10c4..aa80ac89 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/dto/response/MemberResponseDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/dto/response/MemberResponseDto.java @@ -1,12 +1,13 @@ package com.fc.shimpyo_be.domain.member.dto.response; import com.fc.shimpyo_be.domain.member.entity.Member; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class MemberResponseDto { private Long memberId; @@ -15,7 +16,7 @@ public class MemberResponseDto { private String photoUrl; @Builder - public MemberResponseDto(Long memberId, String email, String name, String photoUrl) { + private MemberResponseDto(Long memberId, String email, String name, String photoUrl) { this.memberId = memberId; this.email = email; this.name = name; diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/dto/response/SignInResponseDto.java b/src/main/java/com/fc/shimpyo_be/domain/member/dto/response/SignInResponseDto.java index 89fd6040..352c70cd 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/dto/response/SignInResponseDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/dto/response/SignInResponseDto.java @@ -1,18 +1,19 @@ package com.fc.shimpyo_be.domain.member.dto.response; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class SignInResponseDto { private MemberResponseDto member; private TokenResponseDto token; @Builder - public SignInResponseDto(MemberResponseDto member, TokenResponseDto token) { + private SignInResponseDto(MemberResponseDto member, TokenResponseDto token) { this.member = member; this.token = token; } diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/dto/response/TokenResponseDto.java b/src/main/java/com/fc/shimpyo_be/domain/member/dto/response/TokenResponseDto.java index 582a440b..7d5ce9f5 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/dto/response/TokenResponseDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/dto/response/TokenResponseDto.java @@ -1,11 +1,12 @@ package com.fc.shimpyo_be.domain.member.dto.response; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class TokenResponseDto { private String grantType; @@ -14,7 +15,7 @@ public class TokenResponseDto { private String refreshToken; @Builder - public TokenResponseDto(String grantType, String accessToken, long accessTokenExpiresIn, + private TokenResponseDto(String grantType, String accessToken, long accessTokenExpiresIn, String refreshToken) { this.grantType = grantType; this.accessToken = accessToken; From 29410b614469bbccaa03b8eb68e40db6cb484583 Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 15:10:36 +0900 Subject: [PATCH 03/13] =?UTF-8?q?test:=20=EC=A3=BC=EC=84=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/docs/AuthRestControllerDocsTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/fc/shimpyo_be/domain/member/docs/AuthRestControllerDocsTest.java b/src/test/java/com/fc/shimpyo_be/domain/member/docs/AuthRestControllerDocsTest.java index a3208c56..e4350f54 100644 --- a/src/test/java/com/fc/shimpyo_be/domain/member/docs/AuthRestControllerDocsTest.java +++ b/src/test/java/com/fc/shimpyo_be/domain/member/docs/AuthRestControllerDocsTest.java @@ -57,7 +57,7 @@ void signUp() throws Exception { given(authService.signUp(any(SignUpRequestDto.class))).willReturn(memberResponseDto); - // when + // when then mockMvc.perform(post("/api/auth/signup") .content(objectMapper.writeValueAsString(signUpRequestDto)) .contentType(MediaType.APPLICATION_JSON)) @@ -118,7 +118,7 @@ void signIn() throws Exception { given(authService.signIn(any(SignInRequestDto.class))).willReturn(signInResponseDto); - // when + // when then mockMvc.perform(post("/api/auth/signin") .content(objectMapper.writeValueAsString(signInRequestDto)) .contentType(MediaType.APPLICATION_JSON)) @@ -187,7 +187,7 @@ void refresh() throws Exception { given(authService.refresh(any(RefreshRequestDto.class))).willReturn(signInResponseDto); - // when + // when then mockMvc.perform(post("/api/auth/refresh") .content(objectMapper.writeValueAsString(refreshRequestDto)) .contentType(MediaType.APPLICATION_JSON)) From a0a74e9b4473103bd9ae6313587561844718eb77 Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 15:21:12 +0900 Subject: [PATCH 04/13] =?UTF-8?q?test:=20=EC=A6=90=EA=B2=A8=EC=B0=BE?= =?UTF-8?q?=EA=B8=B0=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docs/FavoriteRestControllerDocsTest.java | 8 ++++---- .../controller/FavoriteRestControllerTest.java | 15 ++++++--------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/test/java/com/fc/shimpyo_be/domain/favorite/docs/FavoriteRestControllerDocsTest.java b/src/test/java/com/fc/shimpyo_be/domain/favorite/docs/FavoriteRestControllerDocsTest.java index f8d8740d..1c99e2f0 100644 --- a/src/test/java/com/fc/shimpyo_be/domain/favorite/docs/FavoriteRestControllerDocsTest.java +++ b/src/test/java/com/fc/shimpyo_be/domain/favorite/docs/FavoriteRestControllerDocsTest.java @@ -46,8 +46,8 @@ void register() throws Exception { .build(); given(securityUtil.getCurrentMemberId()).willReturn(1L); - given(favoriteService.register(any(Long.TYPE), any(Long.TYPE))).willReturn( - favoriteResponseDto); + given(favoriteService.register(any(Long.TYPE), any(Long.TYPE))) + .willReturn(favoriteResponseDto); // when then mockMvc.perform(post("/api/favorites/{productId}", 1L)) @@ -141,8 +141,8 @@ void cancel() throws Exception { .build(); given(securityUtil.getCurrentMemberId()).willReturn(1L); - given(favoriteService.delete(any(Long.TYPE), any(Long.TYPE))).willReturn( - favoriteResponseDto); + given(favoriteService.delete(any(Long.TYPE), any(Long.TYPE))) + .willReturn(favoriteResponseDto); // when then mockMvc.perform(delete("/api/favorites/{productId}", 1L)) diff --git a/src/test/java/com/fc/shimpyo_be/domain/favorite/unit/controller/FavoriteRestControllerTest.java b/src/test/java/com/fc/shimpyo_be/domain/favorite/unit/controller/FavoriteRestControllerTest.java index 96ddcf62..456fe806 100644 --- a/src/test/java/com/fc/shimpyo_be/domain/favorite/unit/controller/FavoriteRestControllerTest.java +++ b/src/test/java/com/fc/shimpyo_be/domain/favorite/unit/controller/FavoriteRestControllerTest.java @@ -10,7 +10,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fc.shimpyo_be.config.AbstractContainersSupport; import com.fc.shimpyo_be.domain.favorite.dto.FavoriteResponseDto; import com.fc.shimpyo_be.domain.favorite.dto.FavoritesResponseDto; @@ -49,8 +48,6 @@ public class FavoriteRestControllerTest extends AbstractContainersSupport { @MockBean SecurityUtil securityUtil; - ObjectMapper objectMapper = new ObjectMapper(); - @BeforeEach public void setup() { mockMvc = MockMvcBuilders @@ -75,8 +72,8 @@ void _willSuccess() throws Exception { .build(); given(securityUtil.getCurrentMemberId()).willReturn(1L); - given(favoriteService.register(any(Long.TYPE), any(Long.TYPE))).willReturn( - favoriteResponseDto); + given(favoriteService.register(any(Long.TYPE), any(Long.TYPE))) + .willReturn(favoriteResponseDto); // when then mockMvc.perform(post("/api/favorites/{productId}", 1L)) @@ -117,8 +114,8 @@ void _willSuccess() throws Exception { .build(); given(securityUtil.getCurrentMemberId()).willReturn(1L); - given(favoriteService.getFavorites(any(Long.TYPE), any(Pageable.class))).willReturn( - favoritesResponseDto); + given(favoriteService.getFavorites(any(Long.TYPE), any(Pageable.class))) + .willReturn(favoritesResponseDto); // when then mockMvc.perform(get("/api/favorites") @@ -158,8 +155,8 @@ void _willSuccess() throws Exception { .build(); given(securityUtil.getCurrentMemberId()).willReturn(1L); - given(favoriteService.delete(any(Long.TYPE), any(Long.TYPE))).willReturn( - favoriteResponseDto); + given(favoriteService.delete(any(Long.TYPE), any(Long.TYPE))) + .willReturn(favoriteResponseDto); // when then mockMvc.perform(delete("/api/favorites/{productId}", 1L)) From 1dccde30e9e8bc1d00bf8c7b183be5ba089f8dca Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 15:24:25 +0900 Subject: [PATCH 05/13] =?UTF-8?q?refactor:=20=EC=83=9D=EC=84=B1=EC=9E=90?= =?UTF-8?q?=20=EC=A0=91=EA=B7=BC=20=EB=A0=88=EB=B2=A8=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shimpyo_be/domain/favorite/dto/FavoriteResponseDto.java | 5 +++-- .../shimpyo_be/domain/favorite/dto/FavoritesResponseDto.java | 5 +++-- .../com/fc/shimpyo_be/domain/favorite/entity/Favorite.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/fc/shimpyo_be/domain/favorite/dto/FavoriteResponseDto.java b/src/main/java/com/fc/shimpyo_be/domain/favorite/dto/FavoriteResponseDto.java index 55ca2b2e..6594df31 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/favorite/dto/FavoriteResponseDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/favorite/dto/FavoriteResponseDto.java @@ -1,12 +1,13 @@ package com.fc.shimpyo_be.domain.favorite.dto; import com.fc.shimpyo_be.domain.favorite.entity.Favorite; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class FavoriteResponseDto { private Long favoriteId; @@ -14,7 +15,7 @@ public class FavoriteResponseDto { private Long productId; @Builder - public FavoriteResponseDto(Long favoriteId, Long memberId, Long productId) { + private FavoriteResponseDto(Long favoriteId, Long memberId, Long productId) { this.favoriteId = favoriteId; this.memberId = memberId; this.productId = productId; diff --git a/src/main/java/com/fc/shimpyo_be/domain/favorite/dto/FavoritesResponseDto.java b/src/main/java/com/fc/shimpyo_be/domain/favorite/dto/FavoritesResponseDto.java index 214e574a..9c45db18 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/favorite/dto/FavoritesResponseDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/favorite/dto/FavoritesResponseDto.java @@ -2,19 +2,20 @@ import com.fc.shimpyo_be.domain.product.dto.response.ProductResponse; import java.util.List; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class FavoritesResponseDto { private int pageCount; private List products; @Builder - public FavoritesResponseDto(int pageCount, List products) { + private FavoritesResponseDto(int pageCount, List products) { this.pageCount = pageCount; this.products = products; } diff --git a/src/main/java/com/fc/shimpyo_be/domain/favorite/entity/Favorite.java b/src/main/java/com/fc/shimpyo_be/domain/favorite/entity/Favorite.java index d1d493ea..d4c10bf2 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/favorite/entity/Favorite.java +++ b/src/main/java/com/fc/shimpyo_be/domain/favorite/entity/Favorite.java @@ -30,7 +30,7 @@ public class Favorite { private Product product; @Builder - public Favorite(Long id, Member member, Product product) { + private Favorite(Long id, Member member, Product product) { this.id = id; this.member = member; this.product = product; From 4fdd94588f03d199eb9c8cefbb1ab11b0ece8a37 Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 15:27:44 +0900 Subject: [PATCH 06/13] =?UTF-8?q?refactor:=20=EC=83=9D=EC=84=B1=EC=9E=90?= =?UTF-8?q?=20=EC=A0=91=EA=B7=BC=20=EB=A0=88=EB=B2=A8=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fc/shimpyo_be/domain/member/entity/Member.java | 2 +- .../com/fc/shimpyo_be/domain/member/entity/RefreshToken.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/entity/Member.java b/src/main/java/com/fc/shimpyo_be/domain/member/entity/Member.java index bf843d32..94917b07 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/entity/Member.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/entity/Member.java @@ -41,7 +41,7 @@ public class Member extends BaseTimeEntity { private Authority authority; @Builder - public Member(Long id, String email, String name, String password, String photoUrl, + private Member(Long id, String email, String name, String password, String photoUrl, Authority authority) { this.id = id; this.email = email; diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/entity/RefreshToken.java b/src/main/java/com/fc/shimpyo_be/domain/member/entity/RefreshToken.java index 2d194fec..211d0864 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/entity/RefreshToken.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/entity/RefreshToken.java @@ -20,7 +20,7 @@ public class RefreshToken { private String token; @Builder - public RefreshToken(Long id, String token) { + private RefreshToken(Long id, String token) { this.id = id; this.token = token; } From afccce466f5481869ecb602b8cfdb3b68d19b92a Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 23:20:36 +0900 Subject: [PATCH 07/13] =?UTF-8?q?refactor:=20=ED=8C=A8=ED=84=B4=EA=B3=BC?= =?UTF-8?q?=20min,=20max=20=EC=83=81=EC=88=98=EB=A1=9C=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/dto/request/SignUpRequestDto.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java index 0c64bcc9..3f7bb9ac 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java @@ -15,11 +15,15 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class SignUpRequestDto { + private final String emailRegexp = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$"; + private final int nameMin = 2; + private final int nameMax = 30; + @NotBlank(message = "이메일을 입력하세요.") - @Pattern(regexp = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", message = "이메일 형식에 맞게 입력해주세요.") + @Pattern(regexp = emailRegexp, message = "이메일 형식에 맞게 입력해주세요.") private String email; @NotBlank(message = "이름을 입력하세요.") - @Size(min = 2, max = 30, message = "이름은 최소 2자 이상 최대 30자 이내로 입력하세요.") + @Size(min = nameMin, max = nameMax, message = "이름은 최소 2자 이상 최대 30자 이내로 입력하세요.") private String name; @NotBlank(message = "비밀번호를 입력하세요.") private String password; From 0b1e31f02451b688dfe8b951b66a0df7b03e1e9c Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 23:25:19 +0900 Subject: [PATCH 08/13] =?UTF-8?q?refactor:=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=ED=8C=A8=ED=84=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shimpyo_be/domain/member/dto/request/SignUpRequestDto.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java index 3f7bb9ac..77470d55 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java @@ -16,6 +16,7 @@ public class SignUpRequestDto { private final String emailRegexp = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$"; + private final String passwordRegexp = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[@$#^()!%*?&])[A-Za-z\\d@$!#^()%*?&]{8,30}$"; private final int nameMin = 2; private final int nameMax = 30; @@ -26,8 +27,10 @@ public class SignUpRequestDto { @Size(min = nameMin, max = nameMax, message = "이름은 최소 2자 이상 최대 30자 이내로 입력하세요.") private String name; @NotBlank(message = "비밀번호를 입력하세요.") + @Pattern(regexp = passwordRegexp) private String password; @NotBlank(message = "비밀번호 확인을 입력하세요.") + @Pattern(regexp = passwordRegexp) private String passwordConfirm; @Builder From 55e68448a50e2854a2ac6437c35d87eca5a04721 Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 23:29:12 +0900 Subject: [PATCH 09/13] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20debug=20=EB=A1=9C=EA=B9=85=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fc/shimpyo_be/domain/product/service/OpenApiService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/fc/shimpyo_be/domain/product/service/OpenApiService.java b/src/main/java/com/fc/shimpyo_be/domain/product/service/OpenApiService.java index 94918113..63593ce3 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/product/service/OpenApiService.java +++ b/src/main/java/com/fc/shimpyo_be/domain/product/service/OpenApiService.java @@ -94,9 +94,7 @@ public void getData(int pageSize, int pageNum) throws JSONException { saveProductImages(product, images); saveRooms(product, introItem, rooms); } catch (InvalidDataException e) { - log.debug("[OpenAPI] " + stayArr); log.error(e.getMessage()); - log.info("[OpenAPI] 다음 숙소를 조회합니다."); } } } catch (Exception e) { From 7c9771e209b821f69521296372ca27eb6e17d354 Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 23:31:23 +0900 Subject: [PATCH 10/13] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20debug=20=EB=A1=9C=EA=B9=85=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../favorite/controller/FavoriteRestController.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/fc/shimpyo_be/domain/favorite/controller/FavoriteRestController.java b/src/main/java/com/fc/shimpyo_be/domain/favorite/controller/FavoriteRestController.java index 866fee22..484f62db 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/favorite/controller/FavoriteRestController.java +++ b/src/main/java/com/fc/shimpyo_be/domain/favorite/controller/FavoriteRestController.java @@ -8,7 +8,6 @@ import com.fc.shimpyo_be.global.common.ResponseDto; import com.fc.shimpyo_be.global.util.SecurityUtil; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; import org.springframework.http.HttpStatus; @@ -20,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Slf4j @RestController @RequiredArgsConstructor @RequestMapping("/api/favorites") @@ -28,10 +26,11 @@ public class FavoriteRestController { private final FavoriteService favoriteService; private final SecurityUtil securityUtil; + private final int size = 10; + private final int page = 0; @PostMapping("/{productId}") public ResponseEntity> register(@PathVariable long productId) { - log.debug("memberId: {}, productId: {}", securityUtil.getCurrentMemberId(), productId); return ResponseEntity.status(HttpStatus.CREATED).body(ResponseDto.res(HttpStatus.CREATED, favoriteService.register(securityUtil.getCurrentMemberId(), productId), "성공적으로 즐겨찾기를 등록했습니다.")); @@ -39,8 +38,7 @@ public ResponseEntity> register(@PathVariable l @GetMapping public ResponseEntity> getFavorites( - @PageableConstraint(Favorite.class) @PageableDefault(size = 10, page = 0) Pageable pageable) { - log.debug("memberId: {}", securityUtil.getCurrentMemberId()); + @PageableConstraint(Favorite.class) @PageableDefault(size = size, page = page) Pageable pageable) { return ResponseEntity.status(HttpStatus.OK) .body(ResponseDto.res(HttpStatus.OK, favoriteService.getFavorites( securityUtil.getCurrentMemberId(), pageable), "성공적으로 즐겨찾기 목록을 조회했습니다.")); @@ -48,7 +46,6 @@ public ResponseEntity> getFavorites( @DeleteMapping("/{productId}") public ResponseEntity> cancel(@PathVariable long productId) { - log.debug("memberId: {}, productId: {}", securityUtil.getCurrentMemberId(), productId); return ResponseEntity.status(HttpStatus.OK).body(ResponseDto.res(HttpStatus.OK, favoriteService.delete(securityUtil.getCurrentMemberId(), productId), "성공적으로 즐겨찾기를 취소했습니다.")); From f8f01af1ac884dab975828eaeedbb9e1e3fd10e6 Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 23:45:36 +0900 Subject: [PATCH 11/13] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20debug=20=EB=A1=9C=EA=B9=85=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/controller/AuthRestController.java | 6 ------ .../domain/member/controller/MemberRestController.java | 5 ----- 2 files changed, 11 deletions(-) diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/controller/AuthRestController.java b/src/main/java/com/fc/shimpyo_be/domain/member/controller/AuthRestController.java index 07744978..d62db927 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/controller/AuthRestController.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/controller/AuthRestController.java @@ -9,7 +9,6 @@ import com.fc.shimpyo_be.global.common.ResponseDto; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; @@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Slf4j @RestController @RequiredArgsConstructor @RequestMapping("/api/auth") @@ -28,7 +26,6 @@ public class AuthRestController { @PostMapping("/signup") public ResponseEntity> signUp( @Valid @RequestBody SignUpRequestDto signUpRequestDto) { - log.debug("email: {}, name: {}", signUpRequestDto.getEmail(), signUpRequestDto.getName()); return ResponseEntity.status(HttpStatus.CREATED).body( ResponseDto.res(HttpStatus.CREATED, authService.signUp(signUpRequestDto), "성공적으로 회원가입 했습니다.")); @@ -37,7 +34,6 @@ public ResponseEntity> signUp( @PostMapping("/signin") public ResponseEntity> signIn( @Valid @RequestBody SignInRequestDto signInRequestDto) { - log.debug("email: {}", signInRequestDto.getEmail()); return ResponseEntity.status(HttpStatus.OK).body( ResponseDto.res(HttpStatus.OK, authService.signIn(signInRequestDto), "성공적으로 로그인 했습니다.")); @@ -46,8 +42,6 @@ public ResponseEntity> signIn( @PostMapping("/refresh") public ResponseEntity> refresh( @Valid @RequestBody RefreshRequestDto refreshRequestDto) { - log.debug("accessToken: {}, refreshToken: {}", refreshRequestDto.getAccessToken(), - refreshRequestDto.getRefreshToken()); return ResponseEntity.status(HttpStatus.OK).body( ResponseDto.res(HttpStatus.OK, authService.refresh(refreshRequestDto), "성공적으로 토큰을 재발급 했습니다.")); diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/controller/MemberRestController.java b/src/main/java/com/fc/shimpyo_be/domain/member/controller/MemberRestController.java index 5393e4eb..629d2e16 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/controller/MemberRestController.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/controller/MemberRestController.java @@ -7,7 +7,6 @@ import com.fc.shimpyo_be.global.common.ResponseDto; import com.fc.shimpyo_be.global.util.SecurityUtil; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Slf4j @RestController @RequiredArgsConstructor @RequestMapping("/api/members") @@ -28,7 +26,6 @@ public class MemberRestController { @GetMapping public ResponseEntity> getMember() { - log.debug("memberId: {}", securityUtil.getCurrentMemberId()); return ResponseEntity.status(HttpStatus.OK).body( ResponseDto.res(HttpStatus.OK, memberService.getMember(), "성공적으로 회원 정보를 조회했습니다.")); @@ -37,7 +34,6 @@ public ResponseEntity> getMember() { @PatchMapping public ResponseEntity> updateMember(@RequestBody UpdateMemberRequestDto updateMemberRequestDto) { - log.debug("memberId: {}", securityUtil.getCurrentMemberId()); return ResponseEntity.status(HttpStatus.OK).body( ResponseDto.res(HttpStatus.OK, memberService.updateMember(updateMemberRequestDto), "성공적으로 회원 정보를 수정했습니다.")); @@ -46,7 +42,6 @@ public ResponseEntity> updateMember(@RequestBody @PostMapping public ResponseEntity> checkPassword( @RequestBody CheckPasswordRequestDto checkPasswordRequestDto) { - log.debug("memberId: {}", securityUtil.getCurrentMemberId()); memberService.checkPassword(checkPasswordRequestDto); return ResponseEntity.status(HttpStatus.OK).body( ResponseDto.res(HttpStatus.OK, "비밀번호가 일치합니다.")); From a91a0f74342962e69b1e6560c729bfa2aa499d21 Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 23:46:50 +0900 Subject: [PATCH 12/13] =?UTF-8?q?fix:=20=ED=8C=A8=ED=84=B4,=20=EC=B5=9C?= =?UTF-8?q?=EC=86=8C/=EC=B5=9C=EB=8C=80=20=EA=B8=80=EC=9E=90=EC=88=98?= =?UTF-8?q?=EB=A5=BC=20=EC=A0=95=EC=A0=81=20=EC=83=81=EC=88=98=EB=A1=9C=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/dto/request/SignUpRequestDto.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java index 77470d55..ed0425f2 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java +++ b/src/main/java/com/fc/shimpyo_be/domain/member/dto/request/SignUpRequestDto.java @@ -15,22 +15,22 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class SignUpRequestDto { - private final String emailRegexp = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$"; - private final String passwordRegexp = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[@$#^()!%*?&])[A-Za-z\\d@$!#^()%*?&]{8,30}$"; - private final int nameMin = 2; - private final int nameMax = 30; + private static final String EMAIL_REGEX = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$"; + private static final int NAME_MIN = 2; + private static final int NAME_MAX = 30; + private static final String PASSWORD_REGEX = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[@$#^()!%*?&])[A-Za-z\\d@$!#^()%*?&]{8,30}$"; @NotBlank(message = "이메일을 입력하세요.") - @Pattern(regexp = emailRegexp, message = "이메일 형식에 맞게 입력해주세요.") + @Pattern(regexp = EMAIL_REGEX, message = "이메일 형식에 맞게 입력해주세요.") private String email; @NotBlank(message = "이름을 입력하세요.") - @Size(min = nameMin, max = nameMax, message = "이름은 최소 2자 이상 최대 30자 이내로 입력하세요.") + @Size(min = NAME_MIN, max = NAME_MAX, message = "이름은 최소 2자 이상 최대 30자 이내로 입력하세요.") private String name; @NotBlank(message = "비밀번호를 입력하세요.") - @Pattern(regexp = passwordRegexp) + @Pattern(regexp = PASSWORD_REGEX) private String password; @NotBlank(message = "비밀번호 확인을 입력하세요.") - @Pattern(regexp = passwordRegexp) + @Pattern(regexp = PASSWORD_REGEX) private String passwordConfirm; @Builder From 47a94d07f289c20c17bc829ccbb3c9cf6decb1b3 Mon Sep 17 00:00:00 2001 From: JeongUijeong Date: Thu, 14 Dec 2023 23:49:15 +0900 Subject: [PATCH 13/13] =?UTF-8?q?refactor:=20=ED=8E=98=EC=9D=B4=EC=A7=95?= =?UTF-8?q?=20=EA=B8=B0=EB=B3=B8=20=EC=84=A4=EC=A0=95=EC=9D=84=20=EC=A0=95?= =?UTF-8?q?=EC=A0=81=20=EC=83=81=EC=88=98=EB=A1=9C=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/favorite/controller/FavoriteRestController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/fc/shimpyo_be/domain/favorite/controller/FavoriteRestController.java b/src/main/java/com/fc/shimpyo_be/domain/favorite/controller/FavoriteRestController.java index 484f62db..9980ffab 100644 --- a/src/main/java/com/fc/shimpyo_be/domain/favorite/controller/FavoriteRestController.java +++ b/src/main/java/com/fc/shimpyo_be/domain/favorite/controller/FavoriteRestController.java @@ -26,8 +26,8 @@ public class FavoriteRestController { private final FavoriteService favoriteService; private final SecurityUtil securityUtil; - private final int size = 10; - private final int page = 0; + private static final int DEFAULT_SIZE = 10; + private static final int DEFAULT_PAGE = 0; @PostMapping("/{productId}") public ResponseEntity> register(@PathVariable long productId) { @@ -38,7 +38,7 @@ public ResponseEntity> register(@PathVariable l @GetMapping public ResponseEntity> getFavorites( - @PageableConstraint(Favorite.class) @PageableDefault(size = size, page = page) Pageable pageable) { + @PageableConstraint(Favorite.class) @PageableDefault(size = DEFAULT_SIZE, page = DEFAULT_PAGE) Pageable pageable) { return ResponseEntity.status(HttpStatus.OK) .body(ResponseDto.res(HttpStatus.OK, favoriteService.getFavorites( securityUtil.getCurrentMemberId(), pageable), "성공적으로 즐겨찾기 목록을 조회했습니다."));