Ported counting of stamps from JPA to SQL.

No functional changes.

Author: php-coder

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

@@ -21,6 +21,7 @@
 
 public interface JdbcSeriesDao {
 	Iterable<SeriesInfoDto> findLastAdded(int quantity, String lang);
+	long countAllStamps();
 	long countSeriesOfCollection(Integer collectionId);
 	long countStampsOfCollection(Integer collectionId);
 }

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

@@ -40,9 +40,6 @@ public interface SeriesDao extends CrudRepository<Series, Integer> {
 	@Query("SELECT COUNT(*) FROM Series s INNER JOIN s.gibbons m WHERE m.code = :gibbonsCode")
 	int countByGibbonsNumberCode(@Param("gibbonsCode") String gibbonsNumberCode);
 
-	@Query("SELECT COALESCE(SUM(quantity), 0) FROM Series")
-	long countAllStamps();
-	
 	@Query(
 		"SELECT NEW ru.mystamps.web.service.dto.SeriesInfoDto("
 			+ "s.id, "

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

@@ -40,6 +40,9 @@ public class JdbcSeriesDaoImpl implements JdbcSeriesDao {
 	@Value("${series.find_last_added_sql}")
 	private String findLastAddedSeriesSql;
 
+	@Value("${series.count_all_stamps}")
+	private String countAllStampsSql;
+	
 	@Value("${series.count_series_of_collection}")
 	private String countSeriesOfCollectionSql;
 
@@ -59,6 +62,15 @@ public Iterable<SeriesInfoDto> findLastAdded(int quantity, String lang) {
 		return jdbcTemplate.query(findLastAddedSeriesSql, params, SERIES_INFO_DTO_ROW_MAPPER);
 	}
 
+	@Override
+	public long countAllStamps() {
+		return jdbcTemplate.queryForObject(
+			countAllStampsSql,
+			Collections.<String, Object>emptyMap(),
+			Long.class
+		);
+	}
+	
 	@Override
 	public long countSeriesOfCollection(Integer collectionId) {
 		return jdbcTemplate.queryForObject(

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

@@ -130,7 +130,7 @@ public long countAll() {
 	@Override
 	@Transactional(readOnly = true)
 	public long countAllStamps() {
-		return seriesDao.countAllStamps();
+		return jdbcSeriesDao.countAllStamps();
 	}
 
 	@Override

src/main/resources/sql/series_dao_queries.properties

@@ -19,6 +19,10 @@ LEFT JOIN countries count \
  ORDER BY s.id DESC \
     LIMIT :quantity
 
+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 \

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

@@ -615,7 +615,7 @@ class SeriesServiceImplTest extends Specification {
 		when:
 			long result = service.countAllStamps()
 		then:
-			1 * seriesDao.countAllStamps() >> expectedResult
+			1 * jdbcSeriesDao.countAllStamps() >> expectedResult
 		and:
 			result == expectedResult
 	}