From eda4e5160ab28b6348a160b9a50a7b81f24fa122 Mon Sep 17 00:00:00 2001 From: jaehyeon Date: Sun, 25 Feb 2024 18:12:11 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#79=20fix:=20UserLike=20Api=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 쿼리 파라미터 -> Path Variable로 변경합니다. --- .../com/gdsc/pikpet/controller/UserAccountController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gdsc/pikpet/controller/UserAccountController.java b/src/main/java/com/gdsc/pikpet/controller/UserAccountController.java index eec9c6f..f431d14 100644 --- a/src/main/java/com/gdsc/pikpet/controller/UserAccountController.java +++ b/src/main/java/com/gdsc/pikpet/controller/UserAccountController.java @@ -35,10 +35,10 @@ public ResponseEntity updateUserInfo(Authentication authentication, @RequestB return ResponseEntity.ok().body("업데이트 완료"); } - @PostMapping("/likeAnimal") + @PostMapping("/likeAnimal/{animalId}") public ResponseEntity likeAnimal( Authentication authentication, - @RequestParam Long animalId + @PathVariable Long animalId ) { UserLikeResponse userLikeResponse = userAccountService.addlikeAnimal((UserSecurityDto) authentication.getPrincipal(), animalId); return ResponseEntity.ok().body(userLikeResponse); From ebddcf4c8ac5d661caece31f7005116a1694448b Mon Sep 17 00:00:00 2001 From: jaehyeon Date: Sun, 25 Feb 2024 18:20:30 +0900 Subject: [PATCH 2/2] =?UTF-8?q?#79=20fix:=20Response=20=EA=B0=92=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Animal Search시에 총 검색된 개수 반환 --- src/main/java/com/gdsc/pikpet/dto/AnimalSearchDto.java | 3 ++- src/main/java/com/gdsc/pikpet/service/AnimalService.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gdsc/pikpet/dto/AnimalSearchDto.java b/src/main/java/com/gdsc/pikpet/dto/AnimalSearchDto.java index 02521cb..881e671 100644 --- a/src/main/java/com/gdsc/pikpet/dto/AnimalSearchDto.java +++ b/src/main/java/com/gdsc/pikpet/dto/AnimalSearchDto.java @@ -5,6 +5,7 @@ public record AnimalSearchDto( List animals, Integer page, - int numberOfElements + int numberOfElements, + int totalElements ) { } diff --git a/src/main/java/com/gdsc/pikpet/service/AnimalService.java b/src/main/java/com/gdsc/pikpet/service/AnimalService.java index 1a1c81e..2debcbc 100644 --- a/src/main/java/com/gdsc/pikpet/service/AnimalService.java +++ b/src/main/java/com/gdsc/pikpet/service/AnimalService.java @@ -56,6 +56,7 @@ public AnimalSearchDto getAnimals(AnimalFilterCriteria animalFilterCriteria, Use pageable ); int numberOfElements = animals.getNumberOfElements(); + int totalElements = (int) animals.getTotalElements(); UserAccount userAccount = userAccountService.getUserAccount(userSecurityDto); List animalSimpleDtos = animals.getContent().stream() .map(animal -> { @@ -64,7 +65,7 @@ public AnimalSearchDto getAnimals(AnimalFilterCriteria animalFilterCriteria, Use }) .toList(); - AnimalSearchDto response = new AnimalSearchDto(animalSimpleDtos, animalFilterCriteria.page(), numberOfElements); + AnimalSearchDto response = new AnimalSearchDto(animalSimpleDtos, animalFilterCriteria.page(), numberOfElements, totalElements); return response; }