Revize d6451c0a

Added filter for written forms and some tests

re #9492

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

@@ -5 +5 @@
 import cz.zcu.kiv.backendapi.country.Country;
 import cz.zcu.kiv.backendapi.type.Type;
 import cz.zcu.kiv.backendapi.writtenform.WrittenForm;
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.LazyCollection;
@@ -21 +23 @@
 /**
  * Catalog entity representing catalog item
  */
-@Data
+@Getter
+@Setter
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @NoArgsConstructor
 @Entity
 @Table(name = "catalog_item")
@@ -33 +37 @@
      * Catalog item id
      */
     @Id
-    @GeneratedValue
-    private UUID id;
+//    @GeneratedValue
+    @EqualsAndHashCode.Include
+    private UUID id = UUID.randomUUID();
 
     /**
      * Name of geographic item
@@ -68 +73 @@
     @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL)
     @LazyCollection(LazyCollectionOption.FALSE)
     @Fetch(FetchMode.SUBSELECT)
-    private Set<Bibliography> bibliography = Collections.emptySet();
+    private Set<Bibliography> bibliography = new HashSet<>();
 
     /**
      * Countries
@@ -76 +81 @@
     @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL)
     @LazyCollection(LazyCollectionOption.FALSE)
     @Fetch(FetchMode.SUBSELECT)
-    private Set<Country> countries = Collections.emptySet();
+    private Set<Country> countries = new HashSet<>();
 
     /**
      * Written forms
@@ -84 +89 @@
     @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL)
     @LazyCollection(LazyCollectionOption.FALSE)
     @Fetch(FetchMode.SUBSELECT)
-    private Set<WrittenForm> writtenForms = Collections.emptySet();
+    private Set<WrittenForm> writtenForms = new HashSet<>();
 
     /**
      * Alternative names
@@ -92 +97 @@
     @OneToMany(mappedBy = "catalogItem", cascade = CascadeType.ALL)
     @LazyCollection(LazyCollectionOption.FALSE)
     @Fetch(FetchMode.SUBSELECT)
-    private Set<AlternativeName> alternativeNames = Collections.emptySet();
+    private Set<AlternativeName> alternativeNames = new HashSet<>();
 
     /**
      * Set of user roles - many-to-many relationship
@@ -108 +113 @@
                     @JoinColumn(name = "type", referencedColumnName = "type")
             }
     )
-    private Set<Type> types = Collections.emptySet();
+    private Set<Type> types = new HashSet<>();
 
     public CatalogItem(final List<String> csvFields) {
 
         this.name = csvFields.get(1);
-        List<String> stringList = processListField(csvFields.get(2));
+        Set<String> stringList = processListField(csvFields.get(2));
         this.alternativeNames = stringList.stream().map(s -> new AlternativeName(s, this)).collect(Collectors.toSet());
 
         this.certainty = processIntField(csvFields.get(3));
@@ -151 +156 @@
         }
     }
 
-    private List<String> processListField(String field) {
+    private Set<String> processListField(String field) {
         if (field.isEmpty() || field.equals(EMPTY_ENTRY)) {
-            return new ArrayList<>();
+            return new HashSet<>();
         }
-        return Arrays.stream(field.split(",")).map(String::trim).filter(item -> !item.isEmpty()).collect(Collectors.toList());
+        return Arrays.stream(field.split(",")).map(String::trim).filter(item -> !item.isEmpty()).collect(Collectors.toSet());
     }
 }