refactor(CountryService.getStatisticsOf): change return value to Map.

Prerequisite for #1143

Author: php-coder

src/main/java/ru/mystamps/web/common/RowMappers.java

@@ -29,13 +29,6 @@ public static LinkEntityDto forLinkEntityDto(ResultSet rs, int unused) throws SQ
 		return createLinkEntityDto(rs, "id", "slug", "name");
 	}
 
-	public static Object[] forNameAndCounter(ResultSet rs, int unused) throws SQLException {
-		return new Object[]{
-			rs.getString("name"),
-			JdbcUtils.getInteger(rs, "counter")
-		};
-	}
-	
 	public static EntityWithParentDto forEntityWithParentDto(ResultSet rs, int unused)
 		throws SQLException {
 

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

@@ -78,7 +78,8 @@ public String showInfoBySlug(
 
 			Map<String, Integer> categoriesStat =
 				categoryService.getStatisticsOf(collectionId, lang);
-			List<Object[]> countriesStat  = getCountriesStatistics(collectionId, lang);
+			
+			Map<String, Integer> countriesStat = getCountriesStatistics(collectionId, lang);
 
 			model.addAttribute("categoryCounter", categoryCounter);
 			model.addAttribute("countryCounter", countryCounter);
@@ -123,16 +124,15 @@ public String showPrices(
 		return "collection/estimation";
 	}
 
-	@SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
-	private List<Object[]> getCountriesStatistics(Integer collectionId, String lang) {
-		List<Object[]> countriesStat = countryService.getStatisticsOf(collectionId, lang);
+	private Map<String, Integer> getCountriesStatistics(Integer collectionId, String lang) {
+		Map<String, Integer> countriesStat = countryService.getStatisticsOf(collectionId, lang);
 
-		for (Object[] countryStat : countriesStat) {
-			// manually localize "Unknown" country's name
-			Object name = countryStat[0];
-			if ("Unknown".equals(name)) {
-				countryStat[0] = messageSource.getMessage("t_unspecified", null, new Locale(lang));
-			}
+		// manually localize "Unknown" country's name
+		Integer unknownCounter = countriesStat.get("Unknown");
+		if (unknownCounter != null) {
+			String localizedValue = messageSource.getMessage("t_unspecified", null, new Locale(lang));
+			countriesStat.put(localizedValue, unknownCounter);
+			countriesStat.remove("Unknown");
 		}
 
 		return countriesStat;

src/main/java/ru/mystamps/web/feature/country/CountryDao.java

@@ -21,6 +21,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @SuppressWarnings("PMD.TooManyMethods")
 public interface CountryDao {
@@ -32,7 +33,7 @@ public interface CountryDao {
 	long countCountriesOfCollection(Integer collectionId);
 	long countAddedSince(Date date);
 	long countUntranslatedNamesSince(Date date);
-	List<Object[]> getStatisticsOf(Integer collectionId, String lang);
+	Map<String, Integer> getStatisticsOf(Integer collectionId, String lang);
 	List<Integer> findIdsByNames(List<String> names);
 	List<Integer> findIdsByNamePattern(String pattern);
 	List<LinkEntityDto> findAllAsLinkEntities(String lang);

src/main/java/ru/mystamps/web/feature/country/CountryService.java

@@ -21,6 +21,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @SuppressWarnings("PMD.TooManyMethods")
 public interface CountryService {
@@ -36,6 +37,6 @@ public interface CountryService {
 	long countByNameRu(String name);
 	long countAddedSince(Date date);
 	long countUntranslatedNamesSince(Date date);
-	List<Object[]> getStatisticsOf(Integer collectionId, String lang);
+	Map<String, Integer> getStatisticsOf(Integer collectionId, String lang);
 	String suggestCountryForUser(Integer userId);
 }

src/main/java/ru/mystamps/web/feature/country/CountryServiceImpl.java

@@ -32,6 +32,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
@@ -186,7 +187,7 @@ public long countUntranslatedNamesSince(Date date) {
 
 	@Override
 	@Transactional(readOnly = true)
-	public List<Object[]> getStatisticsOf(Integer collectionId, String lang) {
+	public Map<String, Integer> getStatisticsOf(Integer collectionId, String lang) {
 		Validate.isTrue(collectionId != null, "Collection id must be non null");
 
 		return countryDao.getStatisticsOf(collectionId, lang);

src/main/java/ru/mystamps/web/feature/country/JdbcCountryDao.java

@@ -21,13 +21,15 @@
 import org.apache.commons.lang3.Validate;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.ResultSetExtractor;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import ru.mystamps.web.common.JdbcUtils;
 import ru.mystamps.web.common.LinkEntityDto;
 import ru.mystamps.web.common.RowMappers;
+import ru.mystamps.web.support.spring.jdbc.MapStringIntegerResultSetExtractor;
 
 import java.util.Collections;
 import java.util.Date;
@@ -39,6 +41,9 @@
 @SuppressWarnings({ "PMD.AvoidDuplicateLiterals", "PMD.TooManyMethods", "PMD.TooManyFields" })
 public class JdbcCountryDao implements CountryDao {
 
+	private static final ResultSetExtractor<Map<String, Integer>> NAME_COUNTER_EXTRACTOR =
+		new MapStringIntegerResultSetExtractor("name", "counter");
+	
 	private final NamedParameterJdbcTemplate jdbcTemplate;
 
 	@Value("${country.create}")
@@ -181,15 +186,15 @@ public long countUntranslatedNamesSince(Date date) {
 	}
 
 	@Override
-	public List<Object[]> getStatisticsOf(Integer collectionId, String lang) {
+	public Map<String, Integer> getStatisticsOf(Integer collectionId, String lang) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("collection_id", collectionId);
 		params.put("lang", lang);
 
 		return jdbcTemplate.query(
 			countStampsByCountriesSql,
 			params,
-			RowMappers::forNameAndCounter
+			NAME_COUNTER_EXTRACTOR
 		);
 	}
 

src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java

@@ -32,7 +32,7 @@ public final class ResourceUrl {
 	public static final String STATIC_RESOURCES_URL = "https://stamps.filezz.ru";
 
 	// MUST be updated when any of our resources were modified
-	public static final String RESOURCES_VERSION = "v0.4.1.1";
+	public static final String RESOURCES_VERSION = "v0.4.1.2";
 
 	// CheckStyle: ignore LineLength for next 10 lines
 	private static final String CATALOG_UTILS_JS    = "/public/js/" + RESOURCES_VERSION + "/CatalogUtils.min.js";

src/main/javascript/collection/info.js

@@ -25,14 +25,11 @@ function createDataTable(stat) {
 	table.addColumn('string', 'Category/Country');
 	table.addColumn('number', 'Quantity of stamps');
 
-	if (Array.isArray(stat)) {
-		table.addRows(stat);
-	} else {
-		// {a: 5} => [a, 5]
-		Object.keys(stat).forEach(function transformToList(key) {
-			var value = stat[key];
-			table.addRow([key, value]);
-		});
-	}
+	// {a: 5} => [a, 5]
+	Object.keys(stat).forEach(function transformToList(key) {
+		var value = stat[key];
+		table.addRow([key, value]);
+	});
+	
 	return table;
 }

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

@@ -187,17 +187,18 @@ <h4 class="panel-title" th:text="#{t_stamps_by_categories}">Stamps by categories
 							'Animals': 94,
 							'Prehistoric animals': 37,
 							'Sport': 1
-						}, [
-						['Russia', 5],
-						['USA', 2],
-						['Australia', 11],
-						['Canada', 3],
-						['Sahrawi Arab Democratic Republic', 2],
-						['China', 1],
-						['Congo', 20],
-						['Brazil', 4],
-						['Korea', 2]
-					]);
+						}, {
+							'Russia': 5,
+							'USA': 2,
+							'Australia': 11,
+							'Canada': 3,
+							'Sahrawi Arab Democratic Republic': 2,
+							'China': 1,
+							'Congo': 20,
+							'Brazil': 4,
+							'Korea': 2
+						}
+					);
 					/* -]*/
 				});
 			</script>

src/test/groovy/ru/mystamps/web/feature/country/CountryServiceImplTest.groovy

@@ -28,6 +28,7 @@ import spock.lang.Unroll
 
 import static io.qala.datagen.RandomShortApi.nullOr
 import static io.qala.datagen.RandomShortApi.nullOrBlank
+import static io.qala.datagen.RandomShortApi.positiveInteger
 import static io.qala.datagen.RandomValue.between
 import static io.qala.datagen.StringModifier.Impls.oneOf
 
@@ -462,15 +463,19 @@ class CountryServiceImplTest extends Specification {
 			ex.message == 'Collection id must be non null'
 	}
 
-	def 'getStatisticsOf() should pass arguments to dao'() {
+	def 'getStatisticsOf() should invoke dao, pass arguments and return result from dao'() {
 		given:
 			Integer expectedCollectionId = Random.id()
 		and:
 			String expectedLang = Random.lang()
+		and:
+			Map<String, Integer> expectedResult = [ (Random.countryName()):positiveInteger() ]
 		when:
-			service.getStatisticsOf(expectedCollectionId, expectedLang)
+			Map<String, Integer> result = service.getStatisticsOf(expectedCollectionId, expectedLang)
 		then:
-			1 * countryDao.getStatisticsOf(expectedCollectionId, expectedLang) >> null
+			1 * countryDao.getStatisticsOf(expectedCollectionId, expectedLang) >> expectedResult
+		and:
+			result == expectedResult
 	}
 
 	//