Revize 0598e57d

Added batch endpoint for saving multiple catalog items, POST and PUT endpoint for catalog items merged

re #9753

backend/src/main/java/cz/zcu/kiv/backendapi/catalog/CatalogItemServiceImpl.java

@@ -87 +87 @@
     private final ITypeService typeService;
 
     @Override
-    public void saveCatalog(List<CatalogItem> catalogItems) {
+    public void saveCatalogItems(List<CatalogItemDto> catalogItemDtoList) {
         log.info("Saving catalog");
-        catalogItems.forEach(this::saveCatalogEntity);
+        catalogItemDtoList.forEach(this::saveCatalogItem);
+        log.info("Catalog saved");
     }
 
     @Override
     public void saveCatalogItem(CatalogItemDto catalogItemDto) {
         log.info("Saving catalog item");
-        CatalogItem catalogItem = new CatalogItem();
-        convertDtoToEntity(catalogItemDto, catalogItem);
-        saveCatalogEntity(catalogItem);
-    }
-
-    @Override
-    public void updateCatalogItem(UUID id, CatalogItemDto catalogItemDto) {
-        CatalogItem catalogItem = catalogItemRepository.findById(id).orElseThrow(() -> {
-            log.error(CATALOG_ITEM_NOT_FOUND);
-            throw new ApiRequestException(CATALOG_ITEM_NOT_FOUND, HttpStatus.NOT_FOUND);
-        });
+        CatalogItem catalogItem;
+        Optional<CatalogItem> optionalCatalogItem;
+        if (catalogItemDto.getId() != null && (optionalCatalogItem = catalogItemRepository.findById(catalogItemDto.getId())).isPresent()) {
+            catalogItem = optionalCatalogItem.get();
+        } else {
+            catalogItem = new CatalogItem();
+        }
         convertDtoToEntity(catalogItemDto, catalogItem);
         saveCatalogEntity(catalogItem);
-        log.info("Catalog item updated");
+        log.info("Catalog item saved");
     }
 
     @Override
@@ -133 +130 @@
 
     @Override
     public PathDto getPath(String text) {
+        log.info("Searching path");
         PathDto pathDto = new PathDto();
         StringBuilder highlightedText = new StringBuilder();
         List<List<CatalogItemDto>> foundCatalogItems = new ArrayList<>();
@@ -186 +184 @@
 
         pathDto.setText(highlightedText.toString());
         pathDto.setFoundCatalogItems(foundCatalogItems);
+        log.info("Path searched");
         return pathDto;
     }