create series & sale in a single transcation

Author: php-coder

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

@@ -178,6 +178,7 @@ public SeriesImportService getSeriesImportService() {
 			LoggerFactory.getLogger(SeriesImportServiceImpl.class),
 			daoConfig.getSeriesImportDao(),
 			getSeriesService(),
+			getSeriesSalesService(),
 			getSeriesSalesImportService(),
 			getSeriesInfoExtractorService(),
 			eventPublisher

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

@@ -205,15 +205,13 @@ public String processImportSeriesForm(
 			return "series/import/info";
 		}
 
-		// TODO: extract method
-		Integer seriesId = seriesImportService.addSeries(form, requestId, currentUserId);
-		
 		if (seriesSaleForm != null) {
 			seriesSaleForm.setDate(new Date());
 			seriesSaleForm.setUrl(request.getUrl());
-			seriesSalesService.add(seriesSaleForm, seriesId, currentUserId);
 		}
 
+		Integer seriesId = seriesImportService.addSeries(form, requestId, currentUserId);
+		
 		return redirectTo(Url.INFO_SERIES_PAGE, seriesId);
 	}
 

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

@@ -45,6 +45,7 @@
 import ru.mystamps.web.dao.dto.SeriesParsedDataDto;
 import ru.mystamps.web.dao.dto.SeriesSalesParsedDataDbDto;
 import ru.mystamps.web.service.dto.AddSeriesDto;
+import ru.mystamps.web.service.dto.AddSeriesSalesDto;
 import ru.mystamps.web.service.dto.RawParsedDataDto;
 import ru.mystamps.web.service.dto.RequestImportDto;
 import ru.mystamps.web.service.dto.SeriesExtractedInfo;
@@ -58,6 +59,7 @@ public class SeriesImportServiceImpl implements SeriesImportService {
 	private final Logger log;
 	private final SeriesImportDao seriesImportDao;
 	private final SeriesService seriesService;
+	private final SeriesSalesService seriesSalesService;
 	private final SeriesSalesImportService seriesSalesImportService;
 	private final SeriesInfoExtractorService extractorService;
 	private final ApplicationEventPublisher eventPublisher;
@@ -101,6 +103,12 @@ public Integer addSeries(AddSeriesDto dto, Integer requestId, Integer userId) {
 
 		Date now = new Date();
 
+		// TODO: update unit tests
+		AddSeriesSalesDto saleDto = dto.getSeriesSalesDto();
+		if (saleDto != null) {
+			seriesSalesService.add(saleDto, seriesId, userId);
+		}
+		
 		seriesImportDao.setSeriesIdAndChangeStatus(
 			requestId,
 			seriesId,

src/main/java/ru/mystamps/web/service/dto/AddSeriesDto.java

@@ -52,4 +52,9 @@ public interface AddSeriesDto {
 
 	String getComment();
 	MultipartFile getImage();
+	
+	default AddSeriesSalesDto getSeriesSalesDto() {
+		return null;
+	}
+	
 }

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

@@ -49,6 +49,7 @@ class SeriesImportServiceImplTest extends Specification {
 
 	private final SeriesImportDao seriesImportDao = Mock()
 	private final SeriesService seriesService = Mock()
+	private final SeriesSalesService seriesSalesService = Mock()
 	private final SeriesSalesImportService seriesSalesImportService = Mock()
 	private final SeriesInfoExtractorService extractorService = Mock()
 	private final ApplicationEventPublisher eventPublisher = Mock()
@@ -61,6 +62,7 @@ class SeriesImportServiceImplTest extends Specification {
 			NOPLogger.NOP_LOGGER,
 			seriesImportDao,
 			seriesService,
+			seriesSalesService,
 			seriesSalesImportService,
 			extractorService,
 			eventPublisher