diff --git a/server/src/main/java/server/service/IngredientService.java b/server/src/main/java/server/service/IngredientService.java index 4edcb88..8a79659 100644 --- a/server/src/main/java/server/service/IngredientService.java +++ b/server/src/main/java/server/service/IngredientService.java @@ -21,11 +21,11 @@ public class IngredientService { } public List findAll() { - return ingredientRepository.findAll(); + return ingredientRepository.findAllByOrderByNameAsc(); } - public List findAll(int limit) { - return ingredientRepository.findAll(PageRequest.of(0, limit)).toList(); + public List findAll(int page, int limit) { + return ingredientRepository.findAllByOrderByNameAsc(PageRequest.of(page, limit)).toList(); } /** @@ -58,8 +58,10 @@ public class IngredientService { return Optional.of(ingredientRepository.save(ingredient)); } - public void delete(Long id) { + public boolean delete(Long id) { + if (!ingredientRepository.existsById(id)) return false; ingredientRepository.deleteById(id); + return true; } }