SeriesServiceImpl.addImageToSeries(): port to JDBC.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -40,9 +40,6 @@ public class ServicesConfig {
 	@Autowired
 	private SecurityConfig securityConfig;
 
-	@Autowired
-	private SeriesDao seriesDao;
-	
 	@Autowired
 	private UserDao userDao;
 
@@ -116,7 +113,6 @@ public UsersActivationService getUsersActivationService() {
 	@Bean
 	public SeriesService getSeriesService() {
 		return new SeriesServiceImpl(
-			seriesDao,
 			daoConfig.getJdbcSeriesDao(),
 			getImageService(),
 			getMichelCatalogService(),

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

@@ -253,7 +253,7 @@ public String processImage(
 			return "series/info";
 		}
 
-		seriesService.addImageToSeries(form, series, currentUser);
+		seriesService.addImageToSeries(form, series.getId(), currentUser.getId());
 
 		return redirectTo(Url.INFO_SERIES_PAGE, series.getId());
 	}

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

@@ -19,8 +19,6 @@
 
 import java.util.Optional;
 
-import ru.mystamps.web.entity.Series;
-import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.dto.AddImageDto;
 import ru.mystamps.web.service.dto.AddSeriesDto;
 import ru.mystamps.web.service.dto.SeriesInfoDto;
@@ -30,7 +28,7 @@
 @SuppressWarnings("PMD.TooManyMethods")
 public interface SeriesService {
 	Integer add(AddSeriesDto dto, Integer userId, boolean userCanAddComments);
-	void addImageToSeries(AddImageDto dto, Series series, User user);
+	void addImageToSeries(AddImageDto dto, Integer seriesId, Integer userId);
 	long countAll();
 	long countAllStamps();
 	long countSeriesOf(Integer collectionId);

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

@@ -33,11 +33,8 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.JdbcSeriesDao;
-import ru.mystamps.web.dao.SeriesDao;
 import ru.mystamps.web.dao.dto.AddSeriesDbDto;
 import ru.mystamps.web.entity.Image;
-import ru.mystamps.web.entity.Series;
-import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.dto.AddImageDto;
 import ru.mystamps.web.service.dto.AddSeriesDto;
 import ru.mystamps.web.service.dto.Currency;
@@ -51,7 +48,6 @@
 public class SeriesServiceImpl implements SeriesService {
 	private static final Logger LOG = LoggerFactory.getLogger(SeriesServiceImpl.class);
 
-	private final SeriesDao seriesDao;
 	private final JdbcSeriesDao jdbcSeriesDao;
 	private final ImageService imageService;
 	private final MichelCatalogService michelCatalogService;
@@ -158,22 +154,20 @@ public Integer add(AddSeriesDto dto, Integer userId, boolean userCanAddComments)
 	@Override
 	@Transactional
 	@PreAuthorize("hasAuthority('ADD_IMAGES_TO_SERIES')")
-	public void addImageToSeries(AddImageDto dto, Series series, User user) {
+	public void addImageToSeries(AddImageDto dto, Integer seriesId, Integer userId) {
 		Validate.isTrue(dto != null, "DTO must be non null");
-		Validate.isTrue(series != null, "Series must be non null");
-		Validate.isTrue(user != null, "User must be non null");
+		Validate.isTrue(seriesId != null, "Series id must be non null");
+		Validate.isTrue(userId != null, "User id must be non null");
 
 		Image image = imageService.save(dto.getImage());
 
-		series.addImage(image);
-		
-		seriesDao.save(series);
+		imageService.addToSeries(seriesId, image.getId());
 
 		LOG.info(
 			"Image #{} was added to series #{} by user #{}",
 			image.getId(),
-			series.getId(),
-			user.getId()
+			seriesId,
+			userId
 		);
 	}
 

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

@@ -23,7 +23,6 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 import ru.mystamps.web.dao.JdbcSeriesDao
-import ru.mystamps.web.dao.SeriesDao
 import ru.mystamps.web.dao.dto.AddSeriesDbDto
 import ru.mystamps.web.entity.Image
 import ru.mystamps.web.model.AddSeriesForm
@@ -37,7 +36,6 @@ class SeriesServiceImplTest extends Specification {
 	private static final BigDecimal ANY_PRICE = new BigDecimal("17")
 
 	private ImageService imageService = Mock()
-	private SeriesDao seriesDao = Mock()
 	private JdbcSeriesDao jdbcSeriesDao = Mock()
 	private MichelCatalogService michelCatalogService = Mock()
 	private ScottCatalogService scottCatalogService = Mock()
@@ -60,7 +58,6 @@ class SeriesServiceImplTest extends Specification {
 		imageService.save(_) >> TestObjects.createImage()
 
 		service = new SeriesServiceImpl(
-			seriesDao,
 			jdbcSeriesDao,
 			imageService,
 			michelCatalogService,