Update the collections.updated_at/by fields when series added/removed.

Author: Shkarin

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

@@ -17,6 +17,7 @@
  */
 package ru.mystamps.web.dao;
 
+import java.util.Date;
 import java.util.List;
 
 import ru.mystamps.web.dao.dto.AddCollectionDbDto;
@@ -27,6 +28,7 @@ public interface CollectionDao {
 	List<LinkEntityDto> findLastCreated(int quantity);
 	long countCollectionsOfUsers();
 	Integer add(AddCollectionDbDto collection);
+	void markAsModified(Integer updatedBy, Date updatedAt);
 	boolean isSeriesInUserCollection(Integer userId, Integer seriesId);
 	void addSeriesToUserCollection(Integer userId, Integer seriesId);
 	void removeSeriesFromUserCollection(Integer userId, Integer seriesId);

src/main/java/ru/mystamps/web/dao/dto/AddCollectionDbDto.java

@@ -17,6 +17,8 @@
  */
 package ru.mystamps.web.dao.dto;
 
+import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -27,4 +29,5 @@
 public class AddCollectionDbDto {
 	private Integer ownerId;
 	private String slug;
+	private Date updatedAt;
 }

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

@@ -18,6 +18,7 @@
 package ru.mystamps.web.dao.impl;
 
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +57,9 @@ public class JdbcCollectionDao implements CollectionDao {
 
 	@Value("${collection.create}")
 	private String addCollectionSql;
+
+	@Value("${collection.mark_as_modified}")
+	private String markAsModifiedSql;
 
 	@Value("${collection.is_series_in_collection}")
 	private String isSeriesInUserCollectionSql;
@@ -92,6 +96,8 @@ public Integer add(AddCollectionDbDto collection) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("user_id", collection.getOwnerId());
 		params.put("slug", collection.getSlug());
+		params.put("updated_at", collection.getUpdatedAt());
+		params.put("updated_by", collection.getOwnerId());
 
 		KeyHolder holder = new GeneratedKeyHolder();
 
@@ -110,6 +116,27 @@ public Integer add(AddCollectionDbDto collection) {
 
 		return Integer.valueOf(holder.getKey().intValue());
 	}
+
+	/**
+	 * @author John Shkarin
+	 */
+	@Override
+	public void markAsModified(Integer updatedBy, Date updatedAt) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("updated_at", updatedAt);
+		params.put("updated_by", updatedBy);
+
+		int affected = jdbcTemplate.update(
+			markAsModifiedSql,
+			params
+		);
+
+		Validate.validState(
+			affected == 1,
+			"Unexpected number of affected rows after updating collection: %d",
+			affected
+		);
+	}
 
 	@Override
 	public boolean isSeriesInUserCollection(Integer userId, Integer seriesId) {

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

@@ -17,6 +17,7 @@
  */
 package ru.mystamps.web.service;
 
+import java.util.Date;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -59,6 +60,7 @@ public void createCollection(Integer ownerId, String ownerLogin) {
 			"Slug for string '%s' must be non empty", ownerLogin
 		);
 		collection.setSlug(slug);
+		collection.setUpdatedAt(new Date());
 
 		Integer id = collectionDao.add(collection);
 
@@ -73,6 +75,7 @@ public void addToCollection(Integer userId, Integer seriesId) {
 		Validate.isTrue(seriesId != null, "Series id must be non null");
 
 		collectionDao.addSeriesToUserCollection(userId, seriesId);
+		collectionDao.markAsModified(userId, new Date());
 
 		LOG.info("Series #{} has been added to collection of user #{}", seriesId, userId);
 	}
@@ -85,6 +88,7 @@ public void removeFromCollection(Integer userId, Integer seriesId) {
 		Validate.isTrue(seriesId != null, "Series id must be non null");
 
 		collectionDao.removeSeriesFromUserCollection(userId, seriesId);
+		collectionDao.markAsModified(userId, new Date());
 
 		LOG.info("Series #{} has been removed from collection of user #{}", seriesId, userId);
 	}

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

@@ -25,5 +25,6 @@
 	<include file="0.4/2016-12-05--make_name_ru_optional.xml" relativeToChangelogFile="true" />
 	<include file="0.4/2017-01-06--top_categories.xml" relativeToChangelogFile="true" />
 	<include file="0.4/2017-01-25--united_kingdom_country.xml" relativeToChangelogFile="true" />
+	<include file="0.4/2017-01-29--add_updater_data_to_collections.xml" relativeToChangelogFile="true" />
 
 </databaseChangeLog>

src/main/resources/liquibase/version/0.4/2017-01-29--add_updater_data_to_collections.xml

@@ -0,0 +1,39 @@
+<?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.0.xsd">
+	
+	<changeSet id="add-updater-data-to-collections-table" author="john" context="scheme">
+		<!-- Since MySQL 5.6.5 it's possible to use `NOW()` as default value for a column
+			but we're doing the same in 3 steps to support also old versions. -->
+		<addColumn tableName="collections">
+			<column name="updated_at" type="DATETIME" />
+			<column name="updated_by" type="INTEGER" />
+		</addColumn>
+
+		<update tableName="collections">
+			<column name="updated_at" type="DATETIME" valueComputed="${NOW}" />
+		</update>
+
+		<update tableName="collections">
+			<column name="updated_by"
+					type="INTEGER"
+					valueComputed="(user_id)" />
+		</update>
+		
+		<addNotNullConstraint tableName="collections" columnName="updated_at" columnDataType="DATETIME" />
+		
+		<addNotNullConstraint tableName="collections" columnName="updated_by" columnDataType="INTEGER" />
+
+		<addForeignKeyConstraint
+			baseTableName="collections"
+			baseColumnNames="updated_by"
+			constraintName="fk_collections_users_id"
+			referencedTableName="users"
+			referencedColumnNames="id" />
+		
+	</changeSet>
+	
+</databaseChangeLog>

src/main/resources/sql/collection_dao_queries.properties

@@ -24,12 +24,22 @@ INSERT \
   INTO collections \
      ( user_id \
      , slug \
+     , updated_at \
+     , updated_by \
      ) \
 VALUES \
      ( :user_id \
      , :slug \
+     , :updated_at \
+     , :updated_by \
      )
 
+collection.mark_as_modified = \
+UPDATE collections c \
+   SET c.updated_at = :updated_at \
+     , c.updated_by = :updated_by \
+ WHERE c.user_id = :updated_by
+
 collection.is_series_in_collection = \
 SELECT COUNT(*) \
   FROM collections c \

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

@@ -17,6 +17,7 @@
  */
 package ru.mystamps.web.service
 
+import ru.mystamps.web.tests.DateUtils
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -111,7 +112,7 @@ class CollectionServiceImplTest extends Specification {
 	}
 
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
-	def "addToCollection() should pass arguments to dao"() {
+	def "addToCollection() should add series to collection and mark it as modified"() {
 		given:
 			Integer expectedUserId = 123
 			Integer expectedSeriesId = 456
@@ -125,6 +126,14 @@ class CollectionServiceImplTest extends Specification {
 				assert seriesId == expectedSeriesId
 				return true
 			})
+		and:
+			1 * collectionDao.markAsModified({ Integer updatedBy ->
+				assert updatedBy == expectedUserId
+				return true
+			}, { Date updatedAt ->
+				assert DateUtils.roughlyEqual(updatedAt, new Date())
+				return true
+			})
 	}
 
 	//
@@ -146,7 +155,7 @@ class CollectionServiceImplTest extends Specification {
 	}
 
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
-	def "removeFromCollection() should remove series from collection"() {
+	def "removeFromCollection() should remove series from collection and mark it as modified"() {
 		given:
 			Integer expectedUserId = 123
 			Integer expectedSeriesId = 456
@@ -160,6 +169,14 @@ class CollectionServiceImplTest extends Specification {
 				assert seriesId == expectedSeriesId
 				return true
 			})
+		and:
+			1 * collectionDao.markAsModified({ Integer updatedBy ->
+				assert updatedBy == expectedUserId
+				return true
+			}, { Date updatedAt ->
+				assert DateUtils.roughlyEqual(updatedAt, new Date())
+				return true
+			})
 	}
 
 	//