SeriesService.findByCountryId(): rename to findByCountrySlug().

No functional changes.

Author: php-coder

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

@@ -106,12 +106,11 @@ public String showInfoBySlug(
 			return null;
 		}
 
-		Integer id  = country.getId();
 		String slug = country.getSlug();
 		String name = country.getName();
 
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
-		List<SeriesInfoDto> series = seriesService.findByCountryId(id, lang);
+		List<SeriesInfoDto> series = seriesService.findByCountrySlug(slug, lang);
 
 		model.addAttribute("countrySlug", slug);
 		model.addAttribute("countryName", name);

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

@@ -35,7 +35,7 @@ public interface SeriesDao {
 	SeriesFullInfoDto findByIdAsSeriesFullInfo(Integer seriesId, String lang);
 	List<SeriesInfoDto> findByIdsAsSeriesInfo(List<Integer> seriesIds, String lang);
 	List<SeriesInfoDto> findByCategoryIdAsSeriesInfo(Integer categoryId, String lang);
-	List<SeriesInfoDto> findByCountryIdAsSeriesInfo(Integer countryId, String lang);
+	List<SeriesInfoDto> findByCountrySlugAsSeriesInfo(String slug, String lang);
 	List<SeriesInfoDto> findByCollectionIdAsSeriesInfo(Integer collectionId, String lang);
 	long countAll();
 	long countAllStamps();

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

@@ -73,8 +73,8 @@ public class JdbcSeriesDao implements SeriesDao {
 	@Value("${series.find_by_category_id}")
 	private String findByCategoryIdSql;
 
-	@Value("${series.find_by_country_id}")
-	private String findByCountryIdSql;
+	@Value("${series.find_by_country_slug}")
+	private String findByCountrySlugSql;
 
 	@Value("${series.find_by_collection_id}")
 	private String findByCollectionIdSql;
@@ -232,12 +232,12 @@ public List<SeriesInfoDto> findByCategoryIdAsSeriesInfo(Integer categoryId, Stri
 	}
 
 	@Override
-	public List<SeriesInfoDto> findByCountryIdAsSeriesInfo(Integer countryId, String lang) {
+	public List<SeriesInfoDto> findByCountrySlugAsSeriesInfo(String slug, String lang) {
 		Map<String, Object> params = new HashMap<>();
-		params.put("country_id", countryId);
+		params.put("slug", slug);
 		params.put("lang", lang);
 
-		return jdbcTemplate.query(findByCountryIdSql, params, RowMappers::forSeriesInfoDto);
+		return jdbcTemplate.query(findByCountrySlugSql, params, RowMappers::forSeriesInfoDto);
 	}
 
 	@Override

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

@@ -47,7 +47,7 @@ public interface SeriesService {
 	List<SeriesInfoDto> findByGibbonsNumber(String gibbonsNumberCode, String lang);
 
 	List<SeriesInfoDto> findByCategoryId(Integer categoryId, String lang);
-	List<SeriesInfoDto> findByCountryId(Integer countryId, String lang);
+	List<SeriesInfoDto> findByCountrySlug(String slug, String lang);
 	List<SeriesInfoDto> findByCollectionId(Integer collectionId, String lang);
 	List<SeriesInfoDto> findRecentlyAdded(int quantity, String lang);
 	List<SitemapInfoDto> findAllForSitemap();

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

@@ -321,10 +321,10 @@ public List<SeriesInfoDto> findByCategoryId(Integer categoryId, String lang) {
 
 	@Override
 	@Transactional(readOnly = true)
-	public List<SeriesInfoDto> findByCountryId(Integer countryId, String lang) {
-		Validate.isTrue(countryId != null, "Country id must be non null");
+	public List<SeriesInfoDto> findByCountrySlug(String slug, String lang) {
+		Validate.isTrue(slug != null, "Country slug must be non null");
 
-		return seriesDao.findByCountryIdAsSeriesInfo(countryId, lang);
+		return seriesDao.findByCountrySlugAsSeriesInfo(slug, lang);
 	}
 
 	@Override

src/main/resources/sql/series_dao_queries.properties

@@ -146,7 +146,7 @@ LEFT JOIN countries count \
        ON count.id = s.country_id \
     WHERE cat.id = :category_id
 
-series.find_by_country_id = \
+series.find_by_country_slug = \
    SELECT s.id \
         , cat.id AS category_id \
         , cat.slug AS category_slug \
@@ -164,7 +164,7 @@ series.find_by_country_id = \
        ON cat.id = s.category_id \
 LEFT JOIN countries count \
        ON count.id = s.country_id \
-    WHERE count.id = :country_id
+    WHERE count.slug = :slug
 
 series.find_by_collection_id = \
    SELECT s.id \

src/test/groovy/ru/mystamps/web/service/SeriesServiceImplTest.groovy

@@ -1031,25 +1031,25 @@ class SeriesServiceImplTest extends Specification {
 	}
 
 	//
-	// Tests for findByCountryId()
+	// Tests for findByCountrySlug()
 	//
 
-	def "findByCountryId() should throw exception if country id is null"() {
+	def "findByCountrySlug() should throw exception if country slug is null"() {
 		when:
-			service.findByCountryId(null, 'any')
+			service.findByCountrySlug(null, 'any')
 		then:
 			thrown IllegalArgumentException
 	}
 
-	def "findByCountryId() should call dao and return result"() {
+	def "findByCountrySlug() should call dao and return result"() {
 		given:
 			SeriesInfoDto series = TestObjects.createSeriesInfoDto()
 		and:
 			List<SeriesInfoDto> expectedResult = [ series ]
 		and:
-			seriesDao.findByCountryIdAsSeriesInfo(_ as Integer, _ as String) >> expectedResult
+			seriesDao.findByCountrySlugAsSeriesInfo(_ as String, _ as String) >> expectedResult
 		when:
-			List<SeriesInfoDto> result = service.findByCountryId(20, 'any')
+			List<SeriesInfoDto> result = service.findByCountrySlug('germany', 'any')
 		then:
 			result == expectedResult
 	}