improve: on the country info page show a hint when a series has multiple images.

Part of #1420

Author: php-coder

src/main/java/ru/mystamps/web/feature/series/RowMappers.java

@@ -80,19 +80,21 @@ private RowMappers() {
 	/* default */ static SeriesInGalleryDto forSeriesInGalleryDto(ResultSet rs, int unused)
 		throws SQLException {
 
-		Integer seriesId    = rs.getInt("id");
-		Integer releaseYear = JdbcUtils.getInteger(rs, "release_year");
-		Integer quantity    = rs.getInt("quantity");
-		Boolean perforated  = rs.getBoolean("perforated");
-		Integer previewId   = JdbcUtils.getInteger(rs, "preview_id");
-		String category     = rs.getString("category");
+		Integer seriesId       = rs.getInt("id");
+		Integer releaseYear    = JdbcUtils.getInteger(rs, "release_year");
+		Integer quantity       = rs.getInt("quantity");
+		Boolean perforated     = rs.getBoolean("perforated");
+		Integer previewId      = JdbcUtils.getInteger(rs, "preview_id");
+		Integer numberOfImages = rs.getInt("number_of_images");
+		String category        = rs.getString("category");
 
 		return new SeriesInGalleryDto(
 			seriesId,
 			releaseYear,
 			quantity,
 			perforated,
 			previewId,
+			numberOfImages,
 			category
 		);
 	}

src/main/java/ru/mystamps/web/feature/series/SeriesInGalleryDto.java

@@ -28,5 +28,6 @@ public class SeriesInGalleryDto {
 	private final Integer quantity;
 	private final Boolean perforated;
 	private final Integer previewId;
+	private final Integer numberOfImages;
 	private final String category;
 }

src/main/resources/sql/series_dao_queries.properties

@@ -169,6 +169,12 @@ series.find_by_country_slug = \
         , s.release_year \
         , s.quantity \
         , s.perforated \
+        , ( \
+           SELECT COUNT(*) \
+             FROM series_images si \
+            WHERE si.series_id = s.id \
+              AND si.hidden = FALSE \
+          ) AS number_of_images \
         , ( \
              SELECT si.image_id \
                FROM series_images si \

src/main/webapp/WEB-INF/views/country/info.html

@@ -100,6 +100,9 @@ <h3 id="page-header" th:text="${#strings.capitalize(header)}">
 									th:alt="${label}"
 									th:title="${label}"
 									th:src="@{${GET_IMAGE_PREVIEW_PAGE}(id=${series.previewId})}" />
+								<span class="label label-default image-counter"
+									th:if="${series.numberOfImages &gt; 1}"
+									th:text="#{t_images_counter(${series.numberOfImages})}">5 images</span>
 							</a>
 							<figcaption>
 								<a href="../series/info.html" th:href="@{${INFO_SERIES_PAGE}(id=${series.id})}" th:text="${desc}">

src/test/java/ru/mystamps/web/service/TestObjects.java

@@ -156,12 +156,15 @@ public static SeriesInfoDto createSeriesInfoDto() {
 	}
 
 	public static SeriesInGalleryDto createSeriesInGalleryDto() {
+		Integer numberOfImages = 1;
+		
 		return new SeriesInGalleryDto(
 			Random.id(),
 			nullOr(Random.issueYear()),
 			Random.quantity(),
 			Random.perforated(),
 			Random.id(),
+			numberOfImages,
 			Random.categoryName()
 		);
 	}