fixes

Author: Shkarin

src/main/java/ru/mystamps/web/Url.java

@@ -51,7 +51,7 @@ public final class Url {
 	public static final String INFO_SERIES_PAGE         = "/series/{id}";
 	public static final String ADD_IMAGE_SERIES_PAGE    = "/series/{id}/image";
 	public static final String SEARCH_SERIES_BY_CATALOG = "/series/search/by_catalog";
-	public static final String INFO_COUNTRY_SERIES_PAGE	= "/series/country_slug";
+	public static final String INFO_COUNTRY_SERIES_PAGE	= "/suggest/series_country";
 
 	public static final String ADD_CATEGORY_PAGE     = "/category/add";
 	public static final String LIST_CATEGORIES_PAGE  = "/category/list";

src/main/java/ru/mystamps/web/controller/SeriesController.java

@@ -421,7 +421,10 @@ public String searchSeriesByCatalog(
 
 		return "series/search_result";
 	}
-	
+
+	/**
+	 * @author Shkarin John
+	 */
 	@ResponseBody
 	@GetMapping(Url.INFO_COUNTRY_SERIES_PAGE)
 	public String guessCountryBy(@CurrentUser Integer currentUserId) {

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

@@ -327,10 +327,9 @@ public long countAddedSince(Date date) {
 
 	@Override
 	public String guessCountryBy(Integer createdBy) {
-		Map<String, Object> params = new HashMap<>();
-		params.put("created_by", createdBy);
-
-		String result = jdbcTemplate.queryForObject(findLastCountryByIdSql, params, String.class);
+		String result = jdbcTemplate.queryForObject(findLastCountryByIdSql, 
+			Collections.singletonMap("created_by", createdBy),
+			String.class);
 		if (result != null) {
 			return result;
 		}

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

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

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

@@ -220,7 +220,10 @@ public long countUpdatedSince(Date date) {
 
 		return seriesDao.countUpdatedSince(date);
 	}
-	
+
+	/**
+	 * @author Shkarin John
+	 */
 	@Override
 	@Transactional(readOnly = true)
 	public String guessCountryBy(Integer createdBy) {

src/main/javascript/series/add.js

@@ -22,22 +22,19 @@ function initPage() {
 		'placement': 'right'
 	});
 
-	$.ajax({
-		url : "/series/country_slug",
-		success : function(data) {
-			var slug = jQuery.parseJSON(data).country;
-			if (slug == null)
-				return;
-			
-			var country = $("#guess_country");
-			country[0].style.display = "block";
-			country.click(function() {
-				$(this)[0].style.display = "none";
+	$.get("/suggest/series_country", function (data){
+		var slug = jQuery.parseJSON(data).country;
+		if (slug == null)
+			return;
+		
+		var country = $("#guess_country");
+		country[0].style.display = "block";
+		country.click(function() {
+			$(this)[0].style.display = "none";
 
-				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/liquibase/changelog.xml

@@ -11,6 +11,5 @@
 	<include file="initial-state.xml" relativeToChangelogFile="true" />
 	<include file="version/0.3.xml" relativeToChangelogFile="true" />
 	<include file="version/0.4.xml" relativeToChangelogFile="true" />
-	<include file="initial-test.xml" relativeToChangelogFile="true" />
 
 </databaseChangeLog>

src/main/resources/liquibase/initial-test.xml

@@ -121,7 +121,7 @@ t_add_more_images_hint = Later you will be able to add additional images
 t_not_chosen = Not chosen
 t_create_category_hint = You can also <a tabindex="-1" href="{0}">add a new category</a>
 t_create_country_hint = You can also <a tabindex="-1" href="{0}">add a new country</a>
-t_guess_country = Guess the country
+t_guess_country = Guess a country
 
 # series/info.html
 t_series_info = Info about series

src/main/resources/ru/mystamps/i18n/Messages.properties

@@ -107,7 +107,3 @@ label {
 .goog-tooltip {
 	color: white;
 }
-
-#guess_country {
-	display: none;
-}

src/main/webapp/WEB-INF/static/styles/main.css

@@ -203,8 +203,8 @@ <h3 th:text="${#strings.capitalize(add_series)}">
 								/*/-->
 							</div>
 
-							<span id="guess_country">
-								<a tabindex="-1" th:text="#{t_guess_country}" href="javascript:void(0)">Guess the country</a>
+							<span id="guess_country" style="display: block;">
+								<a tabindex="-1" th:text="#{t_guess_country}" href="javascript:void(0)">Guess a country</a>
 							</span>
 						</div>