Show statistics about amount of countries/series in database.

Author: php-coder

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

@@ -58,4 +58,12 @@ public SeriesController getSeriesController() {
 		);
 	}
 
+	@Bean
+	public SiteController getSiteController() {
+		return new SiteController(
+			servicesConfig.getCountryService(),
+			servicesConfig.getSeriesService()
+		);
+	}
+	
 }

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

@@ -62,7 +62,6 @@ public void configureDefaultServletHandling(DefaultServletHandlerConfigurer conf
 	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {
 		registry.addViewController(Url.AUTHENTICATION_PAGE);
-		registry.addViewController(Url.INDEX_PAGE).setViewName("site/index");
 		registry.addViewController(Url.UNAUTHORIZED_PAGE);
 	}
 

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2009-2014 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 org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import ru.mystamps.web.Url;
+import ru.mystamps.web.service.CountryService;
+import ru.mystamps.web.service.SeriesService;
+
+@Controller
+public class SiteController {
+	
+	private final CountryService countryService;
+	private final SeriesService seriesService;
+	
+	public SiteController(CountryService countryService, SeriesService seriesService) {
+		this.countryService = countryService;
+		this.seriesService = seriesService;
+	}
+	
+	@RequestMapping(value = Url.INDEX_PAGE, method = RequestMethod.GET)
+	public String showIndexPage(Model model) {
+		model.addAttribute("countryCounter", countryService.countAll());
+		model.addAttribute("seriesCounter", seriesService.countAll());
+		return "site/index";
+	}
+	
+}

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

@@ -24,5 +24,6 @@
 public interface CountryService {
 	Country add(AddCountryDto dto, User user);
 	Iterable<Country> findAll();
+	long countAll();
 	int countByName(String name);
 }

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

@@ -74,6 +74,12 @@ public Iterable<Country> findAll() {
 		return countryDao.findAll();
 	}
 
+	@Override
+	@Transactional(readOnly = true)
+	public long countAll() {
+		return countryDao.count();
+	}
+	
 	@Override
 	@Transactional(readOnly = true)
 	public int countByName(String name) {

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

@@ -23,6 +23,7 @@
 
 public interface SeriesService {
 	Series add(AddSeriesDto dto, User user, boolean userCanAddComments);
+	long countAll();
 	int countByMichelNumber(String michelNumberCode);
 	int countByScottNumber(String scottNumberCode);
 	int countByYvertNumber(String yvertNumberCode);

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

@@ -126,6 +126,12 @@ public Series add(AddSeriesDto dto, User user, boolean userCanAddComments) {
 		return entity;
 	}
 
+	@Override
+	@Transactional(readOnly = true)
+	public long countAll() {
+		return seriesDao.count();
+	}
+	
 	@Override
 	@Transactional(readOnly = true)
 	public int countByMichelNumber(String michelNumberCode) {

src/main/resources/ru/mystamps/i18n/Messages.properties

@@ -22,6 +22,9 @@ t_add_country = add country
 # site/index.jsp
 t_index_title = create your own virtual collection!
 t_you_may = You may
+t_in_db = In our database
+t_countries_amount = Amount of countries
+t_series_amount = Amount of series
 
 # account/register.jsp
 t_registration_on_site = Register on site

src/main/resources/ru/mystamps/i18n/Messages_ru.properties

@@ -22,6 +22,9 @@ t_add_country = добавить страну
 # site/index.jsp
 t_index_title = создай свою виртуальную коллекцию!
 t_you_may = Вы можете
+t_in_db = В нашей базе
+t_countries_amount = Стран
+t_series_amount = Серий
 
 # account/register.jsp
 t_registration_on_site = Регистрация на сайте

src/main/webapp/WEB-INF/tiles/body/site/index.jsp

@@ -4,16 +4,30 @@
 <spring:url var="addSeriesUrl" value="<%= Url.ADD_SERIES_PAGE %>" />
 <spring:url var="addCountryUrl" value="<%= Url.ADD_COUNTRY_PAGE %>" />
 
-<sec:authorize access="hasAnyAuthority('CREATE_COUNTRY', 'CREATE_SERIES')">
-	<spring:message code="t_you_may" />:
-	<nav>
-		<ul>
-			<sec:authorize access="hasAuthority('CREATE_SERIES')">
-				<li><a href="${addSeriesUrl}"><spring:message code="t_add_series" /></a></li>
-			</sec:authorize>
-			<sec:authorize access="hasAuthority('CREATE_COUNTRY')">
-				<li><a href="${addCountryUrl}"><spring:message code="t_add_country" /></a></li>
-			</sec:authorize>
-		</ul>
-	</nav>
-</sec:authorize>
+<div class="span10">
+	<sec:authorize access="hasAnyAuthority('CREATE_COUNTRY', 'CREATE_SERIES')">
+		<spring:message code="t_you_may" />:
+		<nav>
+			<ul>
+				<sec:authorize access="hasAuthority('CREATE_SERIES')">
+					<li><a href="${addSeriesUrl}"><spring:message code="t_add_series" /></a></li>
+				</sec:authorize>
+				<sec:authorize access="hasAuthority('CREATE_COUNTRY')">
+					<li><a href="${addCountryUrl}"><spring:message code="t_add_country" /></a></li>
+				</sec:authorize>
+			</ul>
+		</nav>
+	</sec:authorize>
+</div>
+
+<div class="span2">
+	<p>
+		<strong><spring:message code="t_in_db" />:</strong>
+	</p>
+	<p>
+		<spring:message code="t_countries_amount" />: ${countryCounter}
+	</p>
+	<p>
+		<spring:message code="t_series_amount" />: ${seriesCounter}
+	</p>
+</div>

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

@@ -151,6 +151,21 @@ class CountryServiceTest extends Specification {
 			resultCountries == expectedCountries
 	}
 
+	//
+	// Tests for countAll()
+	//
+	
+	def "countAll() should call dao and returns result"() {
+		given:
+			long expectedResult = 20
+		when:
+			long result = service.countAll()
+		then:
+			1 * countryDao.count() >> expectedResult
+		and:
+			result == expectedResult
+	}
+	
 	//
 	// Tests for countByName()
 	//

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

@@ -553,6 +553,21 @@ class SeriesServiceTest extends Specification {
 			})
 	}
 
+	//
+	// Tests for countAll()
+	//
+	
+	def "countAll() should call dao and returns result"() {
+		given:
+			long expectedResult = 20
+		when:
+			long result = service.countAll()
+		then:
+			1 * seriesDao.count() >> expectedResult
+		and:
+			result == expectedResult
+	}
+	
 	//
 	// Tests for countByMichelNumber()
 	//