diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java index 9452abd..0fbe6a5 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java @@ -11,6 +11,7 @@ import de.timaldinger.einkaufsliste.Models.ShoppingList; import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -32,7 +33,7 @@ public class ShoppingCategoryController { private ShoppingItemRepository shoppingItemRepository; @PostMapping("/api/categories") - public ResponseEntity addCategory(@RequestBody ShoppingCategoryPostDTO newCategory){ + public ResponseEntity addCategory(@Valid @RequestBody ShoppingCategoryPostDTO newCategory){ String name = newCategory.categoryName(); ShoppingList list = shoppingListRepository.findById(newCategory.listID()).orElseThrow(() -> new ResourceNotFoundException("listID",newCategory.listID())); @@ -51,7 +52,7 @@ public class ShoppingCategoryController { } @PatchMapping("/api/categories/{categoryID}") - public ResponseEntity editCategory(@PathVariable UUID categoryID,@RequestBody ShoppingCategoryPatchDTO toChange){ + public ResponseEntity editCategory(@PathVariable UUID categoryID,@Valid @RequestBody ShoppingCategoryPatchDTO toChange){ ShoppingCategory category = shoppingCategoryRepository.findById(categoryID).orElseThrow(() -> new ResourceNotFoundException("categoryID",categoryID)); if(toChange.categoryName() != null) category.setCategoryName(toChange.categoryName()); diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java index 0ad9d96..59b824a 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java @@ -12,6 +12,7 @@ import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import jakarta.annotation.Resource; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -33,7 +34,7 @@ public class ShoppingItemController { private ShoppingItemRepository shoppingItemRepository; @PostMapping("/api/items") - public ResponseEntity addItem(@RequestBody ShoppingItemPostDTO newItem){ + public ResponseEntity addItem(@Valid @RequestBody ShoppingItemPostDTO newItem){ String name = newItem.itemName(); String amount = newItem.itemAmount(); ShoppingCategory c; @@ -57,7 +58,7 @@ public class ShoppingItemController { } @PatchMapping("/api/items/{itemID}") - public ResponseEntity editItem(@PathVariable UUID itemID ,@RequestBody ShoppingItemPatchDTO toChange){ + public ResponseEntity editItem(@PathVariable UUID itemID , @Valid @RequestBody ShoppingItemPatchDTO toChange){ ShoppingItem item = shoppingItemRepository.findById(itemID).orElseThrow(() -> new ResourceNotFoundException("itemID",itemID)); if(toChange.itemName() != null) item.setItemName(toChange.itemName()); diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index eddc9c0..d2b50e1 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -10,6 +10,7 @@ import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import de.timaldinger.einkaufsliste.Service.ShoppingListService; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -34,7 +35,7 @@ public class ShoppingListController { private ShoppingListService shoppingListService; @PostMapping("/api/lists") - public ResponseEntity addList(@RequestBody ShoppingListPostDTO newList){ + public ResponseEntity addList(@Valid @RequestBody ShoppingListPostDTO newList){ ShoppingList list = new ShoppingList(newList.listName(), null, null, 0, 0); shoppingListRepository.save(list); @@ -57,7 +58,7 @@ public class ShoppingListController { } @PatchMapping("/api/lists/{listID}") - public ResponseEntity editList(@PathVariable UUID listID,@RequestBody ShoppingListPatchDTO toChange){ + public ResponseEntity editList(@PathVariable UUID listID,@Valid @RequestBody ShoppingListPatchDTO toChange){ ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(() -> new ResourceNotFoundException("listID", listID)); if(toChange.newListName() != null) list.setListName(toChange.newListName()); diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Patch/ShoppingCategoryPatchDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Patch/ShoppingCategoryPatchDTO.java index b9cc923..36ac369 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/Patch/ShoppingCategoryPatchDTO.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Patch/ShoppingCategoryPatchDTO.java @@ -1,4 +1,6 @@ package de.timaldinger.einkaufsliste.Dto.Patch; -public record ShoppingCategoryPatchDTO(String categoryName) { +import jakarta.validation.constraints.NotBlank; + +public record ShoppingCategoryPatchDTO(@NotBlank(message = "categoryName can't be blank") String categoryName) { } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Patch/ShoppingItemPatchDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Patch/ShoppingItemPatchDTO.java index 9764d5b..bb42b4a 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/Patch/ShoppingItemPatchDTO.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Patch/ShoppingItemPatchDTO.java @@ -1,6 +1,15 @@ package de.timaldinger.einkaufsliste.Dto.Patch; +import jakarta.validation.constraints.AssertTrue; + import java.util.UUID; public record ShoppingItemPatchDTO(String itemName, String itemAmount, Boolean isDone, UUID categoryID) { + + @AssertTrue(message = "itemName and itemAmount both cant be blank!") + private boolean isAtleastOneNotBlank(){ + boolean n = itemName != null && !itemName.isBlank(); + boolean a = itemAmount != null && !itemAmount.isBlank(); + return n || a; + } } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Patch/ShoppingListPatchDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Patch/ShoppingListPatchDTO.java index 7572e96..632ba10 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/Patch/ShoppingListPatchDTO.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Patch/ShoppingListPatchDTO.java @@ -1,4 +1,6 @@ package de.timaldinger.einkaufsliste.Dto.Patch; -public record ShoppingListPatchDTO(String newListName) { +import jakarta.validation.constraints.NotBlank; + +public record ShoppingListPatchDTO(@NotBlank(message = "listName must not be blank!") String newListName) { } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Post/ShoppingCategoryPostDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Post/ShoppingCategoryPostDTO.java index 46f8ab8..6dc0f27 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/Post/ShoppingCategoryPostDTO.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Post/ShoppingCategoryPostDTO.java @@ -1,6 +1,8 @@ package de.timaldinger.einkaufsliste.Dto.Post; +import jakarta.validation.constraints.NotBlank; + import java.util.UUID; -public record ShoppingCategoryPostDTO(String categoryName, UUID listID) { +public record ShoppingCategoryPostDTO(@NotBlank String categoryName, UUID listID) { } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Post/ShoppingItemPostDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Post/ShoppingItemPostDTO.java index 2034bd8..4673ac9 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/Post/ShoppingItemPostDTO.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Post/ShoppingItemPostDTO.java @@ -1,6 +1,20 @@ package de.timaldinger.einkaufsliste.Dto.Post; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.NotNull; + import java.util.UUID; -public record ShoppingItemPostDTO(String itemName, String itemAmount, UUID categoryID, UUID listID){ +public record ShoppingItemPostDTO(String itemName, + String itemAmount, + UUID categoryID, + @NotNull(message = "listID must not be empty!") + UUID listID){ + + @AssertTrue(message = "itemName and itemAmount cant both be blank!") + private boolean isAtleastOneNotBlank(){ + boolean n = itemName != null && !itemName.isBlank(); + boolean a = itemAmount != null && !itemAmount.isBlank(); + return n || a; + } } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Post/ShoppingListPostDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Post/ShoppingListPostDTO.java index 2a60aba..d938376 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/Post/ShoppingListPostDTO.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Post/ShoppingListPostDTO.java @@ -1,4 +1,6 @@ package de.timaldinger.einkaufsliste.Dto.Post; -public record ShoppingListPostDTO(String listName) { +import jakarta.validation.constraints.NotBlank; + +public record ShoppingListPostDTO(@NotBlank(message = "listName must not be blank!") String listName) { } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Exceptions/GlobalExceptionHandler.java b/src/main/java/de/timaldinger/einkaufsliste/Exceptions/GlobalExceptionHandler.java index 25a60f9..a6996ab 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Exceptions/GlobalExceptionHandler.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Exceptions/GlobalExceptionHandler.java @@ -2,19 +2,28 @@ package de.timaldinger.einkaufsliste.Exceptions; import jakarta.servlet.http.HttpServletRequest; import org.jspecify.annotations.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.context.request.WebRequest; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; +import java.util.stream.Collectors; + @RestControllerAdvice public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { + + private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class); + @ExceptionHandler(BadRequestException.class) public ResponseEntity handleBadRequest(BadRequestException e, HttpServletRequest req) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) @@ -28,6 +37,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { @ExceptionHandler(Exception.class) public ResponseEntity handleAll(Exception e, HttpServletRequest req){ + log.error("{}",req.getRequestURI(), e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ErrorResponse(500,"Internal error", req.getRequestURI())); } @@ -36,4 +46,13 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { var error = new ErrorResponse(statusCode.value(), ex.getMessage(),((ServletWebRequest) request).getRequest().getRequestURI()); return new ResponseEntity<>(error,headers,statusCode); } + + @Override + protected @Nullable ResponseEntity handleMethodArgumentNotValid(MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) { + String msg = ex.getBindingResult().getFieldErrors().stream() + .map(DefaultMessageSourceResolvable::getDefaultMessage) + .collect(Collectors.joining(", ")); + var error = new ErrorResponse(status.value(), msg ,((ServletWebRequest) request).getRequest().getRequestURI()); + return new ResponseEntity<>(error,headers,status); + } } \ No newline at end of file diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java index 7ad1a87..c04af9f 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java @@ -16,7 +16,6 @@ import java.util.List; @NoArgsConstructor public class ShoppingCategory extends ShoppingElement{ - @NotBlank private String categoryName; @OneToMany(mappedBy = "category") //eine Liste hat mehrere Kategorien, diese sind mappedBy category (Feld in ShoppingItem) damit keine extra Tabelle erzeugt wird private List itemsInCategory; diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java index b7540fe..300626b 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java @@ -14,7 +14,6 @@ import lombok.*; @ToString public class ShoppingItem extends ShoppingElement { - @NotBlank private String itemName; private String itemAmount; private boolean isDone; diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java index 6eb49d0..0f2669f 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java @@ -15,7 +15,6 @@ import java.sql.Date; @AllArgsConstructor @NoArgsConstructor public class ShoppingList extends ShoppingElement { - @NotBlank private String listName; private Date dateCreated; private Date lastChanged; diff --git a/src/main/resources/static/js/pages/index/frontend/indexUI.js b/src/main/resources/static/js/pages/index/frontend/indexUI.js index 4322465..6f4e900 100644 --- a/src/main/resources/static/js/pages/index/frontend/indexUI.js +++ b/src/main/resources/static/js/pages/index/frontend/indexUI.js @@ -29,6 +29,9 @@ export function createEditListForm(textElement) { abortButton.textContent = "Abbrechen"; saveButton.textContent = "Speichern"; + saveButton.classList.add("editForm__saveButton"); + abortButton.classList.add("editForm__abortButton"); + editForm.appendChild(inputName); editForm.appendChild(saveButton); editForm.appendChild(abortButton); diff --git a/src/main/resources/static/js/pages/index/index.js b/src/main/resources/static/js/pages/index/index.js index c2a39af..a3e0dd9 100644 --- a/src/main/resources/static/js/pages/index/index.js +++ b/src/main/resources/static/js/pages/index/index.js @@ -1,4 +1,4 @@ -import { ShoppingList } from "../../models/ShoppingList.js"; +import { showError, initErrors } from "../../shared/error.js"; import * as api from "./api/indexAPI.js"; import * as ui from "./frontend/indexUI.js" @@ -9,7 +9,8 @@ async function addList(listName) { const json = await response.json(); if (!response.ok) { - console.error(`error creating list ${json}`); + console.error(`error creating list ${json.msg}`); + showError(json.msg); return; } @@ -34,6 +35,8 @@ function editList(listLi) { if (!response.ok) { const json = await response.json(); console.error(`error editing list ${json}`); + showError(json.msg); + return; } @@ -45,6 +48,9 @@ function editList(listLi) { save(); }); + formElement.querySelector(".editForm__abortButton").addEventListener("click", () => { + formElement.replaceWith(listLi); + }) formElement.addEventListener("keydown", (e) => { if (e.key == "Escape") formElement.replaceWith(listLi); }) @@ -59,6 +65,8 @@ async function deleteList(listElement) { if (!response.ok) { const json = await response.json(); console.error(`error deleting list ${json}`); + showError(json.msg); + return; } @@ -67,6 +75,8 @@ async function deleteList(listElement) { function init() { + + initErrors(document.querySelector(".nav")); addListForm.addEventListener("submit", (e) => { e.preventDefault(); const formData = Object.fromEntries(new FormData(addListForm)); diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index ec9e5e5..87a2fc2 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -1,3 +1,4 @@ +import { showError, initErrors } from "../../shared/error.js"; import * as api from "./api/listAPI.js" import * as ui from "./frontend/listUI.js" @@ -15,6 +16,7 @@ async function addItem(itemName, itemAmount, categoryID) { if (!response.ok) { console.error(`Error, item couldnt be created ${json}`); + showError(json.msg); return; } @@ -29,7 +31,9 @@ async function addCategory(categoryName) { const json = await response.json(); if (!response.ok) { - console.error(`Error, category couldnt be created ${json}`) + console.error(`Error, category couldnt be created ${json}`); + showError(json.msg); + return; } @@ -54,11 +58,12 @@ async function editItem(textElement) { let formData = Object.fromEntries(new FormData(formElement)); console.log(`editing item ${id} with ${formData}`) - const response = await api.editItem(id, { itemName: formData.newName, itemAmount: formData.newAmount }); + const response = await api.editItem(id, { itemName: formData.newItemName, itemAmount: formData.newItemAmount }); if (!response.ok) { const json = await response.json(); console.error(`Error editingItem ${json}`); + showError(json.msg) return; } @@ -99,6 +104,7 @@ function editCategory(categoryElement) { if (!response.ok) { const json = await response.json(); console.error(`Error editing category ${json}`); + showError(json.msg); return; } @@ -121,6 +127,7 @@ async function deleteItem(li) { if (!response.ok) { const json = await response.json(); console.error(`Error deleting item ${json}`); + showError(json.msg); return; } @@ -134,6 +141,7 @@ async function deleteCategory(deleteAllItems, categoryID) { if (!response.ok) { const json = await response.json(); console.error(`Error deleting category ${json}`); + showError(json.msg); return; } ui.deleteCategory(deleteAllItems, categoryID); @@ -146,12 +154,17 @@ async function deleteAllDoneItems() { if (!response.ok) { const json = await response.json(); console.error(`Error deleting all done items ${json}`); + showError(json.msg); + return; } ui.deleteAllDoneItems(); } function init() { + + initErrors(document.querySelector(".nav")); + addCategoryForm.addEventListener("submit", (event) => { event.preventDefault(); let formData = Object.fromEntries(new FormData(addCategoryForm)); diff --git a/src/main/resources/static/js/shared/error.js b/src/main/resources/static/js/shared/error.js new file mode 100644 index 0000000..fb53e23 --- /dev/null +++ b/src/main/resources/static/js/shared/error.js @@ -0,0 +1,22 @@ +const errorDiv = document.createElement("div"); +const errorSpan = document.createElement("span"); +let errorTimer; + +export function showError(msg) { + errorSpan.textContent = msg; + errorDiv.hidden = false + + clearTimeout(errorTimer); + errorTimer = (setTimeout(() => { + errorDiv.hidden = true; + errorSpan.textContent = ""; + }, 3000)); +} + + +export function initErrors(element) { + errorDiv.hidden = true; + errorDiv.append(errorSpan); + + element.append(errorDiv); +}