Revize 541abced

Added description to catalog item

re #9491

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

@@ -25 +25 @@
 @NoArgsConstructor
 @Entity
 @Table(name = "catalog_item")
-//@NamedEntityGraph(name = "graph", attributeNodes = {
-//        @NamedAttributeNode("bibliography"),
-//        @NamedAttributeNode("alternativeNames"),
-//        @NamedAttributeNode("countries"),
-//        @NamedAttributeNode("writtenForms"),
-//        @NamedAttributeNode("types"),
-//})
 public class CatalogItem {
     private static final String INTEGER_PATTERN = "\\d+";
     private static final String DOUBLE_PATTERN = "(\\d+[.]\\d+)|(\\d+)";
@@ -46 +39 @@
     /**
      * Name of geographic item
      */
-    private String name;
+    private String name = "";
 
     /**
      * Certainty
@@ -63 +56 @@
      */
     private double latitude;
 
+    /**
+     * Description
+     */
+    @Column(length = 100000)
+    private String description = "";
+
     /**
      * Bibliography
      */

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

@@ -25 +25 @@
     /**
      * Name of catalog item
      */
-    private String name;
+    private String name = "";
 
     /**
      * Alternative names
@@ -67 +67 @@
      */
     private int certainty;
 
+    /**
+     * Description
+     */
+    private String description = "";
+
 }

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

@@ -236 +236 @@
                 .stream().map(s -> new AlternativeName(s, catalogItem)).collect(Collectors.toSet()));
         catalogItem.setWrittenForms(catalogItemDto.getWrittenForms()
                 .stream().map(s -> new WrittenForm(s, catalogItem)).collect(Collectors.toSet()));
+        catalogItem.setDescription(catalogItemDto.getDescription());
     }
 
     /**
      * Converts catalog entity to catalog DTO
      *
-     * @param entity catalog entity
+     * @param catalogItem catalog entity
      * @return catalog DTO
      */
-    private CatalogItemDto convertEntityToDto(CatalogItem entity) {
+    private CatalogItemDto convertEntityToDto(CatalogItem catalogItem) {
         CatalogItemDto catalogItemDto = new CatalogItemDto();
-        catalogItemDto.setId(entity.getId());
-        catalogItemDto.setName(entity.getName());
-        catalogItemDto.setLatitude(entity.getLatitude());
-        catalogItemDto.setLongitude(entity.getLongitude());
-        catalogItemDto.setCertainty(entity.getCertainty());
-        catalogItemDto.setBibliography(entity.getBibliography()
+        catalogItemDto.setId(catalogItem.getId());
+        catalogItemDto.setName(catalogItem.getName());
+        catalogItemDto.setLatitude(catalogItem.getLatitude());
+        catalogItemDto.setLongitude(catalogItem.getLongitude());
+        catalogItemDto.setCertainty(catalogItem.getCertainty());
+        catalogItemDto.setBibliography(catalogItem.getBibliography()
                 .stream().map(Bibliography::getSource).collect(Collectors.toSet()));
-        catalogItemDto.setTypes(entity.getTypes()
+        catalogItemDto.setTypes(catalogItem.getTypes()
                 .stream().map(Type::getType).collect(Collectors.toSet()));
-        catalogItemDto.setCountries(entity.getCountries()
+        catalogItemDto.setCountries(catalogItem.getCountries()
                 .stream().map(Country::getName).collect(Collectors.toSet()));
-        catalogItemDto.setAlternativeNames(entity.getAlternativeNames()
+        catalogItemDto.setAlternativeNames(catalogItem.getAlternativeNames()
                 .stream().map(AlternativeName::getName).collect(Collectors.toSet()));
-        catalogItemDto.setWrittenForms(entity.getWrittenForms()
+        catalogItemDto.setWrittenForms(catalogItem.getWrittenForms()
                 .stream().map(WrittenForm::getForm).collect(Collectors.toSet()));
+        catalogItemDto.setDescription(catalogItem.getDescription());
         return catalogItemDto;
     }
 

backend/src/test/java/cz/zcu/kiv/backendapi/catalog/CatalogItemServiceImplTest.java

@@ -98 +98 @@
         catalogItemDto.setCertainty(0);
         catalogItemDto.setLatitude(0.1);
         catalogItemDto.setLongitude(0.2);
+        catalogItemDto.setDescription("description");
 
         Type type = new Type("type");
 
@@ -111 +112 @@
         catalogItem.setCertainty(0);
         catalogItem.setLatitude(0.1);
         catalogItem.setLongitude(0.2);
+        catalogItem.setDescription("description");
 
         given(typeService.getTypeByName(anyString())).willReturn(Optional.of(type));
 
@@ -176 +178 @@
         catalogItemDto.setCertainty(0);
         catalogItemDto.setLatitude(0.1);
         catalogItemDto.setLongitude(0.2);
+        catalogItemDto.setDescription("description");
 
         Type type = new Type("type");
         Type typeOld = new Type("old");
@@ -190 +193 @@
         catalogItem.setCertainty(0);
         catalogItem.setLatitude(0.1);
         catalogItem.setLongitude(0.2);
+        catalogItem.setDescription("description");
 
         CatalogItem oldCatalogItem = new CatalogItem();
         oldCatalogItem.setName("old");