/country/add: deny "add" and "list" as country names.

Fix #510

Author: n583wxdh0j

src/main/java/ru/mystamps/web/model/AddCountryForm.java

@@ -27,6 +27,7 @@
 import lombok.Setter;
 
 import ru.mystamps.web.service.dto.AddCountryDto;
+import ru.mystamps.web.validation.jsr303.DenyValues;
 import ru.mystamps.web.validation.jsr303.UniqueCountryName;
 import ru.mystamps.web.validation.jsr303.UniqueCountryName.Lang;
 import ru.mystamps.web.validation.jsr303.UniqueCountrySlug;
@@ -48,7 +49,8 @@
 	Group.Level4.class,
 	Group.Level5.class,
 	Group.Level6.class,
-	Group.Level7.class
+	Group.Level7.class,
+	Group.Level8.class
 })
 public class AddCountryForm implements AddCountryDto {
 
@@ -82,8 +84,9 @@ public class AddCountryForm implements AddCountryDto {
 			groups = Group.Level5.class
 		)
 	})
-	@UniqueCountryName(lang = Lang.EN, groups = Group.Level6.class)
-	@UniqueCountrySlug(groups = Group.Level7.class)
+	@DenyValues(value = {"add", "list"}, groups = Group.Level6.class)
+	@UniqueCountryName(lang = Lang.EN, groups = Group.Level7.class)
+	@UniqueCountrySlug(groups = Group.Level8.class)
 	private String name;
 
 	@Size.List({
@@ -115,7 +118,7 @@ public class AddCountryForm implements AddCountryDto {
 			groups = Group.Level5.class
 		)
 	})
-	@UniqueCountryName(lang = Lang.RU, groups = Group.Level6.class)
+	@UniqueCountryName(lang = Lang.RU, groups = Group.Level7.class)
 	private String nameRu;
 
 }

src/test/robotframework/country/creation/validation.robot

@@ -79,6 +79,19 @@ Create country with non-existing name but existing slug
 	Clear Element Text      id=nameRu
 	Submit Form             id=add-country-form
 	Element Text Should Be  id=name.errors  Country with similar name already exists
+	
+Create country with forbidden names
+	[Documentation]         Verify validation of forbidden names
+	# Open a page again to have a clean state (nameRu field has an invalid value)
+	Go To                   ${SITE_URL}/country/add
+	# 'add' is a forbidden value
+	Input Text              id=name  add
+	Submit Form             id=add-country-form
+	Element Text Should Be  id=name.errors  Invalid value
+	# 'list' is a forbidden value
+	Input Text              id=name  list
+	Submit Form             id=add-country-form
+	Element Text Should Be  id=name.errors  Invalid value
 
 *** Keywords ***
 Before Test Suite