correct query

Author: Shkarin

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

@@ -223,7 +223,8 @@ public String findLastCreatedByUser(Integer userId) {
 			return jdbcTemplate.queryForObject(
 				findLastCreatedByUserSql,
 				Collections.singletonMap("created_by", userId),
-				String.class);
+				String.class
+			);
 		} catch (EmptyResultDataAccessException ignored) {
 			return null;
 		}
@@ -237,10 +238,9 @@ public String findPopularCountryInCollection(Integer userId) {
 		try {
 			return jdbcTemplate.queryForObject(
 				findPopularCountryInCollectionSql,
-				Collections.<String, Object>emptyMap(),
+				Collections.singletonMap("user_id", userId),
 				String.class
 			);
-
 		} catch (EmptyResultDataAccessException ignored) {
 			return null;
 		}

src/main/resources/sql/country_dao_queries.properties

@@ -92,10 +92,12 @@ country.find_last_created_by_user = \
 	LIMIT 1
 
 country.find_popular_country_from_user_collection = \
-   SELECT c.slug \
+   SELECT co.slug \
 	 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
+	 JOIN series s ON s.id = cs.series_id \
+	 JOIN countries co ON co.id = s.country_id \
+	WHERE c.user_id = :user_id \
+ GROUP BY co.id \
+ ORDER BY COUNT(*) DESC \
+ 	LIMIT 1