Daily report: include stat with updated collections.

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

@@ -27,6 +27,7 @@
 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);

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

@@ -55,6 +55,9 @@ 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;
 
@@ -91,6 +94,15 @@ 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<>();

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

@@ -121,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/sql/collection_dao_queries.properties

@@ -19,6 +19,11 @@ 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 \

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

@@ -249,6 +249,33 @@ class CollectionServiceImplTest extends Specification {
 			serviceResult == expectedResult
 	}
 
+	//
+	// Tests for countUpdatedSince()
+	//
+	
+	def "countUpdatedSince() should throw exception when date is null"() {
+		when:
+			service.countUpdatedSince(null)
+		then:
+			thrown IllegalArgumentException
+	}
+	
+	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
+	def "countUpdatedSince() should invoke dao, pass argument and return result from dao"() {
+		given:
+			Date expectedDate   = new Date()
+			long expectedResult = 47
+		when:
+			long result = service.countUpdatedSince(expectedDate)
+		then:
+			1 * collectionDao.countUpdatedSince({ Date date ->
+				assert date == expectedDate
+				return true
+			}) >> expectedResult
+		and:
+			result == expectedResult
+	}
+	
 	//
 	// Tests for findRecentlyCreated()
 	//

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

@@ -27,6 +27,7 @@ class CronServiceImplTest extends Specification {
 
 	private final CategoryService categoryService = Mock()
 	private final CountryService countryService = Mock()
+	private final CollectionService collectionService = Mock()
 	private final SeriesService seriesService = Mock()
 	private final SuspiciousActivityService suspiciousActivityService = Mock()
 	private final MailService mailService = Mock()
@@ -36,6 +37,7 @@ class CronServiceImplTest extends Specification {
 	private final CronService service = new CronServiceImpl(
 		categoryService,
 		countryService,
+		collectionService,
 		seriesService,
 		suspiciousActivityService,
 		userService,
@@ -101,6 +103,10 @@ class CronServiceImplTest extends Specification {
 				assertMidnightOfYesterday(date)
 				return true
 			})
+			1 * collectionService.countUpdatedSince({ Date date ->
+				assertMidnightOfYesterday(date)
+				return true
+			})
 			1 * usersActivationService.countCreatedSince({ Date date ->
 				assertMidnightOfYesterday(date)
 				return true
@@ -136,6 +142,7 @@ class CronServiceImplTest extends Specification {
 			countryService.countUntranslatedNamesSince(_ as Date) >> 12
 			seriesService.countAddedSince(_ as Date) >> 3
 			seriesService.countUpdatedSince(_ as Date) >> 4
+			collectionService.countUpdatedSince(_ as Date) >> 13
 			usersActivationService.countCreatedSince(_ as Date) >> 5
 			userService.countRegisteredSince(_ as Date) >> 6
 		and:
@@ -157,6 +164,7 @@ class CronServiceImplTest extends Specification {
 				assert report.untranslatedCountriesCounter == 12
 				assert report.addedSeriesCounter == 3
 				assert report.updatedSeriesCounter == 4
+				assert report.updatedCollectionsCounter == 13
 				assert report.registrationRequestsCounter == 5
 				assert report.registeredUsersCounter == 6
 				assert report.notFoundCounter == 7