GroupByParent.transformCategories(): replace CategoryDto by EntityWithParentDto.

Fix #744

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/controller/SeriesController.java

@@ -64,7 +64,6 @@
 import ru.mystamps.web.controller.dto.NullableImageUrl;
 import ru.mystamps.web.controller.dto.SelectItem;
 import ru.mystamps.web.controller.interceptor.DownloadImageInterceptor;
-import ru.mystamps.web.dao.dto.CategoryDto;
 import ru.mystamps.web.dao.dto.EntityWithParentDto;
 import ru.mystamps.web.dao.dto.ImportRequestInfo;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
@@ -481,7 +480,7 @@ public String searchSeriesByCatalog(
 	}
 
 	protected void addCategoriesToModel(Model model, String lang) {
-		List<CategoryDto> categories = categoryService.findCategoriesWithParents(lang);
+		List<EntityWithParentDto> categories = categoryService.findCategoriesWithParents(lang);
 
 		List<SelectItem> groupedCategories = GroupByParent.transformCategories(categories);
 

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

@@ -22,7 +22,7 @@
 import java.util.Set;
 
 import ru.mystamps.web.dao.dto.AddCategoryDbDto;
-import ru.mystamps.web.dao.dto.CategoryDto;
+import ru.mystamps.web.dao.dto.EntityWithParentDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 
 @SuppressWarnings("PMD.TooManyMethods")
@@ -40,5 +40,5 @@ public interface CategoryDao {
 	List<Integer> findIdsByNamePattern(String pattern);
 	List<LinkEntityDto> findAllAsLinkEntities(String lang);
 	LinkEntityDto findOneAsLinkEntity(String slug, String lang);
-	List<CategoryDto> findCategoriesWithParents(String lang);
+	List<EntityWithParentDto> findCategoriesWithParents(String lang);
 }

src/main/java/ru/mystamps/web/dao/dto/CategoryDto.java

@@ -37,7 +37,7 @@
 
 import ru.mystamps.web.dao.CategoryDao;
 import ru.mystamps.web.dao.dto.AddCategoryDbDto;
-import ru.mystamps.web.dao.dto.CategoryDto;
+import ru.mystamps.web.dao.dto.EntityWithParentDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 
 @RequiredArgsConstructor
@@ -238,11 +238,11 @@ public LinkEntityDto findOneAsLinkEntity(String slug, String lang) {
 	}
 
 	@Override
-	public List<CategoryDto> findCategoriesWithParents(String lang) {
+	public List<EntityWithParentDto> findCategoriesWithParents(String lang) {
 		return jdbcTemplate.query(
 			findCategoriesWithParentNamesSql,
 			Collections.singletonMap("lang", lang),
-			RowMappers::forCategoryDto
+			RowMappers::forEntityWithParentDto
 		);
 	}
 

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

@@ -237,14 +237,6 @@ public static EntityWithIdDto forEntityWithIdDto(ResultSet rs, int i) throws SQL
 		);
 	}
 
-	public static CategoryDto forCategoryDto(ResultSet rs, int i) throws SQLException {
-		return new CategoryDto(
-			rs.getString("name"),
-			rs.getString("slug"),
-			rs.getString("parent_name")
-		);
-	}
-	
 	public static EntityWithParentDto forEntityWithParentDto(ResultSet rs, int i)
 		throws SQLException {
 

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

@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Set;
 
-import ru.mystamps.web.dao.dto.CategoryDto;
+import ru.mystamps.web.dao.dto.EntityWithParentDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.AddCategoryDto;
 
@@ -31,7 +31,7 @@ public interface CategoryService {
 	List<Integer> findIdsByNames(Set<String> names);
 	List<Integer> findIdsWhenNameStartsWith(String name);
 	List<LinkEntityDto> findAllAsLinkEntities(String lang);
-	List<CategoryDto> findCategoriesWithParents(String lang);
+	List<EntityWithParentDto> findCategoriesWithParents(String lang);
 	LinkEntityDto findOneAsLinkEntity(String slug, String lang);
 	long countAll();
 	long countCategoriesOf(Integer collectionId);

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

@@ -36,7 +36,7 @@
 
 import ru.mystamps.web.dao.CategoryDao;
 import ru.mystamps.web.dao.dto.AddCategoryDbDto;
-import ru.mystamps.web.dao.dto.CategoryDto;
+import ru.mystamps.web.dao.dto.EntityWithParentDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.AddCategoryDto;
 import ru.mystamps.web.support.spring.security.HasAuthority;
@@ -115,7 +115,7 @@ public List<LinkEntityDto> findAllAsLinkEntities(String lang) {
 	@Override
 	@Transactional(readOnly = true)
 	@PreAuthorize(HasAuthority.CREATE_SERIES)
-	public List<CategoryDto> findCategoriesWithParents(String lang) {
+	public List<EntityWithParentDto> findCategoriesWithParents(String lang) {
 		return categoryDao.findCategoriesWithParents(lang);
 	}
 

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

@@ -22,7 +22,6 @@
 import java.util.List;
 
 import ru.mystamps.web.controller.dto.SelectItem;
-import ru.mystamps.web.dao.dto.CategoryDto;
 import ru.mystamps.web.dao.dto.EntityWithParentDto;
 
 /**
@@ -73,9 +72,8 @@ public static List<SelectItem> transformParticipants(List<EntityWithParentDto> p
 		return items;
 	}
 
-	// @todo #592 GroupByParent.transformCategories(): use unified class that represents entity with parent
 	@SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
-	public static List<SelectItem> transformCategories(List<CategoryDto> categories) {
+	public static List<SelectItem> transformCategories(List<EntityWithParentDto> categories) {
 		if (categories.isEmpty()) {
 			return Collections.emptyList();
 		}
@@ -84,9 +82,9 @@ public static List<SelectItem> transformCategories(List<CategoryDto> categories)
 		String lastParent = null;
 		SelectItem lastItem = null;
 
-		for (CategoryDto category : categories) {
+		for (EntityWithParentDto category : categories) {
 			String name   = category.getName();
-			String value  = category.getSlug();
+			String value  = category.getId();
 			String parent = category.getParentName();
 
 			boolean categoryWithoutParent = parent == null;

src/main/java/ru/mystamps/web/support/thymeleaf/GroupByParent.java

@@ -99,11 +99,11 @@ category.find_category_link_info_by_slug = \
 ORDER BY CASE WHEN 'ru' = :lang THEN COALESCE(c.name_ru, c.name) ELSE c.name END
 
 category.find_categories_with_parent_names = \
-   SELECT CASE WHEN 'ru' = :lang \
+   SELECT c.slug AS id \
+        , CASE WHEN 'ru' = :lang \
                THEN COALESCE(c.name_ru, c.name) \
                ELSE c.name \
                 END AS name \
-        , c.slug \
         , CASE WHEN 'ru' = :lang \
                THEN COALESCE(t.name_ru, t.name) \
                ELSE t.name \

src/main/resources/sql/category_dao_queries.properties

@@ -29,7 +29,7 @@ import spock.lang.Unroll
 
 import ru.mystamps.web.dao.CategoryDao
 import ru.mystamps.web.dao.dto.AddCategoryDbDto
-import ru.mystamps.web.dao.dto.CategoryDto
+import ru.mystamps.web.dao.dto.EntityWithParentDto
 import ru.mystamps.web.controller.dto.AddCategoryForm
 import ru.mystamps.web.dao.dto.LinkEntityDto
 import ru.mystamps.web.tests.DateUtils
@@ -249,9 +249,9 @@ class CategoryServiceImplTest extends Specification {
 	def 'findCategoriesWithParents() should invoke dao and return its result'() {
 		given:
 			String expectedLang = nullOr(Random.lang())
-			List<CategoryDto> expectedResult = Random.listOfCategoryDto()
+			List<EntityWithParentDto> expectedResult = Random.listOfEntityWithParentDto()
 		when:
-			List<CategoryDto> result = service.findCategoriesWithParents(expectedLang)
+			List<EntityWithParentDto> result = service.findCategoriesWithParents(expectedLang)
 		then:
 			1 * categoryDao.findCategoriesWithParents({ String lang ->
 				assert lang == expectedLang

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

@@ -213,14 +213,6 @@ public static RawParsedDataDto createRawParsedDataDto() {
 		);
 	}
 
-	public static CategoryDto createCategoryDto() {
-		String name = Random.categoryName();
-		String slug = SlugUtils.slugify(name);
-		// @todo #548 Introduce name generator for top categories
-		String parentName = Random.categoryName();
-		return new CategoryDto(name, slug, parentName);
-	}
-	
 	public static EntityWithParentDto createEntityWithParentDto() {
 		String name = Random.categoryName();
 		// @todo #702 TestObjects: introduce name generator for transaction participant groups

src/test/java/ru/mystamps/web/service/TestObjects.java

@@ -28,7 +28,6 @@
 import io.qala.datagen.RandomShortApi;
 
 import ru.mystamps.web.Db.SeriesImportRequestStatus;
-import ru.mystamps.web.dao.dto.CategoryDto;
 import ru.mystamps.web.dao.dto.EntityWithIdDto;
 import ru.mystamps.web.dao.dto.EntityWithParentDto;
 import ru.mystamps.web.service.TestObjects;
@@ -157,18 +156,6 @@ public static List<EntityWithIdDto> listOfEntityWithIdDto() {
 		);
 	}
 
-	public static List<CategoryDto> listOfCategoryDto() {
-		final int minSize = 1;
-		final int maxSize = 3;
-		int size = integer(minSize, maxSize);
-		return sampleMultiple(
-			size,
-			TestObjects.createCategoryDto(),
-			TestObjects.createCategoryDto(),
-			TestObjects.createCategoryDto()
-		);
-	}
-	
 	public static List<EntityWithParentDto> listOfEntityWithParentDto() {
 		final int minSize = 1;
 		final int maxSize = 3;