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); 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; }