Ported counting of users' collections from JPA to SQL.

No functional changes.

Author: php-coder

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

@@ -17,12 +17,9 @@
  */
 package ru.mystamps.web.dao;
 
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
 import ru.mystamps.web.entity.Collection;
 
 public interface CollectionDao extends CrudRepository<Collection, Integer> {
-	@Query("SELECT COUNT(*) FROM Collection c WHERE c.series IS NOT EMPTY")
-	int countCollectionsOfUsers();
 }

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

@@ -21,4 +21,5 @@
 
 public interface JdbcCollectionDao {
 	Iterable<LinkEntityDto> findLastCreated(int quantity);
+	long countCollectionsOfUsers();
 }

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

@@ -38,6 +38,9 @@ public class JdbcCollectionDaoImpl implements JdbcCollectionDao {
 	@Value("${collection.find_last_created_sql}")
 	private String findLastCreatedCollectionsSql;
 
+	@Value("${collection.count_collections_of_users}")
+	private String countCollectionsOfUsersSql;
+	
 	public JdbcCollectionDaoImpl(DataSource dataSource) {
 		jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
 	}
@@ -51,4 +54,13 @@ public Iterable<LinkEntityDto> findLastCreated(int quantity) {
 		);
 	}
 
+	@Override
+	public long countCollectionsOfUsers() {
+		return jdbcTemplate.queryForObject(
+			countCollectionsOfUsersSql,
+			Collections.<String, Object>emptyMap(),
+			Long.class
+		);
+	}
+	
 }

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

@@ -135,7 +135,7 @@ public boolean isSeriesInCollection(User user, Series series) {
 	@Override
 	@Transactional(readOnly = true)
 	public long countCollectionsOfUsers() {
-		return collectionDao.countCollectionsOfUsers();
+		return jdbcCollectionDao.countCollectionsOfUsers();
 	}
 
 	@Override

src/main/resources/sql/collection_dao_queries.properties

@@ -9,3 +9,12 @@ collection.find_last_created_sql = \
       ON u.id = c.user_id \
 ORDER BY c.id DESC \
    LIMIT :quantity
+
+collection.count_collections_of_users = \
+   SELECT COUNT(DISTINCT c.id) \
+     FROM collections c \
+LEFT JOIN collections_series cs \
+       ON cs.collection_id = c.id \
+LEFT JOIN series s \
+       ON s.id = cs.series_id \
+    WHERE s.id IS NOT NULL