SeriesImportController: reduce duplication by using existing methods from SeriesController.

Fix #717

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/config/ControllersConfig.java

@@ -114,10 +114,9 @@ public SeriesController getSeriesController() {
 	@Bean
 	public SeriesImportController getSeriesImportController() {
 		return new SeriesImportController(
-			servicesConfig.getCategoryService(),
-			servicesConfig.getCountryService(),
 			servicesConfig.getSeriesService(),
 			servicesConfig.getSeriesImportService(),
+			getSeriesController(),
 			eventPublisher
 		);
 	}

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

@@ -479,7 +479,7 @@ public String searchSeriesByCatalog(
 		return "series/search_result";
 	}
 
-	private void addCategoriesToModel(Model model, String lang) {
+	protected void addCategoriesToModel(Model model, String lang) {
 		List<CategoryDto> categories = categoryService.findCategoriesWithParents(lang);
 
 		List<FirstLevelCategoryDto> groupedCategories =
@@ -488,12 +488,12 @@ private void addCategoriesToModel(Model model, String lang) {
 		model.addAttribute("categories", groupedCategories);
 	}
 
-	private void addCountriesToModel(Model model, String lang) {
+	protected void addCountriesToModel(Model model, String lang) {
 		List<LinkEntityDto> countries = countryService.findAllAsLinkEntities(lang);
 		model.addAttribute("countries", countries);
 	}
 
-	private void addYearToModel(Model model) {
+	protected void addYearToModel(Model model) {
 		model.addAttribute("years", YEARS);
 	}
 

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

@@ -18,7 +18,6 @@
 package ru.mystamps.web.controller;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Locale;
 
 import javax.servlet.http.HttpServletResponse;
@@ -39,19 +38,13 @@
 
 import ru.mystamps.web.Url;
 import ru.mystamps.web.controller.converter.annotation.CurrentUser;
-import ru.mystamps.web.controller.dto.FirstLevelCategoryDto;
 import ru.mystamps.web.controller.dto.ImportSeriesForm;
 import ru.mystamps.web.controller.dto.RequestImportForm;
 import ru.mystamps.web.controller.event.ImportRequestCreated;
-import ru.mystamps.web.dao.dto.CategoryDto;
 import ru.mystamps.web.dao.dto.ImportRequestDto;
-import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.ParsedDataDto;
-import ru.mystamps.web.service.CategoryService;
-import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.service.SeriesImportService;
 import ru.mystamps.web.service.SeriesService;
-import ru.mystamps.web.support.thymeleaf.GroupByParent;
 import ru.mystamps.web.util.LocaleUtils;
 
 import static ru.mystamps.web.controller.ControllerUtils.redirectTo;
@@ -60,10 +53,9 @@
 @RequiredArgsConstructor
 public class SeriesImportController {
 
-	private final CategoryService categoryService;
-	private final CountryService countryService;
 	private final SeriesService seriesService;
 	private final SeriesImportService seriesImportService;
+	private final SeriesController seriesController;
 	private final ApplicationEventPublisher eventPublisher;
 
 	@InitBinder("requestImportForm")
@@ -142,18 +134,9 @@ public String showRequestAndImportSeriesForm(
 		model.addAttribute("importSeriesForm", form);
 		model.addAttribute("showForm", hasParsedData);
 
-		// @todo #709 SeriesImportController.showRequestAndImportSeriesForm():
-		//  extract a method for adding shared attributes to the model
-		List<CategoryDto> categories =
-			categoryService.findCategoriesWithParents(lang);
-		List<FirstLevelCategoryDto> groupedCategories =
-			GroupByParent.transformCategories(categories);
-		model.addAttribute("categories", groupedCategories);
-		
-		List<LinkEntityDto> countries = countryService.findAllAsLinkEntities(lang);
-		model.addAttribute("countries", countries);
-		
-		model.addAttribute("years", SeriesController.YEARS);
+		seriesController.addCategoriesToModel(model, lang);
+		seriesController.addCountriesToModel(model, lang);
+		seriesController.addYearToModel(model);
 
 		return "series/import/info";
 	}
@@ -191,17 +174,10 @@ public String processImportSeriesForm(
 		boolean hasParsedData = parsedData != null;
 		model.addAttribute("showForm", hasParsedData);
 
-		List<CategoryDto> categories =
-			categoryService.findCategoriesWithParents(lang);
-		List<FirstLevelCategoryDto> groupedCategories =
-			GroupByParent.transformCategories(categories);
-		model.addAttribute("categories", groupedCategories);
+		seriesController.addCategoriesToModel(model, lang);
+		seriesController.addCountriesToModel(model, lang);
+		seriesController.addYearToModel(model);
 
-		List<LinkEntityDto> countries = countryService.findAllAsLinkEntities(lang);
-		model.addAttribute("countries", countries);
-		
-		model.addAttribute("years", SeriesController.YEARS);
-
 		if (result.hasErrors()) {
 			return "series/import/info";
 		}