remarks

Author: Shkarin

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

@@ -80,6 +80,7 @@ public class JdbcCountryDao implements CountryDao {
 	@Value("${country.find_last_created_by_user}")
 	private String findLastCreatedByUserSql;
 
+	@SuppressWarnings("PMD.LongVariable")
 	@Value("${country.find_popular_country_from_user_collection}")
 	private String findPopularCountryInCollectionSql;
 

src/main/resources/sql/country_dao_queries.properties

@@ -85,15 +85,17 @@ ORDER BY CASE WHEN 'ru' = :lang THEN COALESCE(c.name_ru, c.name) ELSE c.name END
 country.find_last_created_by_user = \
    SELECT c.slug \
      FROM series s \
-	 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_from_user_collection = \
    SELECT c.slug \
-	 FROM series s \
-	 JOIN countries c ON c.id = s.country_id \
+	 FROM collections c \
+	 JOIN collections_series cs ON c.id = cs.collection_id \
+    WHERE c.user_id = :user_id \
  GROUP BY country_id \
  ORDER BY COUNT(*) DESC\
   	LIMIT 1

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

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