Compare commits

..
2 Commits
Author SHA1 Message Date
Technoir aef3ead025 refactor zu 9b18eb0f 2026-10-19 23:58:11 +02:00
Technoir 9b18eb0f0f refactor: Shopping...ResponseDTO refactored
Name war nicht eindeutig, Die ResponseDTOs bezogen sich auf die Antwort
die der Server schickt bei einer Post-Request.
2026-10-19 23:57:41 +02:00
12 changed files with 36 additions and 36 deletions

No files matched your search

@@ -3,7 +3,7 @@ package de.timaldinger.einkaufsliste.Controller;
import de.timaldinger.einkaufsliste.Dto.Get.ShoppingCategoryGetDTO;
import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingCategoryPatchDTO;
import de.timaldinger.einkaufsliste.Dto.Post.ShoppingCategoryPostDTO;
import de.timaldinger.einkaufsliste.Dto.Response.ShoppingCategoryResponseDTO;
import de.timaldinger.einkaufsliste.Dto.Post.Response.ShoppingCategoryPostResponseDTO;
import de.timaldinger.einkaufsliste.Service.ShoppingCategoryService;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +26,8 @@ public class ShoppingCategoryController {
}
@PostMapping("/api/categories")
public ResponseEntity<ShoppingCategoryResponseDTO> addCategory(@Valid @RequestBody ShoppingCategoryPostDTO newCategory){
ShoppingCategoryResponseDTO created = shoppingCategoryService.addCategory(newCategory);
public ResponseEntity<ShoppingCategoryPostResponseDTO> addCategory(@Valid @RequestBody ShoppingCategoryPostDTO newCategory){
ShoppingCategoryPostResponseDTO created = shoppingCategoryService.addCategory(newCategory);
URI location = ServletUriComponentsBuilder
.fromCurrentRequest()
@@ -3,7 +3,7 @@ package de.timaldinger.einkaufsliste.Controller;
import de.timaldinger.einkaufsliste.Dto.Get.ShoppingItemGetDTO;
import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingItemPatchDTO;
import de.timaldinger.einkaufsliste.Dto.Post.ShoppingItemPostDTO;
import de.timaldinger.einkaufsliste.Dto.Response.ShoppingItemResponseDTO;
import de.timaldinger.einkaufsliste.Dto.Post.Response.ShoppingItemPostResponseDTO;
import de.timaldinger.einkaufsliste.Service.ShoppingItemService;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +26,8 @@ public class ShoppingItemController {
}
@PostMapping("/api/items")
public ResponseEntity<ShoppingItemResponseDTO> addItem(@Valid @RequestBody ShoppingItemPostDTO newItem){
ShoppingItemResponseDTO created = shoppingItemService.addItem(newItem);
public ResponseEntity<ShoppingItemPostResponseDTO> addItem(@Valid @RequestBody ShoppingItemPostDTO newItem){
ShoppingItemPostResponseDTO created = shoppingItemService.addItem(newItem);
URI location = ServletUriComponentsBuilder
.fromCurrentRequest()
@@ -4,7 +4,7 @@ import de.timaldinger.einkaufsliste.Dto.Get.ShoppingListGetDTO;
import de.timaldinger.einkaufsliste.Dto.Get.ShoppingListsGetDTO;
import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingListPatchDTO;
import de.timaldinger.einkaufsliste.Dto.Post.ShoppingListPostDTO;
import de.timaldinger.einkaufsliste.Dto.Response.ShoppingListResponseDTO;
import de.timaldinger.einkaufsliste.Dto.Post.Response.ShoppingListPostResponseDTO;
import de.timaldinger.einkaufsliste.Service.ShoppingListService;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,8 +33,8 @@ public class ShoppingListController {
}
@PostMapping("/api/lists")
public ResponseEntity<ShoppingListResponseDTO> addList(@Valid @RequestBody ShoppingListPostDTO newList){
ShoppingListResponseDTO created = shoppingListService.addList(newList);
public ResponseEntity<ShoppingListPostResponseDTO> addList(@Valid @RequestBody ShoppingListPostDTO newList){
ShoppingListPostResponseDTO created = shoppingListService.addList(newList);
URI location = ServletUriComponentsBuilder
.fromCurrentRequest()
@@ -0,0 +1,6 @@
package de.timaldinger.einkaufsliste.Dto.Post.Response;
import java.util.UUID;
public record ShoppingCategoryPostResponseDTO(String categoryName, UUID categoryID){
}
@@ -0,0 +1,6 @@
package de.timaldinger.einkaufsliste.Dto.Post.Response;
import java.util.UUID;
public record ShoppingItemPostResponseDTO(String itemName, String itemAmount, UUID itemID, UUID categoryID) {
}
@@ -0,0 +1,6 @@
package de.timaldinger.einkaufsliste.Dto.Post.Response;
import java.util.UUID;
public record ShoppingListPostResponseDTO(String listName, UUID listID){
}
@@ -1,6 +0,0 @@
package de.timaldinger.einkaufsliste.Dto.Response;
import java.util.UUID;
public record ShoppingCategoryResponseDTO (String categoryName, UUID categoryID){
}
@@ -1,6 +0,0 @@
package de.timaldinger.einkaufsliste.Dto.Response;
import java.util.UUID;
public record ShoppingItemResponseDTO(String itemName, String itemAmount, UUID itemID, UUID categoryID) {
}
@@ -1,6 +0,0 @@
package de.timaldinger.einkaufsliste.Dto.Response;
import java.util.UUID;
public record ShoppingListResponseDTO (String listName, UUID listID){
}
@@ -3,7 +3,7 @@ package de.timaldinger.einkaufsliste.Service;
import de.timaldinger.einkaufsliste.Dto.Get.ShoppingCategoryGetDTO;
import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingCategoryPatchDTO;
import de.timaldinger.einkaufsliste.Dto.Post.ShoppingCategoryPostDTO;
import de.timaldinger.einkaufsliste.Dto.Response.ShoppingCategoryResponseDTO;
import de.timaldinger.einkaufsliste.Dto.Post.Response.ShoppingCategoryPostResponseDTO;
import de.timaldinger.einkaufsliste.Exceptions.BadRequestException;
import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException;
import de.timaldinger.einkaufsliste.Mapper.ShoppingCategoryMapper;
@@ -37,13 +37,13 @@ public class ShoppingCategoryService {
return shoppingCategoryMapper.toGetDTO(category);
}
public ShoppingCategoryResponseDTO addCategory(ShoppingCategoryPostDTO newCategory){
public ShoppingCategoryPostResponseDTO addCategory(ShoppingCategoryPostDTO newCategory){
ShoppingList list = shoppingListRepository.findById(newCategory.listID()).orElseThrow(() -> new ResourceNotFoundException("listID", newCategory.listID()));
ShoppingCategory category = new ShoppingCategory(newCategory.categoryName(), List.of(), list);
shoppingCategoryRepository.save(category);
return new ShoppingCategoryResponseDTO(category.getCategoryName(), category.getId());
return new ShoppingCategoryPostResponseDTO(category.getCategoryName(), category.getId());
}
public void editCategory(UUID categoryID, ShoppingCategoryPatchDTO toChange){
@@ -3,7 +3,7 @@ package de.timaldinger.einkaufsliste.Service;
import de.timaldinger.einkaufsliste.Dto.Get.ShoppingItemGetDTO;
import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingItemPatchDTO;
import de.timaldinger.einkaufsliste.Dto.Post.ShoppingItemPostDTO;
import de.timaldinger.einkaufsliste.Dto.Response.ShoppingItemResponseDTO;
import de.timaldinger.einkaufsliste.Dto.Post.Response.ShoppingItemPostResponseDTO;
import de.timaldinger.einkaufsliste.Exceptions.BadRequestException;
import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException;
import de.timaldinger.einkaufsliste.Mapper.ShoppingItemMapper;
@@ -36,7 +36,7 @@ public class ShoppingItemService {
return shoppingItemMapper.toGetDTO(item);
}
public ShoppingItemResponseDTO addItem(ShoppingItemPostDTO newItem){
public ShoppingItemPostResponseDTO addItem(ShoppingItemPostDTO newItem){
ShoppingCategory category = null;
if(newItem.categoryID() != null){
category = shoppingCategoryRepository.findById(newItem.categoryID()).orElseThrow(() -> new ResourceNotFoundException("categoryID", newItem.categoryID()));
@@ -46,7 +46,7 @@ public class ShoppingItemService {
ShoppingItem item = new ShoppingItem(newItem.itemName(), newItem.itemAmount(), false, category, list);
shoppingItemRepository.save(item);
return new ShoppingItemResponseDTO(item.getItemName(), item.getItemAmount(), item.getId(), category != null ? category.getId() : null);
return new ShoppingItemPostResponseDTO(item.getItemName(), item.getItemAmount(), item.getId(), category != null ? category.getId() : null);
}
public void editItem(UUID itemID, ShoppingItemPatchDTO toChange){
@@ -3,7 +3,7 @@ package de.timaldinger.einkaufsliste.Service;
import de.timaldinger.einkaufsliste.Dto.Get.*;
import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingListPatchDTO;
import de.timaldinger.einkaufsliste.Dto.Post.ShoppingListPostDTO;
import de.timaldinger.einkaufsliste.Dto.Response.ShoppingListResponseDTO;
import de.timaldinger.einkaufsliste.Dto.Post.Response.ShoppingListPostResponseDTO;
import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException;
import de.timaldinger.einkaufsliste.Mapper.ShoppingCategoryMapper;
import de.timaldinger.einkaufsliste.Mapper.ShoppingItemMapper;
@@ -47,10 +47,10 @@ public class ShoppingListService {
return new ShoppingListGetDTO(categories, items);
}
public ShoppingListResponseDTO addList(ShoppingListPostDTO newList){
public ShoppingListPostResponseDTO addList(ShoppingListPostDTO newList){
ShoppingList list = new ShoppingList(newList.listName());
shoppingListRepository.save(list);
return new ShoppingListResponseDTO(list.getListName(), list.getId());
return new ShoppingListPostResponseDTO(list.getListName(), list.getId());
}
public void editList(UUID listID, ShoppingListPatchDTO toChange){