SeriesImportService.addSeries(): extract method.

Addressed to #700

No functional changes.

Author: php-coder

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

@@ -114,7 +114,6 @@ public SeriesController getSeriesController() {
 	@Bean
 	public SeriesImportController getSeriesImportController() {
 		return new SeriesImportController(
-			servicesConfig.getSeriesService(),
 			servicesConfig.getSeriesImportService(),
 			getSeriesController(),
 			eventPublisher

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

@@ -165,6 +165,7 @@ public SeriesImportService getSeriesImportService() {
 		return new SeriesImportServiceImpl(
 			LoggerFactory.getLogger(SeriesImportServiceImpl.class),
 			daoConfig.getSeriesImportDao(),
+			getSeriesService(),
 			getSeriesInfoExtractorService()
 		);
 	}

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

@@ -45,7 +45,6 @@
 import ru.mystamps.web.dao.dto.ImportRequestDto;
 import ru.mystamps.web.dao.dto.ParsedDataDto;
 import ru.mystamps.web.service.SeriesImportService;
-import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.util.LocaleUtils;
 
 import static ru.mystamps.web.controller.ControllerUtils.redirectTo;
@@ -54,7 +53,6 @@
 @RequiredArgsConstructor
 public class SeriesImportController {
 
-	private final SeriesService seriesService;
 	private final SeriesImportService seriesImportService;
 	private final SeriesController seriesController;
 	private final ApplicationEventPublisher eventPublisher;
@@ -184,7 +182,7 @@ public String processImportSeriesForm(
 			return "series/import/info";
 		}
 
-		Integer seriesId = seriesService.add(form, currentUserId, false);
+		Integer seriesId = seriesImportService.addSeries(form, currentUserId);
 
 		return redirectTo(Url.INFO_SERIES_PAGE, seriesId);
 	}

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

@@ -19,11 +19,13 @@
 
 import ru.mystamps.web.dao.dto.ImportRequestDto;
 import ru.mystamps.web.dao.dto.ParsedDataDto;
+import ru.mystamps.web.service.dto.AddSeriesDto;
 import ru.mystamps.web.service.dto.RawParsedDataDto;
 import ru.mystamps.web.service.dto.RequestImportDto;
 
 public interface SeriesImportService {
 	Integer addRequest(RequestImportDto dto, Integer userId);
+	Integer addSeries(AddSeriesDto dto, Integer userId);
 	void changeStatus(Integer requestId, String oldStatus, String newStatus);
 	ImportRequestDto findById(Integer requestId);
 	void saveDownloadedContent(Integer requestId, String content);

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

@@ -36,6 +36,7 @@
 import ru.mystamps.web.dao.dto.ImportSeriesDbDto;
 import ru.mystamps.web.dao.dto.ParsedDataDto;
 import ru.mystamps.web.dao.dto.SaveParsedDataDbDto;
+import ru.mystamps.web.service.dto.AddSeriesDto;
 import ru.mystamps.web.service.dto.RawParsedDataDto;
 import ru.mystamps.web.service.dto.RequestImportDto;
 import ru.mystamps.web.support.spring.security.HasAuthority;
@@ -53,6 +54,7 @@ public class SeriesImportServiceImpl implements SeriesImportService {
 
 	private final Logger log;
 	private final SeriesImportDao seriesImportDao;
+	private final SeriesService seriesService;
 	private final SeriesInfoExtractorService extractorService;
 
 	@Override
@@ -79,6 +81,15 @@ public Integer addRequest(RequestImportDto dto, Integer userId) {
 		return id;
 	}
 
+	// @todo #700 SeriesImportServiceImpl.addSeries(): add unit tests
+	@Override
+	@Transactional
+	@PreAuthorize(HasAuthority.IMPORT_SERIES)
+	public Integer addSeries(AddSeriesDto dto, Integer userId) {
+		Integer seriesId = seriesService.add(dto, userId, false);
+		return seriesId;
+	}
+	
 	@Override
 	@Transactional
 	public void changeStatus(Integer requestId, String oldStatus, String newStatus) {

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

@@ -38,13 +38,18 @@ import ru.mystamps.web.tests.Random
 class SeriesImportServiceImplTest extends Specification {
 
 	private final SeriesImportDao seriesImportDao = Mock()
+	private final SeriesService seriesService = Mock()
 	private final SeriesInfoExtractorService extractorService = Mock()
 
 	private SeriesImportService service
 	private RequestImportForm form
 
 	def setup() {
-		service = new SeriesImportServiceImpl(NOPLogger.NOP_LOGGER, seriesImportDao, extractorService)
+		service = new SeriesImportServiceImpl(
+			NOPLogger.NOP_LOGGER,
+			seriesImportDao, seriesService,
+			extractorService
+		)
 		form = new RequestImportForm()
 	}