CollectionService.isSeriesInCollection(): port from JPA to JDBC.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -193,7 +193,9 @@ public String showInfo(
 
 		model.addAttribute(
 			"isSeriesInCollection",
-			collectionService.isSeriesInCollection(currentUser, series)
+			currentUser == null
+			? false
+			: collectionService.isSeriesInCollection(currentUser.getId(), series.getId())
 		);
 
 		return "series/info";
@@ -222,7 +224,7 @@ public String processImage(
 
 		model.addAttribute(
 			"isSeriesInCollection",
-			collectionService.isSeriesInCollection(currentUser, series)
+			collectionService.isSeriesInCollection(currentUser.getId(), series.getId())
 		);
 
 		if (result.hasErrors()) {

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

@@ -24,4 +24,5 @@ public interface JdbcCollectionDao {
 	Iterable<LinkEntityDto> findLastCreated(int quantity);
 	long countCollectionsOfUsers();
 	Integer add(AddCollectionDbDto collection);
+	boolean isSeriesInUserCollection(Integer userId, Integer seriesId);
 }

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

@@ -49,6 +49,9 @@ public class JdbcCollectionDaoImpl implements JdbcCollectionDao {
 	@Value("${collection.create}")
 	private String addCollectionSql;
 
+	@Value("${collection.is_series_in_collection}")
+	private String isSeriesInUserCollectionSql;
+	
 	@Override
 	public Iterable<LinkEntityDto> findLastCreated(int quantity) {
 		return jdbcTemplate.query(
@@ -91,4 +94,16 @@ public Integer add(AddCollectionDbDto collection) {
 		return Integer.valueOf(holder.getKey().intValue());
 	}
 
+	@Override
+	public boolean isSeriesInUserCollection(Integer userId, Integer seriesId) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("user_id", userId);
+		params.put("series_id", seriesId);
+		
+		Long result = jdbcTemplate.queryForObject(isSeriesInUserCollectionSql, params, Long.class);
+		Validate.validState(result != null, "Query returned null instead of long");
+		
+		return result > 0;
+	}
+	
 }

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

@@ -26,7 +26,7 @@ public interface CollectionService {
 	void createCollection(User user);
 	Collection addToCollection(User user, Series series);
 	Collection removeFromCollection(User user, Series series);
-	boolean isSeriesInCollection(User user, Series series);
+	boolean isSeriesInCollection(Integer userId, Integer seriesId);
 	long countCollectionsOfUsers();
 	Iterable<LinkEntityDto> findRecentlyCreated(int quantity);
 }

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

@@ -108,25 +108,20 @@ public Collection removeFromCollection(User user, Series series) {
 
 	@Override
 	@Transactional(readOnly = false)
-	public boolean isSeriesInCollection(User user, Series series) {
-		Validate.isTrue(series != null, "Series must be non null");
+	public boolean isSeriesInCollection(Integer userId, Integer seriesId) {
+		Validate.isTrue(seriesId != null, "Series id must be non null");
 
-		if (user == null) {
+		if (userId == null) {
 			// Anonymous user doesn't have collection
 			return false;
 		}
 
-		// We can't just invoke user.getCollection().getSeries() because
-		// it will lead to LazyInitializationException. To workaround this
-		// we are loading collection by invoking dao.
-		Collection collection = collectionDao.findOne(user.getCollection().getId());
-		
-		boolean isSeriesInCollection = collection.getSeries().contains(series);
+		boolean isSeriesInCollection = jdbcCollectionDao.isSeriesInUserCollection(userId, seriesId);
 
 		LOG.debug(
 			"Series #{} belongs to collection of user #{}: {}",
-			series.getId(),
-			user.getId(),
+			seriesId,
+			userId,
 			isSeriesInCollection
 		);
 

src/main/resources/sql/collection_dao_queries.properties

@@ -29,3 +29,11 @@ VALUES \
      ( :user_id \
      , :slug \
      )
+
+collection.is_series_in_collection = \
+SELECT COUNT(*) \
+  FROM collections c \
+  JOIN collections_series cs \
+    ON cs.collection_id = c.id \
+ WHERE c.user_id = :user_id \
+   AND cs.series_id = :series_id