refactor, Präfix ShoppingList -> Shopping

This commit is contained in:
Technoir committed 2026-10-06 13:59:35 +02:00
1 parent d5df05f87a
commit f4822ceb4d
10 files changed
+56 -61

No files matched your search

@@ -1,8 +1,8 @@
package de.timaldinger.einkaufsliste.Controller;
import de.timaldinger.einkaufsliste.Models.ShoppingList;
import de.timaldinger.einkaufsliste.Repository.ShoppingListCategoryRepository;
import de.timaldinger.einkaufsliste.Repository.ShoppingListItemRepository;
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;
@@ -10,7 +10,6 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import java.util.Optional;
import java.util.UUID;
@Controller
@@ -21,10 +20,10 @@ public class PageController {
private ShoppingListRepository shoppingListRepository;
@Autowired
private ShoppingListCategoryRepository shoppingListCategoryRepository;
private ShoppingCategoryRepository shoppingCategoryRepository;
@Autowired
private ShoppingListItemRepository shoppingListItemRepository;
private ShoppingItemRepository shoppingItemRepository;
@PostMapping("api/list")
public String addList(@Valid @ModelAttribute ShoppingList newList){
@@ -54,8 +53,8 @@ public class PageController {
public String list(Model model, @PathVariable UUID id){
ShoppingList list = shoppingListRepository.findById(id).orElseThrow();
model.addAttribute("list", list);
model.addAttribute("categories", shoppingListCategoryRepository.findByShoppingList(list));
model.addAttribute("items", shoppingListItemRepository.findByListAndCategoryIsNull(list));
model.addAttribute("categories", shoppingCategoryRepository.findByShoppingList(list));
model.addAttribute("items", shoppingItemRepository.findByListAndCategoryIsNull(list));
return "list";
}
}
@@ -1,20 +1,17 @@
package de.timaldinger.einkaufsliste.Controller;
import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO;
import de.timaldinger.einkaufsliste.Dto.ShoppingListItemDTO;
import de.timaldinger.einkaufsliste.Dto.ShoppingItemResponseDTO;
import de.timaldinger.einkaufsliste.Dto.ShoppingItemDTO;
import de.timaldinger.einkaufsliste.Models.ShoppingList;
import de.timaldinger.einkaufsliste.Models.ShoppingListCategory;
import de.timaldinger.einkaufsliste.Models.ShoppingListItem;
import de.timaldinger.einkaufsliste.Repository.ShoppingListCategoryRepository;
import de.timaldinger.einkaufsliste.Repository.ShoppingListItemRepository;
import de.timaldinger.einkaufsliste.Models.ShoppingCategory;
import de.timaldinger.einkaufsliste.Models.ShoppingItem;
import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository;
import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository;
import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.ResponseEntity;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import org.thymeleaf.expression.Lists;
import java.util.List;
import java.util.UUID;
@@ -23,21 +20,21 @@ import java.util.UUID;
public class ShoppingListController {
@Autowired
private ShoppingListCategoryRepository shoppingListCategoryRepository;
private ShoppingCategoryRepository shoppingCategoryRepository;
@Autowired
private ShoppingListRepository shoppingListRepository;
@Autowired
private ShoppingListItemRepository shoppingListItemRepository;
private ShoppingItemRepository shoppingItemRepository;
@PostMapping("/api/list/{listID}/category/")
public ShoppingListCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){
public ShoppingCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){
String name = newCategory.categoryName();
ShoppingList list = shoppingListRepository.findById(listID).orElseThrow();
ShoppingListCategory category = new ShoppingListCategory(name, List.of(),list);
ShoppingCategory category = new ShoppingCategory(name, List.of(),list);
shoppingListCategoryRepository.save(category);
shoppingCategoryRepository.save(category);
return category;
}
@@ -46,9 +43,9 @@ public class ShoppingListController {
public ShoppingListItem addItem(@PathVariable UUID listID, @RequestBody ShoppingListItemDTO newItem){
String name = newItem.itemName();
String amount = newItem.itemAmount();
ShoppingListCategory c;
ShoppingCategory c;
if(newItem.categoryID() != null){
c = shoppingListCategoryRepository.findById(newItem.categoryID()).orElseThrow();
c = shoppingCategoryRepository.findById(newItem.categoryID()).orElseThrow();
}else{
c = null;
}
@@ -60,10 +57,10 @@ public class ShoppingListController {
@DeleteMapping("/api/item/{itemID}")
public ResponseEntity<Void> deleteItem(@PathVariable UUID itemID){
if(!shoppingListItemRepository.existsById(itemID)){
if(!shoppingItemRepository.existsById(itemID)){
return ResponseEntity.notFound().build();
}
shoppingListItemRepository.deleteById(itemID);
shoppingItemRepository.deleteById(itemID);
return ResponseEntity.noContent().build();
}
}
@@ -0,0 +1,6 @@
package de.timaldinger.einkaufsliste.Dto;
import java.util.UUID;
public record ShoppingItemDTO(String itemName, String itemAmount, UUID categoryID, UUID listID){
}
@@ -1,6 +0,0 @@
package de.timaldinger.einkaufsliste.Dto;
import java.util.UUID;
public record ShoppingListItemDTO (String itemName, String itemAmount, UUID categoryID){
}
@@ -14,12 +14,12 @@ import java.util.List;
@Entity
@AllArgsConstructor
@NoArgsConstructor
public class ShoppingListCategory extends ShoppingElement{
public class ShoppingCategory extends ShoppingElement{
@NotBlank
private String categoryName;
@OneToMany(mappedBy = "category")
private List<ShoppingListItem> itemsInCategory;
private List<ShoppingItem> itemsInCategory;
@ManyToOne
@JoinColumn(name="list_id", nullable = false)
private ShoppingList shoppingList;
@@ -14,7 +14,7 @@ import lombok.Setter;
@Entity
@AllArgsConstructor
@NoArgsConstructor
public class ShoppingListItem extends ShoppingElement {
public class ShoppingItem extends ShoppingElement {
@NotBlank
private String itemName;
@@ -23,7 +23,7 @@ public class ShoppingListItem extends ShoppingElement {
@ManyToOne
@JoinColumn(name = "category_id", nullable = true)
private ShoppingListCategory category;
private ShoppingCategory category;
@ManyToOne
@JoinColumn(name = "list_id", nullable = false)
@@ -0,0 +1,13 @@
package de.timaldinger.einkaufsliste.Repository;
import de.timaldinger.einkaufsliste.Models.ShoppingList;
import de.timaldinger.einkaufsliste.Models.ShoppingCategory;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.UUID;
public interface ShoppingCategoryRepository extends JpaRepository<ShoppingCategory, UUID>{
List<ShoppingCategory> findByShoppingList(ShoppingList list);
}
@@ -0,0 +1,12 @@
package de.timaldinger.einkaufsliste.Repository;
import de.timaldinger.einkaufsliste.Models.ShoppingItem;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.UUID;
public interface ShoppingItemRepository extends JpaRepository<ShoppingItem, UUID> {
List<ShoppingItem> findByListAndCategoryIsNull(Object list);
}
@@ -1,13 +0,0 @@
package de.timaldinger.einkaufsliste.Repository;
import de.timaldinger.einkaufsliste.Models.ShoppingList;
import de.timaldinger.einkaufsliste.Models.ShoppingListCategory;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.UUID;
public interface ShoppingListCategoryRepository extends JpaRepository<ShoppingListCategory, UUID>{
List<ShoppingListCategory> findByShoppingList(ShoppingList list);
}
@@ -1,13 +0,0 @@
package de.timaldinger.einkaufsliste.Repository;
import de.timaldinger.einkaufsliste.Models.ShoppingElement;
import de.timaldinger.einkaufsliste.Models.ShoppingListItem;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.UUID;
public interface ShoppingListItemRepository extends JpaRepository<ShoppingListItem, UUID> {
List<ShoppingListItem> findByListAndCategoryIsNull(Object list);
}