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

Addressed to #120

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/config/ServicesConfig.java

@@ -56,9 +56,6 @@ public class ServicesConfig {
 	@Inject
 	private ImageDao imageDao;
 
-	@Inject
-	private CollectionDao collectionDao;
-	
 	@Inject
 	private JavaMailSender mailSender;
 
@@ -80,7 +77,7 @@ public CategoryService getCategoryService() {
 
 	@Bean
 	public CollectionService getCollectionService() {
-		return new CollectionServiceImpl(collectionDao, daoConfig.getJdbcCollectionDao());
+		return new CollectionServiceImpl(daoConfig.getJdbcCollectionDao());
 	}
 
 	@Bean

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

@@ -282,7 +282,7 @@ public String removeFromCollection(
 			return null;
 		}
 
-		Collection collection = collectionService.removeFromCollection(currentUser, series);
+		UrlEntityDto collection = collectionService.removeFromCollection(currentUser.getId(), series.getId());
 
 		redirectAttributes.addFlashAttribute("justRemovedSeries", true);
 

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

@@ -28,4 +28,5 @@ public interface JdbcCollectionDao {
 	boolean isSeriesInUserCollection(Integer userId, Integer seriesId);
 	UrlEntityDto findCollectionUrlEntityByUserId(Integer userId);
 	void addSeriesToCollection(Integer collectionId, Integer seriesId);
+	void removeSeriesFromCollection(Integer collectionId, Integer seriesId);
 }

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

@@ -23,6 +23,9 @@
 
 import org.apache.commons.lang3.Validate;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -39,6 +42,7 @@
 @RequiredArgsConstructor
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public class JdbcCollectionDaoImpl implements JdbcCollectionDao {
+	private static final Logger LOG = LoggerFactory.getLogger(JdbcCollectionDaoImpl.class);
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
 
@@ -61,6 +65,9 @@ public class JdbcCollectionDaoImpl implements JdbcCollectionDao {
 	@Value("${collection.add_series_to_collection}")
 	private String addSeriesToCollectionSql;
 
+	@Value("${collection.remove_series_from_collection}")
+	private String removeSeriesFromCollectionSql;
+	
 	@Override
 	public Iterable<LinkEntityDto> findLastCreated(int quantity) {
 		return jdbcTemplate.query(
@@ -140,4 +147,23 @@ public void addSeriesToCollection(Integer collectionId, Integer seriesId) {
 		);
 	}
 
+	@SuppressWarnings("PMD.AvoidLiteralsInIfCondition")
+	@Override
+	public void removeSeriesFromCollection(Integer collectionId, Integer seriesId) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("collection_id", collectionId);
+		params.put("series_id", seriesId);
+		
+		int affected = jdbcTemplate.update(removeSeriesFromCollectionSql, params);
+		if (affected != 1) {
+			// CheckStyle: ignore LineLength for next 2 lines
+			LOG.warn(
+				"Unexpected number of affected rows after removing series #{} from collection #{}: %{}",
+				seriesId,
+				collectionId,
+				affected
+			);
+		}
+	}
+	
 }

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

@@ -17,16 +17,14 @@
  */
 package ru.mystamps.web.service;
 
-import ru.mystamps.web.entity.Collection;
-import ru.mystamps.web.entity.Series;
 import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.UrlEntityDto;
 
 public interface CollectionService {
 	void createCollection(User user);
 	UrlEntityDto addToCollection(Integer userId, Integer seriesId);
-	Collection removeFromCollection(User user, Series series);
+	UrlEntityDto removeFromCollection(Integer userId, Integer seriesId);
 	boolean isSeriesInCollection(Integer userId, Integer seriesId);
 	long countCollectionsOfUsers();
 	Iterable<LinkEntityDto> findRecentlyCreated(int quantity);

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

@@ -27,11 +27,8 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.dao.CollectionDao;
 import ru.mystamps.web.dao.JdbcCollectionDao;
 import ru.mystamps.web.dao.dto.AddCollectionDbDto;
-import ru.mystamps.web.entity.Collection;
-import ru.mystamps.web.entity.Series;
 import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.UrlEntityDto;
@@ -41,7 +38,6 @@
 public class CollectionServiceImpl implements CollectionService {
 	private static final Logger LOG = LoggerFactory.getLogger(CollectionServiceImpl.class);
 
-	private final CollectionDao collectionDao;
 	private final JdbcCollectionDao jdbcCollectionDao;
 
 	@Override
@@ -86,24 +82,22 @@ public UrlEntityDto addToCollection(Integer userId, Integer seriesId) {
 	@Override
 	@Transactional
 	@PreAuthorize("hasAuthority('UPDATE_COLLECTION')")
-	public Collection removeFromCollection(User user, Series series) {
-		Validate.isTrue(user != null, "User must be non null");
-		Validate.isTrue(series != null, "Series must be non null");
+	public UrlEntityDto removeFromCollection(Integer userId, Integer seriesId) {
+		Validate.isTrue(userId != null, "User id must be non null");
+		Validate.isTrue(seriesId != null, "Series id must be non null");
 
-		// 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());
+		UrlEntityDto url = jdbcCollectionDao.findCollectionUrlEntityByUserId(userId);
+		Integer collectionId = url.getId();
 
-		collection.getSeries().remove(series);
+		jdbcCollectionDao.removeSeriesFromCollection(collectionId, seriesId);
 
 		LOG.info(
 			"Series #{} has been removed from collection of user #{}",
-			series.getId(),
-			user.getId()
+			seriesId,
+			userId
 		);
 
-		return collection;
+		return url;
 	}
 
 	@Override

src/main/resources/sql/collection_dao_queries.properties

@@ -53,3 +53,9 @@ VALUES \
      ( :collection_id \
      , :series_id \
      )
+
+collection.remove_series_from_collection = \
+DELETE \
+  FROM collections_series \
+ WHERE collection_id = :collection_id \
+   AND series_id = :series_id

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

@@ -20,17 +20,15 @@ package ru.mystamps.web.service
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import ru.mystamps.web.dao.CollectionDao
 import ru.mystamps.web.dao.JdbcCollectionDao
 
 class CollectionServiceImplTest extends Specification {
-	private CollectionDao collectionDao = Mock()
 	private JdbcCollectionDao jdbcCollectionDao = Mock()
 
 	private CollectionService service
 
 	def setup() {
-		service = new CollectionServiceImpl(collectionDao, jdbcCollectionDao)
+		service = new CollectionServiceImpl(jdbcCollectionDao)
 	}
 
 	//