From 4773a0526189729eb3857b08f9be73725452624a Mon Sep 17 00:00:00 2001 From: Ok JaeOok Date: Wed, 24 Jan 2024 17:45:08 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[Refactor]=20WishService=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 `#` 찜 추가 매개변수 변경 --- .../main/java/fc/be/app/domain/wish/service/WishService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fc/be/app/domain/wish/service/WishService.java b/app/src/main/java/fc/be/app/domain/wish/service/WishService.java index 1332255e..e2930dfc 100644 --- a/app/src/main/java/fc/be/app/domain/wish/service/WishService.java +++ b/app/src/main/java/fc/be/app/domain/wish/service/WishService.java @@ -23,14 +23,14 @@ public class WishService { private final PlaceService placeService; @Transactional - public WishAddResponse addWish(WishAddRequest wishAddRequest) { + public WishAddResponse addWish(Long memberId, WishAddRequest wishAddRequest) { int placeId = wishAddRequest.placeId(); int contentTypeId = wishAddRequest.contentTypeId(); Place place = placeService.saveOrUpdatePlace(placeId, contentTypeId); Wish wish = Wish.builder() - .memberId(wishAddRequest.memberId()) + .memberId(memberId) .place(place) .build(); From 95ab36a29b0c51d84480791d4a65b980d845a61b Mon Sep 17 00:00:00 2001 From: Ok JaeOok Date: Wed, 24 Jan 2024 17:45:55 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[Refactor]=20Wish=20=EC=B0=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20DTO=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `-` memberId 를 `UserPrincipal` 에서 받아옴 --- app/src/main/java/fc/be/app/domain/wish/dto/WishAddRequest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/fc/be/app/domain/wish/dto/WishAddRequest.java b/app/src/main/java/fc/be/app/domain/wish/dto/WishAddRequest.java index 5b3f6ffc..b877387d 100644 --- a/app/src/main/java/fc/be/app/domain/wish/dto/WishAddRequest.java +++ b/app/src/main/java/fc/be/app/domain/wish/dto/WishAddRequest.java @@ -3,7 +3,6 @@ import jakarta.validation.constraints.Positive; public record WishAddRequest( - @Positive Long memberId, @Positive Integer placeId, @Positive Integer contentTypeId ) { From e31dce32cc540635563fdd3ed94f8630c4720d48 Mon Sep 17 00:00:00 2001 From: Ok JaeOok Date: Wed, 24 Jan 2024 17:47:05 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[Fix]=20WishController=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `#` 하드코딩된 memberId 수정 `#` 찜 추가 요청 값 조정 --- .../wish/controller/WishController.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/fc/be/app/domain/wish/controller/WishController.java b/app/src/main/java/fc/be/app/domain/wish/controller/WishController.java index 4de74bf8..c6d083f5 100644 --- a/app/src/main/java/fc/be/app/domain/wish/controller/WishController.java +++ b/app/src/main/java/fc/be/app/domain/wish/controller/WishController.java @@ -10,6 +10,8 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; +import java.util.Optional; + @RestController @RequiredArgsConstructor @RequestMapping("/wishes") @@ -18,9 +20,13 @@ public class WishController { private final WishService wishService; @PostMapping - public ApiResponse addWish(@Valid @RequestBody WishAddRequest wishAddRequest) { + public ApiResponse addWish( + @AuthenticationPrincipal UserPrincipal userPrincipal, + @Valid @RequestBody WishAddRequest wishAddRequest + ) { + Long memberId = Optional.of(userPrincipal.id()).orElse(0L); return ApiResponse.ok( - wishService.addWish(wishAddRequest) + wishService.addWish(memberId, wishAddRequest) ); } @@ -29,15 +35,18 @@ public ApiResponse isWished( @AuthenticationPrincipal UserPrincipal userPrincipal, @PathVariable Integer placeId ) { - Long memberId = userPrincipal.id(); + Long memberId = Optional.of(userPrincipal.id()).orElse(0L); return ApiResponse.ok( wishService.isWished(memberId, placeId) ); } @DeleteMapping("{placeId}") - public ApiResponse deleteWish(@PathVariable Integer placeId) { - Long memberId = 1L; + public ApiResponse deleteWish( + @AuthenticationPrincipal UserPrincipal userPrincipal, + @PathVariable Integer placeId + ) { + Long memberId = Optional.of(userPrincipal.id()).orElse(0L); return ApiResponse.ok( wishService.deleteWish(memberId, placeId) ); From b68594aeda899202ff11630eef60a39c57ff05aa Mon Sep 17 00:00:00 2001 From: Ok JaeOok Date: Wed, 24 Jan 2024 17:53:06 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[Test]=20Wis=20http=20test=20=EC=B5=9C?= =?UTF-8?q?=EC=8B=A0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/test/http/wish.http | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/test/http/wish.http b/app/src/test/http/wish.http index 2fa0ee22..cb4d9f88 100644 --- a/app/src/test/http/wish.http +++ b/app/src/test/http/wish.http @@ -4,7 +4,6 @@ POST http://localhost:8080/wishes Content-Type: application/json { - "memberId": {{memberId}}, "placeId": {{accommodationId}}, "contentTypeId": {{accommodationTypeId}} } From 79ba2f9f525c03f8870523d04a917e5b414dc456 Mon Sep 17 00:00:00 2001 From: Denny-Ko Date: Wed, 24 Jan 2024 21:04:43 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[Fix]=20AnonymousFilter=EC=97=90=EC=84=9C?= =?UTF-8?q?=20id=EB=A5=BC=200=EC=9C=BC=EB=A1=9C=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../be/app/domain/wish/controller/WishController.java | 11 +++-------- .../be/app/global/config/security/SecurityConfig.java | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/fc/be/app/domain/wish/controller/WishController.java b/app/src/main/java/fc/be/app/domain/wish/controller/WishController.java index c6d083f5..c5afc333 100644 --- a/app/src/main/java/fc/be/app/domain/wish/controller/WishController.java +++ b/app/src/main/java/fc/be/app/domain/wish/controller/WishController.java @@ -10,8 +10,6 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; -import java.util.Optional; - @RestController @RequiredArgsConstructor @RequestMapping("/wishes") @@ -24,9 +22,8 @@ public ApiResponse addWish( @AuthenticationPrincipal UserPrincipal userPrincipal, @Valid @RequestBody WishAddRequest wishAddRequest ) { - Long memberId = Optional.of(userPrincipal.id()).orElse(0L); return ApiResponse.ok( - wishService.addWish(memberId, wishAddRequest) + wishService.addWish(userPrincipal.id(), wishAddRequest) ); } @@ -35,9 +32,8 @@ public ApiResponse isWished( @AuthenticationPrincipal UserPrincipal userPrincipal, @PathVariable Integer placeId ) { - Long memberId = Optional.of(userPrincipal.id()).orElse(0L); return ApiResponse.ok( - wishService.isWished(memberId, placeId) + wishService.isWished(userPrincipal.id(), placeId) ); } @@ -46,9 +42,8 @@ public ApiResponse deleteWish( @AuthenticationPrincipal UserPrincipal userPrincipal, @PathVariable Integer placeId ) { - Long memberId = Optional.of(userPrincipal.id()).orElse(0L); return ApiResponse.ok( - wishService.deleteWish(memberId, placeId) + wishService.deleteWish(userPrincipal.id(), placeId) ); } } diff --git a/app/src/main/java/fc/be/app/global/config/security/SecurityConfig.java b/app/src/main/java/fc/be/app/global/config/security/SecurityConfig.java index 2c31317a..b920d215 100644 --- a/app/src/main/java/fc/be/app/global/config/security/SecurityConfig.java +++ b/app/src/main/java/fc/be/app/global/config/security/SecurityConfig.java @@ -81,7 +81,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity httpSecurity) throws .successHandlerLogin(loginAuthenticationSuccessHandler) .failureHandlerLogin(new LoginAuthenticationFailureHandler(handlerExceptionResolver))) .anonymous(anonymous -> anonymous - .principal(new UserPrincipal(null, "anonymous", AuthProvider.NONE))); + .principal(new UserPrincipal(0L, "anonymous", AuthProvider.NONE))); // 세션 유지 필터 httpSecurity