remarks

Author: Shkarin

src/main/java/ru/mystamps/web/config/ControllersConfig.java

@@ -119,4 +119,3 @@ public SuggestionController getSuggestionController() {
 	}
 
 }
-

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

@@ -36,6 +36,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);
+	String findLastCreatedByUser(Integer userId);
+	String findPopularCountryInCollection(Integer userId);
 }

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

@@ -77,11 +77,11 @@ public class JdbcCountryDao implements CountryDao {
 	@Value("${country.find_country_link_info_by_slug}")
 	private String findCountryLinkEntityBySlugSql;
 
-	@Value("${country.find_last_country_by_id}")
-	private String findLastCountryByIdSql;
+	@Value("${country.find_last_created_by_user}")
+	private String findLastCreatedByUserSql;
 
-	@Value("${country.find_popular_country}")
-	private String findPopularCountrySql;
+	@Value("${country.find_popular_country_from_user_collection}")
+	private String findPopularCountryInCollectionSql;
 
 	@Override
 	public Integer add(AddCountryDbDto country) {
@@ -213,25 +213,36 @@ public LinkEntityDto findOneAsLinkEntity(String slug, String lang) {
 		}
 	}
 
+	/**
+	 * @author Shkarin John
+	 */
 	@Override
-	public String suggestCountryForUser(Integer userId) {
-		
+	public String findLastCreatedByUser(Integer userId) {
 		try {
 			return jdbcTemplate.queryForObject(
-				findLastCountryByIdSql,
+				findLastCreatedByUserSql,
 				Collections.singletonMap("created_by", userId),
 				String.class);
 		} catch (EmptyResultDataAccessException ignored) {
-			try {
-				return jdbcTemplate.queryForObject(
-					findPopularCountrySql,
-					Collections.<String, Object>emptyMap(),
-					String.class
-				);
+			return null;
+		}
+	}
+
+	/**
+	 * @author Shkarin John
+	 */
+	@Override
+	public String findPopularCountryInCollection(Integer userId) {
+		try {
+			return jdbcTemplate.queryForObject(
+				findPopularCountryInCollectionSql,
+				Collections.<String, Object>emptyMap(),
+				String.class
+			);
 
-			} catch (EmptyResultDataAccessException ex) {
-				return null;
-			}
+		} catch (EmptyResultDataAccessException ignored) {
+			return null;
 		}
 	}
+	
 }

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

@@ -26,7 +26,6 @@
 @SuppressWarnings("PMD.TooManyMethods")
 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();
@@ -37,4 +36,5 @@ public interface CountryService {
 	long countAddedSince(Date date);
 	long countUntranslatedNamesSince(Date date);
 	List<Object[]> getStatisticsOf(Integer collectionId, String lang);
+	String suggestCountryForUser(Integer userId);
 }

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

@@ -173,6 +173,15 @@ public List<Object[]> getStatisticsOf(Integer collectionId, String lang) {
 	public String suggestCountryForUser(Integer userId) {
 		Validate.isTrue(userId != null, "User id must be non null");
 
-		return countryDao.suggestCountryForUser(userId);
+		String slug = countryDao.findLastCreatedByUser(userId);
+		if (slug != null) {
+			LOG.debug("Country {} has been suggested to user #{} as a recently created", slug, userId);
+			return slug;
+		}
+
+		slug = countryDao.findPopularCountryInCollection(userId);
+		LOG.debug("Country {} has been suggested to user #{} as popular in his collection", slug, userId);
+		
+		return slug;
 	}
 }

src/main/javascript/series/add.js

@@ -22,22 +22,21 @@ function initPage(suggestCountryUrl) {
 		'placement': 'right'
 	});
 
-	if (suggestCountryUrl == null) {
-		return;
-	}
-	
-	$.get(suggestCountryUrl, function (slug) {
-		if (slug == "")
-			return;
-		
-		var country = $("#guess_country");
-		country.show();
-		country.click(function() {
-			$(this).hide();
+	if (suggestCountryUrl != null) {
+		$.get(suggestCountryUrl, function handleSuggestedCountry(slug) {
+			if (slug == "") {
+				return;
+			}
+
+			var country = $("#js-guess-country-link");
+			country.show();
+			country.click(function chooseSuggestedCountry() {
+				$(this).hide();
 
-			var select_country = $("#country").selectize();
-			var selectize = select_country[0].selectize;
-			selectize.setValue(slug);
+				var select_country = $("#country").selectize();
+				var selectize = select_country[0].selectize;
+				selectize.setValue(slug);
+			});
 		});
-	});
+	}
 }

src/main/resources/sql/country_dao_queries.properties

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

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

@@ -203,7 +203,7 @@ <h3 th:text="${#strings.capitalize(add_series)}">
 								/*/-->
 							</div>
 
-							<small togglz:active="INFO_COUNTRY_SERIES" id="guess_country" th:style="'display: none;'">
+							<small togglz:active="INFO_COUNTRY_SERIES" id="js-guess-country-link" th:style="'display: none;'">
 								<a tabindex="-1" th:text="#{t_guess_country}" href="javascript:void(0)">Guess a country</a>
 							</small>
 						</div>