CollectionDao.addSeriesToCollection(): replace argument collectionId by collectionSlug.

Addressed to #440

No functional changes.

Author: php-coder

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

@@ -30,7 +30,7 @@ public interface CollectionDao {
 	Integer add(AddCollectionDbDto collection);
 	boolean isSeriesInUserCollection(Integer userId, Integer seriesId);
 	UrlEntityDto findCollectionUrlEntityByUserId(Integer userId);
-	void addSeriesToCollection(Integer collectionId, Integer seriesId);
+	void addSeriesToCollection(String collectionSlug, Integer seriesId);
 	void removeSeriesFromCollection(Integer collectionId, Integer seriesId);
 	CollectionInfoDto findCollectionInfoBySlug(String slug);
 }

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

@@ -138,17 +138,17 @@ public UrlEntityDto findCollectionUrlEntityByUserId(Integer userId) {
 	}
 
 	@Override
-	public void addSeriesToCollection(Integer collectionId, Integer seriesId) {
+	public void addSeriesToCollection(String collectionSlug, Integer seriesId) {
 		Map<String, Object> params = new HashMap<>();
-		params.put("collection_id", collectionId);
+		params.put("collection_slug", collectionSlug);
 		params.put("series_id", seriesId);
 
 		int affected = jdbcTemplate.update(addSeriesToCollectionSql, params);
 		Validate.validState(
 			affected == 1,
-			"Unexpected number of affected rows after adding series #%d to collection #%d: %d",
+			"Unexpected number of affected rows after adding series #%d to collection '%s': %d",
 			seriesId,
-			collectionId,
+			collectionSlug,
 			affected
 		);
 	}

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

@@ -74,14 +74,13 @@ public UrlEntityDto addToCollection(Integer userId, Integer seriesId) {
 		Validate.isTrue(seriesId != null, "Series id must be non null");
 
 		UrlEntityDto url = collectionDao.findCollectionUrlEntityByUserId(userId);
-		Integer collectionId = url.getId();
+		String collectionSlug = url.getSlug();
 
-		collectionDao.addSeriesToCollection(collectionId, seriesId);
+		collectionDao.addSeriesToCollection(collectionSlug, seriesId);
 
 		LOG.info(
-			"Series #{} has been added to collection #{} of user #{}",
+			"Series #{} has been added to collection of user #{}",
 			seriesId,
-			collectionId,
 			userId
 		);
 

src/main/resources/sql/collection_dao_queries.properties

@@ -45,14 +45,11 @@ SELECT id, slug \
 
 collection.add_series_to_collection = \
 INSERT \
-  INTO collections_series \
-     ( collection_id \
-     , series_id \
-     ) \
-VALUES \
-     ( :collection_id \
-     , :series_id \
-     )
+  INTO collections_series(collection_id, series_id) \
+SELECT c.id AS collection_id \
+      , :series_id AS series_id \
+  FROM collections c \
+ WHERE c.slug = :collection_slug
 
 collection.remove_series_from_collection = \
 DELETE \

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

@@ -122,14 +122,14 @@ class CollectionServiceImplTest extends Specification {
 		and:
 			UrlEntityDto url = TestObjects.createUrlEntityDto()
 		and:
-			Integer expectedCollectionId = url.getId()
+			String expectedCollectionSlug = url.getSlug()
 		and:
 			collectionDao.findCollectionUrlEntityByUserId(_ as Integer) >> url
 		when:
 			service.addToCollection(123, expectedSeriesId)
 		then:
-			1 * collectionDao.addSeriesToCollection({ Integer collectionId ->
-				assert collectionId == expectedCollectionId
+			1 * collectionDao.addSeriesToCollection({ String collectionSlug ->
+				assert collectionSlug == expectedCollectionSlug
 				return true
 			}, { Integer seriesId ->
 				assert seriesId == expectedSeriesId