/category/add: fix DuplicateKeyException when name differs from existing only by case.

Do case-insensitive search for category name in English and Russian.

Fix #442

Author: php-coder

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

@@ -19,6 +19,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
@@ -38,6 +39,7 @@
 import ru.mystamps.web.dao.dto.UrlEntityDto;
 import ru.mystamps.web.service.dto.AddCategoryDto;
 import ru.mystamps.web.support.spring.security.HasAuthority;
+import ru.mystamps.web.util.LocaleUtils;
 import ru.mystamps.web.util.SlugUtils;
 
 @RequiredArgsConstructor
@@ -112,14 +114,22 @@ public long countCategoriesOf(Integer collectionId) {
 	@Transactional(readOnly = true)
 	public long countByName(String name) {
 		Validate.isTrue(name != null, "Name must be non null");
-		return categoryDao.countByName(name);
+		
+		// converting to lowercase to do a case-insensitive search
+		String categoryName = name.toLowerCase(Locale.ENGLISH);
+		
+		return categoryDao.countByName(categoryName);
 	}
 
 	@Override
 	@Transactional(readOnly = true)
 	public long countByNameRu(String name) {
 		Validate.isTrue(name != null, "Name in Russian must be non null");
-		return categoryDao.countByNameRu(name);
+		
+		// converting to lowercase to do a case-insensitive search
+		String categoryName = name.toLowerCase(LocaleUtils.RUSSIAN);
+		
+		return categoryDao.countByNameRu(categoryName);
 	}
 
 	@Override

src/main/java/ru/mystamps/web/util/LocaleUtils.java

@@ -24,6 +24,8 @@
 
 public final class LocaleUtils {
 
+	public static final Locale RUSSIAN = new Locale("ru", "RU");
+	
 	private LocaleUtils() {
 	}
 

src/main/resources/sql/category_dao_queries.properties

@@ -26,12 +26,12 @@ SELECT COUNT(*) \
 category.count_categories_by_name = \
 SELECT COUNT(*) \
   FROM categories \
- WHERE name = :name
+ WHERE LOWER(name) = :name
 
 category.count_categories_by_name_ru = \
 SELECT COUNT(*) \
   FROM categories \
- WHERE name_ru = :name
+ WHERE LOWER(name_ru) = :name
 
 category.count_categories_of_collection = \
 SELECT COUNT(DISTINCT s.category_id) AS counter \

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

@@ -323,12 +323,12 @@ class CategoryServiceImplTest extends Specification {
 			result == 2L
 	}
 
-	def "countByName() should pass category name to dao"() {
+	def "countByName() should pass category name to dao in lowercase"() {
 		when:
 			service.countByName('Sport')
 		then:
 			1 * categoryDao.countByName({ String name ->
-				assert name == 'Sport'
+				assert name == 'sport'
 				return true
 			})
 	}
@@ -353,12 +353,12 @@ class CategoryServiceImplTest extends Specification {
 			result == 2L
 	}
 
-	def "countByNameRu() should pass category name to dao"() {
+	def "countByNameRu() should pass category name to dao in lowercase"() {
 		when:
 			service.countByNameRu('Спорт')
 		then:
 			1 * categoryDao.countByNameRu({ String name ->
-				assert name == 'Спорт'
+				assert name == 'спорт'
 				return true
 			})
 	}