Merge branch 'gh357_collections_metadata'

Fix #357

Author: php-coder

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

@@ -67,6 +67,7 @@ public CronService getCronService() {
 		return new CronServiceImpl(
 			getCategoryService(),
 			getCountryService(),
+			getCollectionService(),
 			getSeriesService(),
 			getSuspiciousActivityService(),
 			getUserService(),

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;
@@ -26,7 +27,9 @@
 public interface CollectionDao {
 	List<LinkEntityDto> findLastCreated(int quantity);
 	long countCollectionsOfUsers();
+	long countUpdatedSince(Date date);
 	Integer add(AddCollectionDbDto collection);
+	void markAsModified(Integer userId, 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;
@@ -54,8 +55,14 @@ public class JdbcCollectionDao implements CollectionDao {
 	@Value("${collection.count_collections_of_users}")
 	private String countCollectionsOfUsersSql;
 
+	@Value("${collection.count_updated_since}")
+	private String countUpdatedSinceSql;
+	
 	@Value("${collection.create}")
 	private String addCollectionSql;
+
+	@Value("${collection.mark_as_modified}")
+	private String markAsModifiedSql;
 
 	@Value("${collection.is_series_in_collection}")
 	private String isSeriesInUserCollectionSql;
@@ -87,11 +94,22 @@ public long countCollectionsOfUsers() {
 		);
 	}
 
+	@Override
+	public long countUpdatedSince(Date date) {
+		return jdbcTemplate.queryForObject(
+			countUpdatedSinceSql,
+			Collections.singletonMap("date", date),
+			Long.class
+		);
+	}
+	
 	@Override
 	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 +128,29 @@ public Integer add(AddCollectionDbDto collection) {
 
 		return Integer.valueOf(holder.getKey().intValue());
 	}
+
+	/**
+	 * @author John Shkarin
+	 * @author Slava Semushin
+	 */
+	@Override
+	public void markAsModified(Integer userId, Date updatedAt) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("user_id", userId);
+		params.put("updated_at", updatedAt);
+		params.put("updated_by", userId);
+
+		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/CollectionService.java

@@ -17,6 +17,7 @@
  */
 package ru.mystamps.web.service;
 
+import java.util.Date;
 import java.util.List;
 
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
@@ -28,6 +29,7 @@ public interface CollectionService {
 	void removeFromCollection(Integer userId, Integer seriesId);
 	boolean isSeriesInCollection(Integer userId, Integer seriesId);
 	long countCollectionsOfUsers();
+	long countUpdatedSince(Date date);
 	List<LinkEntityDto> findRecentlyCreated(int quantity);
 	CollectionInfoDto findBySlug(String slug);
 }

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);
 	}
@@ -117,6 +121,14 @@ public long countCollectionsOfUsers() {
 		return collectionDao.countCollectionsOfUsers();
 	}
 
+	@Override
+	@Transactional(readOnly = true)
+	public long countUpdatedSince(Date date) {
+		Validate.isTrue(date != null, "Date must be non null");
+		
+		return collectionDao.countUpdatedSince(date);
+	}
+	
 	@Override
 	@Transactional(readOnly = true)
 	public List<LinkEntityDto> findRecentlyCreated(int quantity) {

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

@@ -44,6 +44,7 @@ public class CronServiceImpl implements CronService {
 
 	private final CategoryService categoryService;
 	private final CountryService countryService;
+	private final CollectionService collectionService;
 	private final SeriesService seriesService;
 	private final SuspiciousActivityService suspiciousActivityService;
 	private final UserService userService;
@@ -71,6 +72,7 @@ public void sendDailyStatistics() {
 
 		report.setAddedSeriesCounter(seriesService.countAddedSince(yesterday));
 		report.setUpdatedSeriesCounter(seriesService.countUpdatedSince(yesterday));
+		report.setUpdatedCollectionsCounter(collectionService.countUpdatedSince(yesterday));
 		report.setRegistrationRequestsCounter(usersActivationService.countCreatedSince(yesterday));
 		report.setRegisteredUsersCounter(userService.countRegisteredSince(yesterday));
 

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

@@ -197,7 +197,7 @@ private String getTextOfDailyStatisticsMail(AdminDailyReport report) {
 		put(ctx, "untranslated_categories_cnt", report.getUntranslatedCategoriesCounter());
 		put(ctx, "added_series_cnt", report.getAddedSeriesCounter());
 		put(ctx, "updated_series_cnt", report.getUpdatedSeriesCounter());
-		put(ctx, "updated_collections_cnt", -1L); // TODO: #357
+		put(ctx, "updated_collections_cnt", report.getUpdatedCollectionsCounter());
 		put(ctx, "registration_requests_cnt", report.getRegistrationRequestsCounter());
 		put(ctx, "registered_users_cnt", report.getRegisteredUsersCounter());
 		put(ctx, "events_cnt", report.countEvents());

src/main/java/ru/mystamps/web/service/dto/AdminDailyReport.java

@@ -33,6 +33,7 @@ public class AdminDailyReport {
 	private long untranslatedCountriesCounter;
 	private long addedSeriesCounter;
 	private long updatedSeriesCounter;
+	private long updatedCollectionsCounter;
 	private long registrationRequestsCounter;
 	private long registeredUsersCounter;
 	private long notFoundCounter;
@@ -57,6 +58,7 @@ public long countTotalChanges() {
 		totalChanges = Math.addExact(totalChanges, untranslatedCountriesCounter);
 		totalChanges = Math.addExact(totalChanges, addedSeriesCounter);
 		totalChanges = Math.addExact(totalChanges, updatedSeriesCounter);
+		totalChanges = Math.addExact(totalChanges, updatedCollectionsCounter);
 		totalChanges = Math.addExact(totalChanges, registrationRequestsCounter);
 		totalChanges = Math.addExact(totalChanges, registeredUsersCounter);
 		totalChanges = Math.addExact(totalChanges, countEvents());

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="(SELECT id FROM users WHERE role = 'ADMIN' ORDER BY id LIMIT 1)" />
+		</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

@@ -19,17 +19,32 @@ LEFT JOIN series s \
        ON s.id = cs.series_id \
     WHERE s.id IS NOT NULL
 
+collection.count_updated_since = \
+SELECT COUNT(*) \
+  FROM collections \
+ WHERE updated_at >= :date
+
 collection.create = \
 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 = :user_id
+
 collection.is_series_in_collection = \
 SELECT COUNT(*) \
   FROM collections c \