GroupByParent.transformCategories(): replace FirstLevelCategoryDto by SelectItem.

Fix #743

No functional changes.

Author: php-coder

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

@@ -61,7 +61,6 @@
 import ru.mystamps.web.controller.dto.AddImageForm;
 import ru.mystamps.web.controller.dto.AddSeriesForm;
 import ru.mystamps.web.controller.dto.AddSeriesSalesForm;
-import ru.mystamps.web.controller.dto.FirstLevelCategoryDto;
 import ru.mystamps.web.controller.dto.NullableImageUrl;
 import ru.mystamps.web.controller.dto.SelectItem;
 import ru.mystamps.web.controller.interceptor.DownloadImageInterceptor;
@@ -481,8 +480,7 @@ public String searchSeriesByCatalog(
 	protected void addCategoriesToModel(Model model, String lang) {
 		List<CategoryDto> categories = categoryService.findCategoriesWithParents(lang);
 
-		List<FirstLevelCategoryDto> groupedCategories =
-			GroupByParent.transformCategories(categories);
+		List<SelectItem> groupedCategories = GroupByParent.transformCategories(categories);
 
 		model.addAttribute("categories", groupedCategories);
 	}

src/main/java/ru/mystamps/web/controller/dto/FirstLevelCategoryDto.java

@@ -21,7 +21,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import ru.mystamps.web.controller.dto.FirstLevelCategoryDto;
 import ru.mystamps.web.controller.dto.SelectItem;
 import ru.mystamps.web.dao.dto.CategoryDto;
 import ru.mystamps.web.dao.dto.TransactionParticipantDto;
@@ -77,21 +76,20 @@ public static List<SelectItem> transformParticipants(
 		return items;
 	}
 
-	// @todo #592 GroupByParent.transformCategories(): replace FirstLevelCategoryDto by SelectItem
 	// @todo #592 GroupByParent.transformCategories(): use unified class that represents entity with parent
 	@SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
-	public static List<FirstLevelCategoryDto> transformCategories(List<CategoryDto> categories) {
+	public static List<SelectItem> transformCategories(List<CategoryDto> categories) {
 		if (categories.isEmpty()) {
 			return Collections.emptyList();
 		}
 
-		List<FirstLevelCategoryDto> items = new ArrayList<>();
+		List<SelectItem> items = new ArrayList<>();
 		String lastParent = null;
-		FirstLevelCategoryDto lastItem = null;
+		SelectItem lastItem = null;
 
 		for (CategoryDto category : categories) {
 			String name   = category.getName();
-			String slug   = category.getSlug();
+			String value  = category.getSlug();
 			String parent = category.getParentName();
 
 			boolean categoryWithoutParent = parent == null;
@@ -100,14 +98,14 @@ public static List<FirstLevelCategoryDto> transformCategories(List<CategoryDto>
 			if (createNewItem) {
 				lastParent = parent;
 				if (categoryWithoutParent) {
-					lastItem = new FirstLevelCategoryDto(slug, name);
+					lastItem = new SelectItem(name, value);
 				} else {
-					lastItem = new FirstLevelCategoryDto(parent);
-					lastItem.addChild(slug, name);
+					lastItem = new SelectItem(parent);
+					lastItem.addChild(name, value);
 				}
 				items.add(lastItem);
 			} else {
-				lastItem.addChild(slug, name);
+				lastItem.addChild(name, value);
 			}
 		}
 

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

@@ -106,15 +106,15 @@ <h3 th:text="${#strings.capitalize(add_series)}">
 									<th:block th:each="category : ${categories}">
 										<optgroup th:if="${not #lists.isEmpty(category.children)}" th:label="${category.name}">
 											<option th:each="subcategory : ${category.children}"
-												th:value="${subcategory.slug}"
+												th:value="${subcategory.value}"
 												th:text="${subcategory.name}"
-												th:selected="${addSeriesForm.category != null and addSeriesForm.category.slug == subcategory.slug}">
+												th:selected="${addSeriesForm.category != null and addSeriesForm.category.slug == subcategory.value}">
 											</option>
 										</optgroup>
 										<option th:if="${#lists.isEmpty(category.children)}"
-											th:value="${category.slug}"
+											th:value="${category.value}"
 											th:text="${category.name}"
-											th:selected="${addSeriesForm.category != null and addSeriesForm.category.slug == category.slug}">
+											th:selected="${addSeriesForm.category != null and addSeriesForm.category.slug == category.value}">
 										</option>
 									</th:block>
 									/*/-->

src/main/webapp/WEB-INF/views/series/add.html

@@ -128,15 +128,15 @@ <h3 th:text="#{t_gathered_data}">
 											<th:block th:each="category : ${categories}">
 												<optgroup th:if="${not #lists.isEmpty(category.children)}" th:label="${category.name}">
 													<option th:each="subcategory : ${category.children}"
-														th:value="${subcategory.slug}"
+														th:value="${subcategory.value}"
 														th:text="${subcategory.name}"
-														th:selected="${importSeriesForm.category != null and importSeriesForm.category.slug == subcategory.slug}">
+														th:selected="${importSeriesForm.category != null and importSeriesForm.category.slug == subcategory.value}">
 													</option>
 												</optgroup>
 												<option th:if="${#lists.isEmpty(category.children)}"
-													th:value="${category.slug}"
+													th:value="${category.value}"
 													th:text="${category.name}"
-													th:selected="${importSeriesForm.category != null and importSeriesForm.category.slug == category.slug}">
+													th:selected="${importSeriesForm.category != null and importSeriesForm.category.slug == category.value}">
 												</option>
 											</th:block>
 											/*/-->