fix_errors

Author: bodom91

src/main/java/ru/mystamps/web/Url.java

@@ -37,7 +37,8 @@ public final class Url {
 	public static final String INDEX_PAGE            = "/";
 	public static final String ROBOTS_TXT            = "/robots.txt";
 	public static final String SITEMAP_XML           = "/sitemap.xml";
-	
+
+	public static final String DAILY_STATISTICS      = "/report/daily";
 	public static final String SITE_EVENTS_PAGE      = "/site/events";
 
 	public static final String REGISTRATION_PAGE     = "/account/register";
@@ -136,6 +137,7 @@ public static Map<String, String> asMap(boolean serveContentFromSingleHost) {
 		map.put("INFO_COLLECTION_PAGE", INFO_COLLECTION_PAGE);
 		map.put("SITE_EVENTS_PAGE", SITE_EVENTS_PAGE);
 		map.put("BOOTSTRAP_LANGUAGE", BOOTSTRAP_LANGUAGE);
+		map.put("DAILY_STATISTICS", DAILY_STATISTICS);
 
 		if (serveContentFromSingleHost) {
 			map.put("BOOTSTRAP_CSS", BOOTSTRAP_CSS);

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

@@ -84,6 +84,14 @@ public RobotsTxtController getRobotsTxtController() {
 		return new RobotsTxtController();
 	}
 
+	@Bean
+	public ReportController getReportController() {
+		return new ReportController(
+			servicesConfig.getMailService(),
+			servicesConfig.getCronService()
+			);
+	}
+	
 	@Bean
 	public SeriesController getSeriesController() {
 		return new SeriesController(

src/main/java/ru/mystamps/web/controller/ReportController.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2009-2016 Slava Semushin <slava.semushin@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package ru.mystamps.web.controller;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import lombok.RequiredArgsConstructor;
+
+import ru.mystamps.web.Url;
+import ru.mystamps.web.service.CronService;
+import ru.mystamps.web.service.MailService;
+
+/**
+ * @author Maxim Shestakov
+ */
+@Controller
+@RequiredArgsConstructor
+public class ReportController {
+	private static final Logger LOG = LoggerFactory.getLogger(RobotsTxtController.class);
+	
+	private final MailService mailService;
+	private final CronService cronService;
+	
+	@RequestMapping(Url.DAILY_STATISTICS)
+	public void adminDailyReport(HttpServletResponse response) {
+		response.setContentType("text/plain");
+		response.setCharacterEncoding("UTF-8");
+		
+		try {
+			PrintWriter printWriter = response.getWriter();
+			String stats = mailService.getTextOfDailyStatisticsMail(
+				cronService.getDailyStatistics()
+			);
+			printWriter.println(stats);
+		} catch (IOException e) {
+			LOG.error("Can't get Daily Reports", e.getMessage());
+		}
+	}
+	
+}

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

@@ -17,9 +17,12 @@
  */
 package ru.mystamps.web.service;
 
+import ru.mystamps.web.service.dto.AdminDailyReport;
+
 public interface CronService {
 	int PURGE_AFTER_DAYS = 3;
 
 	void sendDailyStatistics();
+	AdminDailyReport getDailyStatistics();
 	void purgeUsersActivations();
 }

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

@@ -50,14 +50,21 @@ public class CronServiceImpl implements CronService {
 	private final UsersActivationService usersActivationService;
 	private final MailService mailService;
 
+	private AdminDailyReport report;
+
 	@Override
 	@Scheduled(cron = EVERY_DAY_AT_00_00)
 	@Transactional(readOnly = true)
 	public void sendDailyStatistics() {
+		mailService.sendDailyStatisticsToAdmin(report);
+	}
+	
+	@Override
+	public AdminDailyReport getDailyStatistics() {
 		Date today = DateUtils.truncate(new Date(), Calendar.DAY_OF_MONTH);
 		Date yesterday = DateUtils.addDays(today, -1);
-		
-		AdminDailyReport report = new AdminDailyReport();
+
+		report = new AdminDailyReport();
 		report.setStartDate(yesterday);
 		report.setEndDate(today);
 		report.setAddedCategoriesCounter(categoryService.countAddedSince(yesterday));
@@ -66,32 +73,32 @@ public void sendDailyStatistics() {
 		report.setUpdatedSeriesCounter(seriesService.countUpdatedSince(yesterday));
 		report.setRegistrationRequestsCounter(usersActivationService.countCreatedSince(yesterday));
 		report.setRegisteredUsersCounter(userService.countRegisteredSince(yesterday));
-		
+
 		long notFoundCounter = suspiciousActivityService.countByTypeSince(
 			SiteServiceImpl.PAGE_NOT_FOUND,
 			yesterday
 		);
 		report.setNotFoundCounter(notFoundCounter);
-		
+
 		long failedAuthCounter = suspiciousActivityService.countByTypeSince(
 			SiteServiceImpl.AUTHENTICATION_FAILED,
 			yesterday
 		);
 		report.setFailedAuthCounter(failedAuthCounter);
-		
+
 		long missingCsrfCounter = suspiciousActivityService.countByTypeSince(
 			SiteServiceImpl.MISSING_CSRF_TOKEN,
 			yesterday
 		);
 		report.setMissingCsrfCounter(missingCsrfCounter);
-		
+
 		long invalidCsrfCounter = suspiciousActivityService.countByTypeSince(
 			SiteServiceImpl.INVALID_CSRF_TOKEN,
 			yesterday
 		);
 		report.setInvalidCsrfCounter(invalidCsrfCounter);
 
-		mailService.sendDailyStatisticsToAdmin(report);
+		return report;
 	}
 
 	@Override

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

@@ -23,4 +23,5 @@
 public interface MailService {
 	void sendActivationKeyToUser(SendUsersActivationDto activation);
 	void sendDailyStatisticsToAdmin(AdminDailyReport report);
+	String getTextOfDailyStatisticsMail(AdminDailyReport report);
 }

src/main/java/ru/mystamps/web/support/spring/security/Authority.java

@@ -31,6 +31,7 @@ public final class Authority {
 	public static final GrantedAuthority UPDATE_COLLECTION      = new SimpleGrantedAuthority(StringAuthority.UPDATE_COLLECTION);
 	public static final GrantedAuthority VIEW_SITE_EVENTS       = new SimpleGrantedAuthority(StringAuthority.VIEW_SITE_EVENTS);
 	public static final GrantedAuthority VIEW_SERIES_SALES      = new SimpleGrantedAuthority(StringAuthority.VIEW_SERIES_SALES);
+	public static final GrantedAuthority VIEW_DAILY_STATS       = new SimpleGrantedAuthority(StringAuthority.VIEW_DAILY_STATS);
 
 	private Authority() {
 	}

src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetailsService.java

@@ -79,6 +79,7 @@ private static Collection<? extends GrantedAuthority> getAuthorities(UserDetails
 			authorities.add(Authority.VIEW_SITE_EVENTS);
 			authorities.add(Authority.VIEW_SERIES_SALES);
 			authorities.add(Authority.MANAGE_TOGGLZ);
+			authorities.add(Authority.VIEW_DAILY_STATS);
 		}
 
 		return authorities;

src/main/java/ru/mystamps/web/support/spring/security/HasAuthority.java

@@ -22,6 +22,7 @@ public final class HasAuthority {
 	public static final String CREATE_SERIES = "hasAuthority('" + StringAuthority.CREATE_SERIES + "')";
 	public static final String CREATE_CATEGORY = "hasAuthority('" + StringAuthority.CREATE_CATEGORY + "')";
 	public static final String CREATE_COUNTRY = "hasAuthority('" + StringAuthority.CREATE_COUNTRY + "')";
+	public static final String VIEW_DAILY_STATS = "hasAuthority('" + StringAuthority.VIEW_DAILY_STATS + "')";
 	public static final String UPDATE_COLLECTION = "hasAuthority('" + StringAuthority.UPDATE_COLLECTION + "')";
 	public static final String VIEW_SITE_EVENTS = "hasAuthority('" + StringAuthority.VIEW_SITE_EVENTS + "')";
 	public static final String VIEW_SERIES_SALES = "hasAuthority('" + StringAuthority.VIEW_SERIES_SALES + "')";

src/main/java/ru/mystamps/web/support/spring/security/SecurityConfig.java

@@ -66,6 +66,8 @@ public void configure(WebSecurity web) throws Exception {
 	protected void configure(HttpSecurity http) throws Exception {
 		http
 			.authorizeRequests()
+				.antMatchers(Url.DAILY_STATISTICS)
+					.hasAuthority(StringAuthority.VIEW_DAILY_STATS)
 				.antMatchers(Url.ADD_CATEGORY_PAGE)
 					.hasAuthority(StringAuthority.CREATE_CATEGORY)
 				.antMatchers(Url.ADD_COUNTRY_PAGE)