fix: develop 머지 충돌 해결

YAPP-Github · Sep 15, 2024 · fb05d49 · fb05d49
2 parents 19e05b4 + 32af59e
commit fb05d49
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/app/api/show-api/src/main/java/com/example/show/controller/UserShowController.java b/app/api/show-api/src/main/java/com/example/show/controller/UserShowController.java
@@ -47,14 +47,14 @@ public class UserShowController {
     @Operation(summary = "공연 관심 등록 / 취소")
     public ResponseEntity<ShowInterestApiResponse> interest(
         @PathVariable("showId") UUID showId,
-        @AuthenticationPrincipal AuthenticatedInfo user
+        @AuthenticationPrincipal AuthenticatedInfo info
     ) {
         return ResponseEntity.ok(
             ShowInterestApiResponse.from(
                 userShowService.interest(
                     ShowInterestServiceRequest.builder()
                         .showId(showId)
-                        .userId(user.userId())
+                        .userId(info.userId())
                         .build()
                 )
             )
@@ -65,10 +65,10 @@ public ResponseEntity<ShowInterestApiResponse> interest(
     @Operation(summary = "공연 관심 목록 조회")
     public ResponseEntity<PaginationApiResponse<InterestShowPaginationApiResponse>> getInterests(
         @ParameterObject ShowInterestPaginationApiRequest request,
-        @AuthenticationPrincipal AuthenticatedInfo user
+        @AuthenticationPrincipal AuthenticatedInfo info
     ) {
         var serviceResponse = userShowService.findInterestShows(
-            request.toServiceRequest(user.userId())
+            request.toServiceRequest(info.userId())
         );
 
         List<InterestShowPaginationApiResponse> response = serviceResponse.data().stream()
@@ -86,11 +86,11 @@ public ResponseEntity<PaginationApiResponse<InterestShowPaginationApiResponse>>
     @GetMapping("/interests/count")
     @Operation(summary = "관심 공연 개수")
     public ResponseEntity<NumberOfInterestShowApiResponse> getNumberOfInterestShow(
-        @AuthenticationPrincipal AuthenticatedInfo user
+        @AuthenticationPrincipal AuthenticatedInfo info
     ) {
         return ResponseEntity.ok(
             NumberOfInterestShowApiResponse.from(
-                userShowService.countInterestShows(user.userId())
+                userShowService.countInterestShows(info.userId())
             )
         );
     }