refactor: move countSeriesOf() method from SeriesService to CollectionService.

This change also remove dependency on series from collection module.

Fix #932

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/dao/SeriesDao.java

@@ -42,7 +42,6 @@ public interface SeriesDao {
 
 	long countAll();
 	long countAllStamps();
-	long countSeriesOfCollection(Integer collectionId);
 	long countSeriesById(Integer seriesId);
 	long countAddedSince(Date date);
 	long countUpdatedSince(Date date);

src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesDao.java

@@ -88,9 +88,6 @@ public class JdbcSeriesDao implements SeriesDao {
 	@Value("${series.count_all_stamps}")
 	private String countAllStampsSql;
 
-	@Value("${series.count_series_of_collection}")
-	private String countSeriesOfCollectionSql;
-	
 	@Value("${series.count_series_by_id}")
 	private String countSeriesByIdSql;
 
@@ -251,15 +248,6 @@ public long countAllStamps() {
 		return jdbcTemplate.queryForObject(countAllStampsSql, Collections.emptyMap(), Long.class);
 	}
 
-	@Override
-	public long countSeriesOfCollection(Integer collectionId) {
-		return jdbcTemplate.queryForObject(
-			countSeriesOfCollectionSql,
-			Collections.singletonMap("collection_id", collectionId),
-			Long.class
-		);
-	}
-	
 	@Override
 	public long countSeriesById(Integer seriesId) {
 		return jdbcTemplate.queryForObject(

src/main/java/ru/mystamps/web/feature/collection/CollectionConfig.java

@@ -28,7 +28,6 @@
 
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.country.CountryService;
-import ru.mystamps.web.service.SeriesService;
 
 /**
  * Spring configuration that is required for using collections in an application.
@@ -45,7 +44,6 @@ public static class Controllers {
 		private final CategoryService categoryService;
 		private final CollectionService collectionService;
 		private final CountryService countryService;
-		private final SeriesService seriesService;
 		private final MessageSource messageSource;
 
 		@Bean
@@ -54,7 +52,6 @@ public CollectionController collectionController() {
 				categoryService,
 				collectionService,
 				countryService,
-				seriesService,
 				messageSource
 			);
 		}

src/main/java/ru/mystamps/web/feature/collection/CollectionController.java

@@ -37,7 +37,6 @@
 import ru.mystamps.web.Url;
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.country.CountryService;
-import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.util.LocaleUtils;
 
 @Controller
@@ -47,7 +46,6 @@ public class CollectionController {
 	private final CategoryService categoryService;
 	private final CollectionService collectionService;
 	private final CountryService countryService;
-	private final SeriesService seriesService;
 	private final MessageSource messageSource;
 
 	// @todo #884 /collection/{slug}: add a link to collection estimation page
@@ -82,7 +80,7 @@ public String showInfoBySlug(
 		if (seriesOfCollection.iterator().hasNext()) {
 			long categoryCounter = categoryService.countCategoriesOf(collectionId);
 			long countryCounter  = countryService.countCountriesOf(collectionId);
-			long seriesCounter   = seriesService.countSeriesOf(collectionId);
+			long seriesCounter   = collectionService.countSeriesOf(collectionId);
 			long stampsCounter   = collectionService.countStampsOf(collectionId);
 
 			List<Object[]> categoriesStat = categoryService.getStatisticsOf(collectionId, lang);

src/main/java/ru/mystamps/web/feature/collection/CollectionDao.java

@@ -29,6 +29,7 @@ public interface CollectionDao {
 	List<SeriesInCollectionWithPriceDto> findSeriesWithPricesBySlug(String slug, String lang);
 	long countCollectionsOfUsers();
 	long countUpdatedSince(Date date);
+	long countSeriesOfCollection(Integer collectionId);
 	long countStampsOfCollection(Integer collectionId);
 	Integer add(AddCollectionDbDto collection);
 	void markAsModified(Integer userId, Date updatedAt);

src/main/java/ru/mystamps/web/feature/collection/CollectionService.java

@@ -22,13 +22,15 @@
 
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 
+@SuppressWarnings("PMD.TooManyMethods")
 public interface CollectionService {
 	void createCollection(Integer ownerId, String ownerLogin);
 	void addToCollection(Integer userId, AddToCollectionDto dto);
 	void removeFromCollection(Integer userId, Integer seriesId);
 	boolean isSeriesInCollection(Integer userId, Integer seriesId);
 	long countCollectionsOfUsers();
 	long countUpdatedSince(Date date);
+	long countSeriesOf(Integer collectionId);
 	long countStampsOf(Integer collectionId);
 	List<LinkEntityDto> findRecentlyCreated(int quantity);
 	List<SeriesInCollectionDto> findSeriesInCollection(Integer collectionId, String lang);

src/main/java/ru/mystamps/web/feature/collection/CollectionServiceImpl.java

@@ -138,6 +138,14 @@ public long countUpdatedSince(Date date) {
 		return collectionDao.countUpdatedSince(date);
 	}
 
+	@Override
+	@Transactional(readOnly = true)
+	public long countSeriesOf(Integer collectionId) {
+		Validate.isTrue(collectionId != null, "Collection id must be non null");
+		
+		return collectionDao.countSeriesOfCollection(collectionId);
+	}
+	
 	@Override
 	@Transactional(readOnly = true)
 	public long countStampsOf(Integer collectionId) {

src/main/java/ru/mystamps/web/feature/collection/JdbcCollectionDao.java

@@ -62,6 +62,9 @@ public class JdbcCollectionDao implements CollectionDao {
 	@Value("${collection.count_updated_since}")
 	private String countUpdatedSinceSql;
 
+	@Value("${collection.count_series_of_collection}")
+	private String countSeriesOfCollectionSql;
+	
 	@Value("${collection.count_stamps_of_collection}")
 	private String countStampsOfCollectionSql;
 
@@ -139,6 +142,15 @@ public long countUpdatedSince(Date date) {
 		);
 	}
 
+	@Override
+	public long countSeriesOfCollection(Integer collectionId) {
+		return jdbcTemplate.queryForObject(
+			countSeriesOfCollectionSql,
+			Collections.singletonMap("collection_id", collectionId),
+			Long.class
+		);
+	}
+	
 	@Override
 	public long countStampsOfCollection(Integer collectionId) {
 		return jdbcTemplate.queryForObject(

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

@@ -35,8 +35,6 @@ public interface SeriesService {
 	void addImageToSeries(AddImageDto dto, Integer seriesId, Integer userId);
 	long countAll();
 	long countAllStamps();
-	// @todo #927 SeriesService.countSeriesOf(): move to CollectionService
-	long countSeriesOf(Integer collectionId);
 	long countAddedSince(Date date);
 	long countUpdatedSince(Date date);
 	boolean isSeriesExist(Integer seriesId);

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

@@ -178,14 +178,6 @@ public long countAllStamps() {
 		return seriesDao.countAllStamps();
 	}
 
-	@Override
-	@Transactional(readOnly = true)
-	public long countSeriesOf(Integer collectionId) {
-		Validate.isTrue(collectionId != null, "Collection id must be non null");
-		
-		return seriesDao.countSeriesOfCollection(collectionId);
-	}
-	
 	@Override
 	@Transactional(readOnly = true)
 	public long countAddedSince(Date date) {

src/main/resources/sql/collection_dao_queries.properties

@@ -65,6 +65,11 @@ SELECT COUNT(*) \
   FROM collections \
  WHERE updated_at >= :date
 
+collection.count_series_of_collection = \
+SELECT COUNT(*) AS counter \
+  FROM collections_series cs \
+ WHERE cs.collection_id = :collection_id
+
 collection.count_stamps_of_collection = \
 SELECT COALESCE(SUM(cs.number_of_stamps), 0) AS counter \
   FROM collections_series cs \

src/main/resources/sql/series_dao_queries.properties

@@ -178,11 +178,6 @@ series.count_all_stamps = \
 SELECT COALESCE(SUM(s.quantity), 0) \
   FROM series s
 
-series.count_series_of_collection = \
-SELECT COUNT(*) AS counter \
-  FROM collections_series cs \
- WHERE cs.collection_id = :collection_id
-
 series.count_series_by_id = \
 SELECT COUNT(*) \
   FROM series \

src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy

@@ -316,6 +316,26 @@ class CollectionServiceImplTest extends Specification {
 			result == expectedResult
 	}
 
+	//
+	// Tests for countSeriesOf()
+	//
+	
+	def 'countSeriesOf() should throw exception when argument is null'() {
+		when:
+			service.countSeriesOf(null)
+		then:
+			thrown IllegalArgumentException
+	}
+	
+	def 'countSeriesOf() should pass argument to dao'() {
+		given:
+			Integer expectedCollectionId = Random.id()
+		when:
+			service.countSeriesOf(expectedCollectionId)
+		then:
+			1 * collectionDao.countSeriesOfCollection(expectedCollectionId) >> positiveLong()
+	}
+	
 	//
 	// Tests for countStampsOf()
 	//

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

@@ -573,26 +573,6 @@ class SeriesServiceImplTest extends Specification {
 			result == expectedResult
 	}
 
-	//
-	// Tests for countSeriesOf()
-	//
-	
-	def "countSeriesOf() should throw exception when argument is null"() {
-		when:
-			service.countSeriesOf(null)
-		then:
-			thrown IllegalArgumentException
-	}
-	
-	def "countSeriesOf() should pass argument to dao"() {
-		given:
-			Integer expectedCollectionId = Random.id()
-		when:
-			service.countSeriesOf(expectedCollectionId)
-		then:
-			1 * seriesDao.countSeriesOfCollection(expectedCollectionId) >> positiveLong()
-	}
-	
 	//
 	// Tests for countAddedSince()
 	//