fixes

Author: Shkarin

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

@@ -35,4 +35,6 @@ public interface CountryDao {
 	List<Object[]> getStatisticsOf(Integer collectionId, String lang);
 	List<LinkEntityDto> findAllAsLinkEntities(String lang);
 	LinkEntityDto findOneAsLinkEntity(String slug, String lang);
+
+	String suggestCountryForUser(Integer userId);
 }

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

@@ -30,7 +30,6 @@
 @SuppressWarnings("PMD.TooManyMethods")
 public interface SeriesDao {
 	Integer add(AddSeriesDbDto series);
-	String guessCountryBy(Integer createdBy);
 
 	void markAsModified(Integer seriesId, Date updateAt, Integer updatedBy);
 	List<SitemapInfoDto> findAllForSitemap();

src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDao.java

@@ -76,6 +76,12 @@ public class JdbcCountryDao implements CountryDao {
 
 	@Value("${country.find_country_link_info_by_slug}")
 	private String findCountryLinkEntityBySlugSql;
+
+	@Value("${series.find_last_country_by_id}")
+	private String findLastCountryByIdSql;
+
+	@Value("${series.find_popular_country}")
+	private String findPopularCountrySql;
 
 	@Override
 	public Integer add(AddCountryDbDto country) {
@@ -206,5 +212,20 @@ public LinkEntityDto findOneAsLinkEntity(String slug, String lang) {
 			return null;
 		}
 	}
-	
+
+	@Override
+	public String suggestCountryForUser(Integer userId) {
+		String result = jdbcTemplate.queryForObject(findLastCountryByIdSql,
+			Collections.singletonMap("created_by", userId),
+			String.class);
+		if (result != null) {
+			return result;
+		}
+
+		return jdbcTemplate.queryForObject(
+			findPopularCountrySql,
+			Collections.<String, Object>emptyMap(),
+			String.class
+		);
+	}
 }

src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesDao.java

@@ -101,12 +101,6 @@ public class JdbcSeriesDao implements SeriesDao {
 	@Value("${series.count_series_added_since}")
 	private String countSeriesAddedSinceSql;
 
-	@Value("${series.find_last_country_by_id}")
-	private String findLastCountryByIdSql;
-
-	@Value("${series.find_popular_country}")
-	private String findPopularCountrySql;
-	
 	@Value("${series.count_series_updated_since}")
 	private String countSeriesUpdatedSinceSql;
 
@@ -324,22 +318,6 @@ public long countAddedSince(Date date) {
 			Long.class
 		);
 	}
-
-	@Override
-	public String guessCountryBy(Integer createdBy) {
-		String result = jdbcTemplate.queryForObject(findLastCountryByIdSql, 
-			Collections.singletonMap("created_by", createdBy),
-			String.class);
-		if (result != null) {
-			return result;
-		}
-		
-		return jdbcTemplate.queryForObject(
-			findPopularCountrySql,
-			Collections.<String, Object>emptyMap(),
-			String.class
-		);
-	}
 
 	@Override
 	public long countUpdatedSince(Date date) {

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

@@ -25,6 +25,7 @@
 
 public interface CountryService {
 	String add(AddCountryDto dto, Integer userId);
+	String suggestCountryForUser(Integer userId);
 	List<LinkEntityDto> findAllAsLinkEntities(String lang);
 	LinkEntityDto findOneAsLinkEntity(String slug, String lang);
 	long countAll();

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

@@ -162,5 +162,15 @@ public List<Object[]> getStatisticsOf(Integer collectionId, String lang) {
 
 		return countryDao.getStatisticsOf(collectionId, lang);
 	}
-	
+
+	/**
+	 * @author Shkarin John
+	 */
+	@Override
+	@Transactional(readOnly = true)
+	public String suggestCountryForUser(Integer userId) {
+		Validate.isTrue(userId != null, "UserId must be non null");
+
+		return countryDao.suggestCountryForUser(userId);
+	}
 }

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

@@ -31,7 +31,6 @@
 @SuppressWarnings("PMD.TooManyMethods")
 public interface SeriesService {
 	Integer add(AddSeriesDto dto, Integer userId, boolean userCanAddComments);
-	String guessCountryBy(Integer createdBy);
 
 	void addImageToSeries(AddImageDto dto, Integer seriesId, Integer userId);
 	long countAll();

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

@@ -220,17 +220,6 @@ public long countUpdatedSince(Date date) {
 
 		return seriesDao.countUpdatedSince(date);
 	}
-
-	/**
-	 * @author Shkarin John
-	 */
-	@Override
-	@Transactional(readOnly = true)
-	public String guessCountryBy(Integer createdBy) {
-		Validate.isTrue(createdBy != null, "CreatedBy must be non null");
-		
-		return seriesDao.guessCountryBy(createdBy);
-	}
 
 	@Override
 	@Transactional(readOnly = true)

src/main/javascript/series/add.js

@@ -2,7 +2,7 @@
 // IMPORTANT:
 // You have to update Url.RESOURCES_VERSION each time whenever you're modified this file!
 //
-function initPage() {
+function initPage(urlSuggest) {
 	$('#country').selectize();
 
 	$('.js-catalog-numbers').on('blur', function() {
@@ -22,8 +22,7 @@ function initPage() {
 		'placement': 'right'
 	});
 
-	$.get("/suggest/series_country", function (data){
-		var slug = jQuery.parseJSON(data).country;
+	$.get(urlSuggest, function (slug){
 		if (slug == null)
 			return;
 

src/main/resources/sql/country_dao_queries.properties

@@ -81,3 +81,15 @@ country.find_country_link_info_by_slug = \
     FROM countries c \
    WHERE c.slug = :slug \
 ORDER BY CASE WHEN 'ru' = :lang THEN COALESCE(c.name_ru, c.name) ELSE c.name END
+
+series.find_last_country_by_id = \
+  SELECT slug \
+    FROM series LEFT JOIN countries ON countries.id = series.country_id \
+   WHERE series.created_by = :created_by \
+ORDER BY series.created_at DESC LIMIT 1
+
+series.find_popular_country = \
+  SELECT slug \
+	FROM series LEFT JOIN countries ON countries.id = series.country_id \
+GROUP BY country_id \
+ORDER BY COUNT(*) DESC LIMIT 1

src/main/resources/sql/series_dao_queries.properties

@@ -242,19 +242,6 @@ SELECT COUNT(*) \
   FROM series \
  WHERE updated_at >= :date
 
-series.find_last_country_by_id = \
-SELECT slug \
-  FROM series LEFT JOIN countries ON countries.id = series.country_id \
- WHERE series.created_at IN (SELECT MAX(series.created_at) \
-							   FROM series \
-							  WHERE series.created_by = :created_by)
-
-series.find_popular_country = \
-  SELECT slug \
-	FROM series LEFT JOIN countries ON countries.id = series.country_id \
-GROUP BY country_id \
-ORDER BY COUNT(*) DESC LIMIT 1
-
 series.find_series_ids_by_michel_number = \
 SELECT smc.series_id AS series_id \
   FROM series_michel_catalog smc \

src/main/webapp/WEB-INF/views/series/add.html

@@ -15,7 +15,7 @@
 		<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
 		<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.12.3/css/selectize.bootstrap3.min.css" th:href="${SELECTIZE_CSS}" />
 	</head>
-	<body onload="initPage()">
+	<body>
 		<div class="container-fluid">
 			<div class="row" id="header">
 				<div id="logo" class="col-sm-9 vcenter">
@@ -203,7 +203,7 @@ <h3 th:text="${#strings.capitalize(add_series)}">
 								/*/-->
 							</div>
 
-							<span id="guess_country" style="display: block;">
+							<span id="guess_country" style="display: none;">
 								<a tabindex="-1" th:text="#{t_guess_country}" href="javascript:void(0)">Guess a country</a>
 							</span>
 						</div>
@@ -519,5 +519,11 @@ <h3 th:text="${#strings.capitalize(add_series)}">
 
 		<script src="../../../../javascript/CatalogUtils.min.js" th:src="${CATALOG_UTILS_JS}"></script>
 		<script src="../../../../javascript/series/add.min.js" th:src="${SERIES_ADD_JS}"></script>
+		<span class="url_suggest" th:value="${urlSuggest}"></span> 
+		<script th:inline="javascript">
+			$(document).ready(function() {
+				 initPage($(".url_suggest").attr("value"));
+			});
+		</script>
 	</body>
 </html>