Compare commits
15
Commits
75d9591f2d
...
c0cbc5a49c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c0cbc5a49c | ||
|
|
16775b45ee | ||
|
|
0ac781114f | ||
|
|
d373ecce2b | ||
|
|
ea8ebf79b2 | ||
|
|
966705ec90 | ||
|
|
4bbc1b73d5 | ||
|
|
4f387d2b7f | ||
|
|
1c1d3f6571 | ||
|
|
7db358721d | ||
|
|
c1bd997e33 | ||
|
|
df20f8c426 | ||
|
|
c0cddc3ef8 | ||
|
|
e8d35385ca | ||
|
|
d4b5382f70 |
No files matched your search
+10
-2
@@ -1,5 +1,6 @@
|
||||
package de.timaldinger.einkaufsliste.Controller;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Dto.Get.ShoppingCategoryGetDTO;
|
||||
import de.timaldinger.einkaufsliste.Dto.Post.ShoppingCategoryPostDTO;
|
||||
import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingCategoryPatchDTO;
|
||||
import de.timaldinger.einkaufsliste.Dto.Response.ShoppingCategoryResponseDTO;
|
||||
@@ -11,12 +12,11 @@ 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 de.timaldinger.einkaufsliste.Service.ShoppingCategoryService;
|
||||
import jakarta.validation.Valid;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
|
||||
|
||||
import java.net.URI;
|
||||
@@ -32,6 +32,14 @@ public class ShoppingCategoryController {
|
||||
@Autowired
|
||||
private ShoppingItemRepository shoppingItemRepository;
|
||||
|
||||
@Autowired
|
||||
private ShoppingCategoryService shoppingCategoryService;
|
||||
|
||||
@GetMapping("/api/categories/{categoryID}")
|
||||
public ResponseEntity<ShoppingCategoryGetDTO> getCategory(@PathVariable UUID categoryID){
|
||||
return ResponseEntity.ok().body(shoppingCategoryService.getCategory(categoryID));
|
||||
}
|
||||
|
||||
@PostMapping("/api/categories")
|
||||
public ResponseEntity<ShoppingCategoryResponseDTO> addCategory(@Valid @RequestBody ShoppingCategoryPostDTO newCategory){
|
||||
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
package de.timaldinger.einkaufsliste.Controller;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Dto.Get.ShoppingItemGetDTO;
|
||||
import de.timaldinger.einkaufsliste.Dto.Post.ShoppingItemPostDTO;
|
||||
import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingItemPatchDTO;
|
||||
import de.timaldinger.einkaufsliste.Dto.Response.ShoppingItemResponseDTO;
|
||||
import de.timaldinger.einkaufsliste.Exceptions.BadRequestException;
|
||||
import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException;
|
||||
import de.timaldinger.einkaufsliste.Mapper.ShoppingItemMapper;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingCategory;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingItem;
|
||||
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.annotation.Resource;
|
||||
import de.timaldinger.einkaufsliste.Service.ShoppingItemService;
|
||||
import jakarta.validation.Valid;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
|
||||
|
||||
import java.net.URI;
|
||||
@@ -33,6 +33,17 @@ public class ShoppingItemController {
|
||||
@Autowired
|
||||
private ShoppingItemRepository shoppingItemRepository;
|
||||
|
||||
@Autowired
|
||||
private ShoppingItemService shoppingItemService;
|
||||
|
||||
@Autowired
|
||||
private ShoppingItemMapper shoppingItemMapper;
|
||||
|
||||
@GetMapping("/api/items/{itemID}")
|
||||
public ResponseEntity<ShoppingItemGetDTO> getItem(@PathVariable UUID itemID){
|
||||
return ResponseEntity.ok().body(shoppingItemService.getItem(itemID));
|
||||
}
|
||||
|
||||
@PostMapping("/api/items")
|
||||
public ResponseEntity<ShoppingItemResponseDTO> addItem(@Valid @RequestBody ShoppingItemPostDTO newItem){
|
||||
String name = newItem.itemName();
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package de.timaldinger.einkaufsliste.Controller;
|
||||
|
||||
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.Exceptions.ResourceNotFoundException;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingItem;
|
||||
import de.timaldinger.einkaufsliste.Mapper.ShoppingCategoryMapper;
|
||||
import de.timaldinger.einkaufsliste.Mapper.ShoppingItemMapper;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingList;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository;
|
||||
@@ -12,10 +14,8 @@ 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;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
|
||||
|
||||
import java.net.URI;
|
||||
@@ -34,6 +34,21 @@ public class ShoppingListController {
|
||||
@Autowired
|
||||
private ShoppingListService shoppingListService;
|
||||
|
||||
@Autowired
|
||||
private ShoppingItemMapper shoppingItemMapper;
|
||||
@Autowired
|
||||
private ShoppingCategoryMapper shoppingCategoryMapper;
|
||||
|
||||
@GetMapping("/api/lists")
|
||||
public ResponseEntity<List<ShoppingListsGetDTO>> getLists(){
|
||||
return ResponseEntity.ok().body(shoppingListService.getLists());
|
||||
}
|
||||
|
||||
@GetMapping("/api/lists/{listID}")
|
||||
public ResponseEntity<ShoppingListGetDTO> getList(@PathVariable UUID listID){
|
||||
return ResponseEntity.ok().body(shoppingListService.getList(listID));
|
||||
}
|
||||
|
||||
@PostMapping("/api/lists")
|
||||
public ResponseEntity<ShoppingListResponseDTO> addList(@Valid @RequestBody ShoppingListPostDTO newList){
|
||||
ShoppingList list = new ShoppingList(newList.listName(), null, null, 0, 0);
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package de.timaldinger.einkaufsliste.Dto.Get;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShoppingCategoryGetDTO(String categoryName, List<ShoppingItemGetDTO> items, UUID categoryID) {
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package de.timaldinger.einkaufsliste.Dto.Get;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShoppingItemGetDTO(boolean status, String itemName, String itemAmount, UUID itemID, UUID categoryID, UUID listID) {
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package de.timaldinger.einkaufsliste.Dto.Get;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public record ShoppingListGetDTO(List<ShoppingCategoryGetDTO> categories, List<ShoppingItemGetDTO> itemsNoCategory) {
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package de.timaldinger.einkaufsliste.Dto.Get;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShoppingListsGetDTO(String listName, UUID listID){
|
||||
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package de.timaldinger.einkaufsliste.Mapper;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Dto.Get.ShoppingCategoryGetDTO;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingCategory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Component
|
||||
public class ShoppingCategoryMapper {
|
||||
|
||||
@Autowired
|
||||
ShoppingItemMapper shoppingItemMapper;
|
||||
|
||||
public ShoppingCategoryGetDTO toGetDTO(ShoppingCategory category){
|
||||
return new ShoppingCategoryGetDTO(
|
||||
category.getCategoryName(),
|
||||
shoppingItemMapper.toGetDTOs(category.getItemsInCategory()),
|
||||
category.getId()
|
||||
);
|
||||
}
|
||||
|
||||
public List<ShoppingCategoryGetDTO> toGetDTOs(List<ShoppingCategory> categories){
|
||||
return categories.stream().map(this::toGetDTO).toList();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package de.timaldinger.einkaufsliste.Mapper;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Dto.Get.ShoppingItemGetDTO;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingItem;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Component
|
||||
public class ShoppingItemMapper {
|
||||
public ShoppingItemGetDTO toGetDTO(ShoppingItem item){
|
||||
return new ShoppingItemGetDTO(
|
||||
item.isDone(),
|
||||
item.getItemName(),
|
||||
item.getItemAmount(),
|
||||
item.getId(),
|
||||
item.getCategory() != null ? item.getCategory().getId() : null,
|
||||
item.getList().getId()
|
||||
);
|
||||
}
|
||||
|
||||
public List<ShoppingItemGetDTO> toGetDTOs(List<ShoppingItem> items){
|
||||
return items.stream().map(this::toGetDTO).toList();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package de.timaldinger.einkaufsliste.Mapper;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Dto.Get.ShoppingListsGetDTO;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingList;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Component
|
||||
public class ShoppingListMapper {
|
||||
|
||||
public List<ShoppingListsGetDTO> toListsGetDTOs(List<ShoppingList> list){
|
||||
return list.stream().map(this::toListsGetDTO).toList();
|
||||
}
|
||||
|
||||
public ShoppingListsGetDTO toListsGetDTO(ShoppingList list){
|
||||
return new ShoppingListsGetDTO(
|
||||
list.getListName(),
|
||||
list.getId()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,10 @@ import java.util.UUID;
|
||||
|
||||
public interface ShoppingCategoryRepository extends JpaRepository<ShoppingCategory, UUID>{
|
||||
List<ShoppingCategory> findByList(ShoppingList list);
|
||||
List<ShoppingCategory> findByList_Id(UUID listID);
|
||||
@Modifying
|
||||
@Query("DELETE FROM ShoppingCategory c WHERE c.list.id = :listID")
|
||||
void deleteByListId(@Param("listID") UUID listID);
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package de.timaldinger.einkaufsliste.Service;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Dto.Get.ShoppingCategoryGetDTO;
|
||||
import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException;
|
||||
import de.timaldinger.einkaufsliste.Mapper.ShoppingCategoryMapper;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingCategory;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@Service
|
||||
public class ShoppingCategoryService {
|
||||
|
||||
@Autowired
|
||||
private ShoppingCategoryMapper shoppingCategoryMapper;
|
||||
|
||||
@Autowired
|
||||
private ShoppingCategoryRepository shoppingCategoryRepository;
|
||||
|
||||
public ShoppingCategoryGetDTO getCategory(UUID categoryID){
|
||||
ShoppingCategory category = shoppingCategoryRepository.findById(categoryID).orElseThrow(() -> new ResourceNotFoundException("categoryID", categoryID));
|
||||
return shoppingCategoryMapper.toGetDTO(category);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package de.timaldinger.einkaufsliste.Service;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Dto.Get.ShoppingItemGetDTO;
|
||||
import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException;
|
||||
import de.timaldinger.einkaufsliste.Mapper.ShoppingItemMapper;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingItem;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@Service
|
||||
public class ShoppingItemService {
|
||||
|
||||
@Autowired
|
||||
private ShoppingItemMapper shoppingItemMapper;
|
||||
@Autowired
|
||||
private ShoppingItemRepository shoppingItemRepository;
|
||||
|
||||
public ShoppingItemGetDTO getItem(UUID itemID){
|
||||
ShoppingItem item = shoppingItemRepository.findById(itemID).orElseThrow(() -> new ResourceNotFoundException("itemID", itemID));
|
||||
return shoppingItemMapper.toGetDTO(item);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +1,11 @@
|
||||
package de.timaldinger.einkaufsliste.Service;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Dto.Get.*;
|
||||
import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException;
|
||||
import de.timaldinger.einkaufsliste.Mapper.ShoppingCategoryMapper;
|
||||
import de.timaldinger.einkaufsliste.Mapper.ShoppingItemMapper;
|
||||
import de.timaldinger.einkaufsliste.Mapper.ShoppingListMapper;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingList;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository;
|
||||
@@ -7,6 +13,7 @@ import jakarta.transaction.Transactional;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@Service
|
||||
@@ -17,6 +24,12 @@ public class ShoppingListService {
|
||||
private ShoppingListRepository shoppingListRepository;
|
||||
@Autowired
|
||||
private ShoppingCategoryRepository shoppingCategoryRepository;
|
||||
@Autowired
|
||||
private ShoppingCategoryMapper shoppingCategoryMapper;
|
||||
@Autowired
|
||||
private ShoppingItemMapper shoppingItemMapper;
|
||||
@Autowired
|
||||
private ShoppingListMapper shoppingListMapper;
|
||||
|
||||
@Transactional
|
||||
public void deleteList(UUID listID){
|
||||
@@ -24,4 +37,21 @@ public class ShoppingListService {
|
||||
shoppingCategoryRepository.deleteByListId(listID);
|
||||
shoppingListRepository.deleteById(listID);
|
||||
}
|
||||
|
||||
public List<ShoppingListsGetDTO> getLists(){
|
||||
return shoppingListMapper.toListsGetDTOs(shoppingListRepository.findAll());
|
||||
}
|
||||
|
||||
public ShoppingListGetDTO getList(UUID listID){
|
||||
|
||||
ShoppingList l = shoppingListRepository.findById(listID).orElseThrow( () -> new ResourceNotFoundException("listID", listID));
|
||||
|
||||
List<ShoppingCategoryGetDTO> categories = shoppingCategoryMapper.toGetDTOs(shoppingCategoryRepository.findByList(l));
|
||||
|
||||
List<ShoppingItemGetDTO> items = shoppingItemMapper.toGetDTOs(shoppingItemRepository.findByList_IdAndCategoryIsNull(listID));
|
||||
|
||||
return new ShoppingListGetDTO(categories,items);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user