Merge branch 'feature/balga/reviewfix' into 'main'

Feature/balga/reviewfix

See merge request !50

winery/api/src/main/java/cz/muni/fi/pa165/winery/dto/wine/WineBottleDto.java

@@ -18,10 +18,9 @@ import java.math.BigDecimal;
 public class WineBottleDto extends PersistentDtoBase {
 
     /**
-     * name of the bottle, allows only alphanumerical characters
+     * name of the bottle
      */
     @NotBlank
-    @Pattern(regexp = "^[\\w0-9 ]+$", message = "Only alphanumerical characters and spaces")
     private String name;
 
     /**

winery/api/src/main/java/cz/muni/fi/pa165/winery/dto/wine/WineTypeDto.java

@@ -5,7 +5,6 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
 
 /**
  * @author Jakub Balga
@@ -18,10 +17,9 @@ import javax.validation.constraints.Pattern;
 public class WineTypeDto extends PersistentDtoBase {
 
     /**
-     * Name of the wine, allows only alphanumerical characters
+     * Name of the wine
      */
     @NotBlank
-    @Pattern(regexp = "^[\\w0-9 ]+$", message = "Only alphanumerical characters and spaces")
     private String name;
 
     /**

winery/dao/src/main/java/cz/muni/fi/pa165/winery/persistence/entities/WineBottle.java

@@ -27,11 +27,9 @@ public class WineBottle extends EntityBase{
 
     /**
      * attribute of type String representing name,
-     * allows only alphanumerical characters
      */
     @Column(nullable = false)
-    @NotNull
-    @Pattern(regexp = "^[\\w0-9 ]*$", message = "Only alphanumerical characters")
+    @NotBlank
     private String name;
 
     /**

winery/webapp/src/main/java/cz/muni/fi/pa165/winery/webapp/models/wineBottle/WineBottleUpsertViewModel.java

@@ -11,7 +11,6 @@ import org.modelmapper.ModelMapper;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 import javax.validation.constraints.PositiveOrZero;
 import java.math.BigDecimal;
 import java.util.List;
@@ -38,7 +37,6 @@ public class WineBottleUpsertViewModel extends ViewModelBase {
      * name of wine bottle
      */
     @NotNull(message = "Cannot be empty")
-    @Pattern(regexp = "^[\\w0-9 ]*$", message = "Only alphanumerical characters")
     private String name;
 
     /**

winery/webapp/src/main/resources/templates/grape/edit.html

@@ -24,6 +24,7 @@
             <div class="form-group">
                 <label th:for="*{name}" th:value="*{name}">Name</label>
                 <input class="form-control" type="text" th:field="*{name}">
+                <p class="text-danger" th:each="error : ${#fields.errors('name')}" th:text="${error}"></p>
             </div>
             <button type="submit" class="btn btn-primary">Submit</button>
         </form>