/country/add: add validation for unique slug.

This fixes DuplicateKeyException when name contains mix of spaces and hyphens.

Fix #487

Author: php-coder

src/main/java/ru/mystamps/web/dao/CountryDao.java

@@ -26,6 +26,7 @@
 public interface CountryDao {
 	Integer add(AddCountryDbDto country);
 	long countAll();
+	long countBySlug(String slug);
 	long countByName(String name);
 	long countByNameRu(String name);
 	long countCountriesOfCollection(Integer collectionId);

src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDao.java

@@ -50,6 +50,9 @@ public class JdbcCountryDao implements CountryDao {
 	@Value("${country.count_all_countries}")
 	private String countAllSql;
 
+	@Value("${country.count_countries_by_slug}")
+	private String countBySlugSql;
+	
 	@Value("${country.count_countries_by_name}")
 	private String countByNameSql;
 
@@ -108,6 +111,15 @@ public long countAll() {
 		);
 	}
 
+	@Override
+	public long countBySlug(String slug) {
+		return jdbcTemplate.queryForObject(
+			countBySlugSql,
+			Collections.singletonMap("slug", slug),
+			Long.class
+		);
+	}
+	
 	@Override
 	public long countByName(String name) {
 		return jdbcTemplate.queryForObject(

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

@@ -29,6 +29,7 @@
 import ru.mystamps.web.service.dto.AddCountryDto;
 import ru.mystamps.web.validation.jsr303.UniqueCountryName;
 import ru.mystamps.web.validation.jsr303.UniqueCountryName.Lang;
+import ru.mystamps.web.validation.jsr303.UniqueCountrySlug;
 
 import static ru.mystamps.web.validation.ValidationRules.COUNTRY_NAME_EN_REGEXP;
 import static ru.mystamps.web.validation.ValidationRules.COUNTRY_NAME_MAX_LENGTH;
@@ -46,7 +47,8 @@
 	Group.Level3.class,
 	Group.Level4.class,
 	Group.Level5.class,
-	Group.Level6.class
+	Group.Level6.class,
+	Group.Level7.class
 })
 public class AddCountryForm implements AddCountryDto {
 
@@ -81,6 +83,7 @@ public class AddCountryForm implements AddCountryDto {
 		)
 	})
 	@UniqueCountryName(lang = Lang.EN, groups = Group.Level6.class)
+	@UniqueCountrySlug(groups = Group.Level7.class)
 	private String name;
 
 	@NotEmpty(groups = Group.Level1.class)

src/main/java/ru/mystamps/web/service/CountryService.java

@@ -29,6 +29,7 @@ public interface CountryService {
 	LinkEntityDto findOneAsLinkEntity(String slug, String lang);
 	long countAll();
 	long countCountriesOf(Integer collectionId);
+	long countBySlug(String slug);
 	long countByName(String name);
 	long countByNameRu(String name);
 	long countAddedSince(Date date);

src/main/java/ru/mystamps/web/service/CountryServiceImpl.java

@@ -110,6 +110,14 @@ public long countCountriesOf(Integer collectionId) {
 		return countryDao.countCountriesOfCollection(collectionId);
 	}
 
+	@Override
+	@Transactional(readOnly = true)
+	public long countBySlug(String slug) {
+		Validate.isTrue(slug != null, "Country slug must be non null");
+		
+		return countryDao.countBySlug(slug);
+	}
+	
 	@Override
 	@Transactional(readOnly = true)
 	public long countByName(String name) {

src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountrySlug.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2009-2016 Slava Semushin <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package ru.mystamps.web.validation.jsr303;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Constraint(validatedBy = UniqueCountrySlugValidator.class)
+@Documented
+public @interface UniqueCountrySlug {
+	String message() default "{ru.mystamps.web.validation.jsr303.UniqueCountrySlug.message}";
+	Class<?>[] groups() default {};
+	Class<? extends Payload>[] payload() default {};
+}

src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountrySlugValidator.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2009-2016 Slava Semushin <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package ru.mystamps.web.validation.jsr303;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import lombok.RequiredArgsConstructor;
+
+import ru.mystamps.web.service.CountryService;
+import ru.mystamps.web.util.SlugUtils;
+
+@RequiredArgsConstructor
+public class UniqueCountrySlugValidator implements ConstraintValidator<UniqueCountrySlug, String> {
+	
+	private final CountryService countryService;
+	
+	@Override
+	public void initialize(UniqueCountrySlug annotation) {
+		// Intentionally empty: nothing to initialize
+	}
+	
+	@Override
+	public boolean isValid(String value, ConstraintValidatorContext ctx) {
+		
+		if (value == null) {
+			return true;
+		}
+		
+		String slug = SlugUtils.slugify(value);
+		
+		return countryService.countBySlug(slug) == 0;
+	}
+	
+}

src/main/resources/ru/mystamps/i18n/ValidationMessages.properties

@@ -9,6 +9,7 @@ ru.mystamps.web.validation.jsr303.FieldsMatch.message = Field '{second}' must ma
 ru.mystamps.web.validation.jsr303.UniqueLogin.message = Login already exists
 ru.mystamps.web.validation.jsr303.UniqueCountryName.message = Country already exists
 ru.mystamps.web.validation.jsr303.UniqueCategoryName.message = Category already exists
+ru.mystamps.web.validation.jsr303.UniqueCountrySlug.message = Country with similar name already exists
 ru.mystamps.web.validation.jsr303.UniqueCategorySlug.message = Category with similar name already exists
 ru.mystamps.web.validation.jsr303.ExistingActivationKey.message = Wrong activation key
 ru.mystamps.web.validation.jsr303.Email.message = Wrong e-mail address

src/main/resources/ru/mystamps/i18n/ValidationMessages_ru.properties

@@ -9,6 +9,7 @@ ru.mystamps.web.validation.jsr303.FieldsMatch.message = Поле '{second}' до
 ru.mystamps.web.validation.jsr303.UniqueLogin.message = Логин уже существует
 ru.mystamps.web.validation.jsr303.UniqueCountryName.message = Страна уже есть в базе
 ru.mystamps.web.validation.jsr303.UniqueCategoryName.message = Категория уже есть в базе
+ru.mystamps.web.validation.jsr303.UniqueCountrySlug.message = Страна с похожим названием уже есть в базе
 ru.mystamps.web.validation.jsr303.UniqueCategorySlug.message = Категория с похожим названием уже есть в базе
 ru.mystamps.web.validation.jsr303.ExistingActivationKey.message = Неправильный код активации
 ru.mystamps.web.validation.jsr303.Email.message = Неправильный адрес электронной почты

src/main/resources/sql/country_dao_queries.properties

@@ -23,6 +23,11 @@ country.count_all_countries = \
 SELECT COUNT(*) \
   FROM countries
 
+country.count_countries_by_slug = \
+SELECT COUNT(*) \
+  FROM countries \
+ WHERE slug = :slug
+
 country.count_countries_by_name = \
 SELECT COUNT(*) \
   FROM countries \

src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy

@@ -311,6 +311,26 @@ class CountryServiceImplTest extends Specification {
 			}) >> 0L
 	}
 
+	//
+	// Tests for countBySlug()
+	//
+	
+	def "countBySlug() should throw exception when slug is null"() {
+		when:
+			service.countBySlug(null)
+		then:
+			thrown IllegalArgumentException
+	}
+	
+	def "countBySlug() should call dao"() {
+		given:
+			countryDao.countBySlug(_ as String) >> 3L
+		when:
+			long result = service.countBySlug('any-slug')
+		then:
+			result == 3L
+	}
+	
 	//
 	// Tests for countByName()
 	//