SeriesService.countStampsOf(): rename to CollectionService.countStampsOf().

Fix #878

Author: php-coder

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

@@ -87,7 +87,7 @@ public String showInfoBySlug(
 			long categoryCounter = categoryService.countCategoriesOf(collectionId);
 			long countryCounter  = countryService.countCountriesOf(collectionId);
 			long seriesCounter   = seriesService.countSeriesOf(collectionId);
-			long stampsCounter   = seriesService.countStampsOf(collectionId);
+			long stampsCounter   = collectionService.countStampsOf(collectionId);
 
 			List<Object[]> categoriesStat = categoryService.getStatisticsOf(collectionId, lang);
 			List<Object[]> countriesStat  = getCountriesStatistics(collectionId, lang);

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

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

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

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

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

@@ -63,6 +63,9 @@ public class JdbcCollectionDao implements CollectionDao {
 	@Value("${collection.count_updated_since}")
 	private String countUpdatedSinceSql;
 
+	@Value("${collection.count_stamps_of_collection}")
+	private String countStampsOfCollectionSql;
+	
 	@Value("${collection.create}")
 	private String addCollectionSql;
 
@@ -124,6 +127,15 @@ public long countUpdatedSince(Date date) {
 		);
 	}
 
+	@Override
+	public long countStampsOfCollection(Integer collectionId) {
+		return jdbcTemplate.queryForObject(
+			countStampsOfCollectionSql,
+			Collections.singletonMap("collection_id", collectionId),
+			Long.class
+		);
+	}
+	
 	@Override
 	public Integer add(AddCollectionDbDto collection) {
 		Map<String, Object> params = new HashMap<>();

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

@@ -94,9 +94,6 @@ public class JdbcSeriesDao implements SeriesDao {
 	@Value("${series.count_series_of_collection}")
 	private String countSeriesOfCollectionSql;
 
-	@Value("${series.count_stamps_of_collection}")
-	private String countStampsOfCollectionSql;
-	
 	@Value("${series.count_series_by_id}")
 	private String countSeriesByIdSql;
 
@@ -279,15 +276,6 @@ public long countSeriesOfCollection(Integer collectionId) {
 		);
 	}
 
-	@Override
-	public long countStampsOfCollection(Integer collectionId) {
-		return jdbcTemplate.queryForObject(
-			countStampsOfCollectionSql,
-			Collections.singletonMap("collection_id", collectionId),
-			Long.class
-		);
-	}
-	
 	@Override
 	public long countSeriesById(Integer seriesId) {
 		return jdbcTemplate.queryForObject(

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

@@ -32,6 +32,7 @@ public interface CollectionService {
 	boolean isSeriesInCollection(Integer userId, Integer seriesId);
 	long countCollectionsOfUsers();
 	long countUpdatedSince(Date date);
+	long countStampsOf(Integer collectionId);
 	List<LinkEntityDto> findRecentlyCreated(int quantity);
 	List<SeriesInCollectionWithPriceDto> findSeriesWithPricesBySlug(String slug, String lang);
 	CollectionInfoDto findBySlug(String slug);

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

@@ -143,6 +143,14 @@ public long countUpdatedSince(Date date) {
 		return collectionDao.countUpdatedSince(date);
 	}
 
+	@Override
+	@Transactional(readOnly = true)
+	public long countStampsOf(Integer collectionId) {
+		Validate.isTrue(collectionId != null, "Collection id must be non null");
+		
+		return collectionDao.countStampsOfCollection(collectionId);
+	}
+	
 	@Override
 	@Transactional(readOnly = true)
 	public List<LinkEntityDto> findRecentlyCreated(int quantity) {

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

@@ -37,8 +37,6 @@ public interface SeriesService {
 	long countAll();
 	long countAllStamps();
 	long countSeriesOf(Integer collectionId);
-	// @todo #477 SeriesService.countStampsOf(): rename to CollectionService.countStampsOf()
-	long countStampsOf(Integer collectionId);
 	long countAddedSince(Date date);
 	long countUpdatedSince(Date date);
 	boolean isSeriesExist(Integer seriesId);

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

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

src/main/resources/sql/collection_dao_queries.properties

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

src/main/resources/sql/series_dao_queries.properties

@@ -206,11 +206,6 @@ SELECT COUNT(*) AS counter \
   FROM collections_series cs \
  WHERE cs.collection_id = :collection_id
 
-series.count_stamps_of_collection = \
-SELECT COALESCE(SUM(cs.number_of_stamps), 0) 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/service/CollectionServiceImplTest.groovy

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

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

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