refactor(/collection/{slug}): rework representation of the links to the series.

No functional changes.

Author: php-coder

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

@@ -22,7 +22,6 @@
 import java.sql.SQLException;
 
 import ru.mystamps.web.dao.dto.Currency;
-import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.support.jdbc.JdbcUtils;
 
 final class RowMappers {
@@ -40,42 +39,28 @@ private RowMappers() {
 		);
 	}
 
-	// The only one difference from forSeriesInfoDto() is that
-	// SeriesInCollectionDto has numberOfStamps member.
 	/* default */ static SeriesInCollectionDto forSeriesInCollectionDto(ResultSet rs, int unused)
 		throws SQLException {
 
 		Integer seriesId     = rs.getInt("id");
+		String category      = rs.getString("category");
+		String country       = rs.getString("country");
 		Integer releaseDay   = JdbcUtils.getInteger(rs, "release_day");
 		Integer releaseMonth = JdbcUtils.getInteger(rs, "release_month");
 		Integer releaseYear  = JdbcUtils.getInteger(rs, "release_year");
 		Integer quantity     = rs.getInt("quantity");
 		Boolean perforated   = rs.getBoolean("perforated");
 		Integer numberOfStamps = rs.getInt("number_of_stamps");
 
-		LinkEntityDto category = ru.mystamps.web.support.jdbc.RowMappers.createLinkEntityDto(
-			rs,
-			"category_id",
-			"category_slug",
-			"category_name"
-		);
-		
-		LinkEntityDto country = ru.mystamps.web.support.jdbc.RowMappers.createLinkEntityDto(
-			rs,
-			"country_id",
-			"country_slug",
-			"country_name"
-		);
-		
 		return new SeriesInCollectionDto(
 			seriesId,
 			category,
 			country,
 			releaseDay,
 			releaseMonth,
 			releaseYear,
-			quantity,
 			perforated,
+			quantity,
 			numberOfStamps
 		);
 	}

src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionDto.java

@@ -18,27 +18,20 @@
 package ru.mystamps.web.feature.collection;
 
 import lombok.Getter;
-
-import ru.mystamps.web.dao.dto.LinkEntityDto;
-import ru.mystamps.web.feature.series.SeriesInfoDto;
+import lombok.RequiredArgsConstructor;
 
 @Getter
-public class SeriesInCollectionDto extends SeriesInfoDto {
-	// SeriesInfoDto.quantity holds number of stamps in a series, while user may
+@RequiredArgsConstructor
+public class SeriesInCollectionDto {
+	private final Integer id;
+	private final String category;
+	private final String country;
+	private final Integer releaseDay;
+	private final Integer releaseMonth;
+	private final Integer releaseYear;
+	private final Boolean perforated;
+	private final Integer quantity;
+	// quantity holds number of stamps in a series, while user may
 	// have less stamps in his collection
 	private final Integer numberOfStamps;
-	
-	@SuppressWarnings("checkstyle:parameternumber")
-	public SeriesInCollectionDto(
-			Integer id,
-			LinkEntityDto category,
-			LinkEntityDto country,
-			Integer releaseDay, Integer releaseMonth, Integer releaseYear,
-			Integer quantity,
-			Boolean perforated,
-			Integer numberOfStamps) {
-		super(id, category, country, releaseDay, releaseMonth, releaseYear, quantity, perforated);
-		this.numberOfStamps = numberOfStamps;
-	}
-	
 }

src/main/resources/sql/collection_dao_queries.properties

@@ -12,12 +12,8 @@ ORDER BY c.id DESC \
 
 collection.find_series_by_collection_id = \
    SELECT s.id \
-        , cat.id AS category_id \
-        , cat.slug AS category_slug \
-        , CASE WHEN 'ru' = :lang THEN COALESCE(cat.name_ru, cat.name) ELSE cat.name END AS category_name \
-        , count.id AS country_id \
-        , count.slug AS country_slug \
-        , CASE WHEN 'ru' = :lang THEN COALESCE(count.name_ru, count.name) ELSE count.name END AS country_name \
+        , CASE WHEN 'ru' = :lang THEN COALESCE(cat.name_ru, cat.name) ELSE cat.name END AS category \
+        , CASE WHEN 'ru' = :lang THEN COALESCE(count.name_ru, count.name) ELSE count.name END AS country \
         , s.release_day \
         , s.release_month \
         , s.release_year \

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

@@ -92,15 +92,9 @@ <h3 class="text-center" th:text="#{t_collection_of(${ownerName})}">
 						<div class="col-sm-4">
 							<ul th:if="${not #lists.isEmpty(seriesOfCollection)}" th:remove="all-but-first">
 								<li th:each="series : ${seriesOfCollection}">
-									<span th:if="${series.category != null}" th:remove="tag">
-										<a href="../category/info.html" th:href="@{${INFO_CATEGORY_PAGE}(slug=${series.category.slug})}" th:text="${series.category.name}">Animals</a>&nbsp;&raquo;
-									</span>
-									
-									<span th:if="${series.country != null}" th:remove="tag">
-										<a href="../country/info.html" th:href="@{${INFO_COUNTRY_PAGE}(slug=${series.country.slug})}" th:text="${series.country.name}">Italy</a>&nbsp;&raquo;
-									</span>
-									
 									<a href="../series/info.html" th:href="@{${INFO_SERIES_PAGE}(id=${series.id})}">
+										<span th:remove="tag" th:text="|${series.category}, |">Animals, </span>
+										<span th:remove="tag" th:if="${series.country != null}" th:text="|${series.country}, |">Italy, </span>
 										<span th:remove="tag" th:if="${series.releaseYear != null}" th:text="|${series.releaseYear}, |">1999, </span>
 										<span th:remove="tag" th:text="|${series.quantity}&nbsp;${series.quantity != 1 ? '__#{t_stamps}__' : '__#{t_stamp}__'}|">7&nbsp;stamps</span>
 										<span th:remove="tag" th:if="${not series.perforated}" th:text="|(#{t_wo_perforation_short})|">(without perforation)</span>
@@ -113,23 +107,11 @@ <h3 class="text-center" th:text="#{t_collection_of(${ownerName})}">
 									<span th:if="${justAddedSeriesId != null and justAddedSeriesId == series.id}" class="label label-success">New</span>
 								</li>
 								<li>
-									<a href="../category/info.html">Animals</a>&nbsp;&raquo;
-									
-									<a href="../country/info.html">Italy</a>&nbsp;&raquo;
-									
-									<a href="../series/info.html">
-										22&nbsp;stamps
-									</a>
+									<a href="../category/info.html">Animals, Italy, 22&nbsp;stamps</a>
 									<span class="label label-default">20 out of 22</span>
 								</li>
 								<li>
-									<a href="../category/info.html">Animals</a>&nbsp;&raquo;
-									
-									<a href="../country/info.html">Italy</a>&nbsp;&raquo;
-									
-									<a href="../series/info.html">
-										1983, 5&nbsp;stamps
-									</a>
+									<a href="../category/info.html">Animals, Italy, 1983, 5&nbsp;stamps</a>
 								</li>
 							</ul>
 						</div>