task: add collections_series.id field to make possible to distinguish different instaces of a series.

This change is required for separate removal of a series instances from a collection.

Part of #1123

Author: php-coder

src/main/java/ru/mystamps/web/feature/collection/CollectionDao.java

@@ -34,7 +34,7 @@ public interface CollectionDao {
 	Integer add(AddCollectionDbDto collection);
 	void markAsModified(Integer userId, Date updatedAt);
 	boolean isSeriesInUserCollection(Integer userId, Integer seriesId);
-	void addSeriesToUserCollection(AddToCollectionDbDto dto);
+	Integer addSeriesToUserCollection(AddToCollectionDbDto dto);
 	void removeSeriesFromUserCollection(Integer userId, Integer seriesId);
 	CollectionInfoDto findCollectionInfoBySlug(String slug);
 }

src/main/java/ru/mystamps/web/feature/collection/CollectionServiceImpl.java

@@ -82,13 +82,14 @@ public void addToCollection(Integer userId, AddToCollectionDto dto) {
 			collectionDto.setCurrency(dto.getCurrency().toString());
 		}
 
-		collectionDao.addSeriesToUserCollection(collectionDto);
+		Integer seriesInstanceId = collectionDao.addSeriesToUserCollection(collectionDto);
 		collectionDao.markAsModified(userId, new Date());
 
 		log.info(
-			"Series #{} ({}) has been added to collection",
+			"Series #{} ({}) has been added to collection: #{}",
 			dto.getSeriesId(),
-			formatSeriesInfo(collectionDto)
+			formatSeriesInfo(collectionDto),
+			seriesInstanceId
 		);
 	}
 

src/main/java/ru/mystamps/web/feature/collection/JdbcCollectionDao.java

@@ -219,15 +219,22 @@ public boolean isSeriesInUserCollection(Integer userId, Integer seriesId) {
 	}
 
 	@Override
-	public void addSeriesToUserCollection(AddToCollectionDbDto dto) {
+	public Integer addSeriesToUserCollection(AddToCollectionDbDto dto) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("user_id", dto.getOwnerId());
 		params.put("series_id", dto.getSeriesId());
 		params.put("number_of_stamps", dto.getNumberOfStamps());
 		params.put("price", dto.getPrice());
 		params.put("currency", dto.getCurrency());
 
-		int affected = jdbcTemplate.update(addSeriesToCollectionSql, params);
+		KeyHolder holder = new GeneratedKeyHolder();
+		
+		int affected = jdbcTemplate.update(
+			addSeriesToCollectionSql,
+			new MapSqlParameterSource(params),
+			holder,
+			JdbcUtils.ID_KEY_COLUMN
+		);
 
 		// CheckStyle: ignore LineLength for next 3 lines
 		Validate.validState(
@@ -237,6 +244,8 @@ public void addSeriesToUserCollection(AddToCollectionDbDto dto) {
 			dto.getOwnerId(),
 			affected
 		);
+		
+		return holder.getKey().intValue();
 	}
 
 	@SuppressWarnings("PMD.AvoidLiteralsInIfCondition")

src/main/resources/liquibase/version/0.4.2.xml

@@ -6,5 +6,6 @@
 		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd">
 
 	<include file="0.4.2/2019-11-17--drop_unique_series_from_collection.xml" relativeToChangelogFile="true" />
+	<include file="0.4.2/2019-11-27--add_collections_series_id.xml" relativeToChangelogFile="true" />
 
 </databaseChangeLog>

src/main/resources/liquibase/version/0.4.2/2019-11-27--add_collections_series_id.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+	
+	<changeSet id="add-collections_series-id-field" author="php-coder" context="scheme">
+		
+		<addColumn tableName="collections_series">
+			<column name="id" type="INTEGER" autoIncrement="true" beforeColumn="collection_id" />
+		</addColumn>
+		
+		<addPrimaryKey
+			tableName="collections_series"
+			columnNames="id"
+			constraintName="pk_collections_series_id" />
+		
+	</changeSet>
+	
+</databaseChangeLog>

src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy

@@ -194,7 +194,7 @@ class CollectionServiceImplTest extends Specification {
 				assert dto.seriesId == expectedSeriesId
 				assert dto.numberOfStamps == expectedNumberOfStamps
 				return true
-			})
+			}) >> Random.id()
 		and:
 			1 * collectionDao.markAsModified(
 				expectedUserId,