Show amount of stamps in database.

Author: php-coder

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

@@ -41,6 +41,7 @@ public SiteController(CountryService countryService, SeriesService seriesService
 	public String showIndexPage(Model model) {
 		model.addAttribute("countryCounter", countryService.countAll());
 		model.addAttribute("seriesCounter", seriesService.countAll());
+		model.addAttribute("stampsCounter", seriesService.countAllStamps());
 		return "site/index";
 	}
 

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

@@ -37,4 +37,6 @@ public interface SeriesDao extends CrudRepository<Series, Integer> {
 	@Query("SELECT COUNT(*) FROM Series s INNER JOIN s.gibbons m WHERE m.code = :gibbonsCode")
 	int countByGibbonsNumberCode(@Param("gibbonsCode") String gibbonsNumberCode);
 
+	@Query("SELECT SUM(quantity) FROM Series")
+	long countAllStamps();
 }

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

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

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

@@ -132,6 +132,12 @@ public long countAll() {
 		return seriesDao.count();
 	}
 
+	@Override
+	@Transactional(readOnly = true)
+	public long countAllStamps() {
+		return seriesDao.countAllStamps();
+	}
+	
 	@Override
 	@Transactional(readOnly = true)
 	public int countByMichelNumber(String michelNumberCode) {

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

@@ -25,6 +25,7 @@ t_you_may = You may
 t_in_db = In our database
 t_countries_amount = Amount of countries
 t_series_amount = Amount of series
+t_stamps_amount = Amount of stamps
 
 # account/register.jsp
 t_registration_on_site = Register on site

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

@@ -25,6 +25,7 @@ t_you_may = Вы можете
 t_in_db = В нашей базе
 t_countries_amount = Стран
 t_series_amount = Серий
+t_stamps_amount = Марок
 
 # account/register.jsp
 t_registration_on_site = Регистрация на сайте

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

@@ -30,4 +30,7 @@
 	<p>
 		<spring:message code="t_series_amount" />: ${seriesCounter}
 	</p>
+	<p>
+		<spring:message code="t_stamps_amount" />: ${stampsCounter}
+	</p>
 </div>

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

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