Merge pull request #146 from ShallWeProject/hotfix/collision-resolve

충돌 해결
ShallWeProject · Nov 8, 2023 · 9f87630 · 9f87630
2 parents 12ba5d3 + cc22851
commit 9f87630
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/main/java/com/shallwe/domain/experiencegift/application/ExperienceGiftServiceImpl.java b/src/main/java/com/shallwe/domain/experiencegift/application/ExperienceGiftServiceImpl.java
@@ -112,7 +112,9 @@ public AdminMainRes mainAdminExperienceGift(UserPrincipal userPrincipal) {
         Long bookedReservationsCount = reservationRepository.countByExperienceGift_ShopOwnerAndReservationStatus(shopOwner, ReservationStatus.WAITING);
 
         return AdminMainRes.toDto(currentDate, bookedReservationsCount);
+    }
 
+    @Override
     public List<AdminExperienceRes> getExperienceGift(UserPrincipal userPrincipal) {
         Long userId = userPrincipal.getId();
 

diff --git a/...in/java/com/shallwe/domain/experiencegift/presentation/AdminExperienceGiftController.java b/...in/java/com/shallwe/domain/experiencegift/presentation/AdminExperienceGiftController.java
@@ -53,6 +53,7 @@ public ResponseCustom<AdminMainRes> mainAdminExperienceGift(
             @Parameter(description = "AccessToken 을 입력해주세요.", required = true) @CurrentUser UserPrincipal userPrincipal
     ) {
         return ResponseCustom.OK(experienceGiftService.mainAdminExperienceGift(userPrincipal));
+    }
     @Operation(summary = "관리자 경험 선물 조회", description = "관리자 경험 선물 조회합니다.")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "관리자 경험 선물 조회 성공",content = {@Content(mediaType = "application/json", schema = @Schema(implementation = AdminExperienceRes.class))}),