SeriesService.findBy(Country): renamed to findByCountryId() to replace usage of Country entity.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -103,7 +103,8 @@ public String showInfo(
 		model.addAttribute("country", country);
 
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
-		model.addAttribute("seriesOfCountry", seriesService.findBy(country, lang));
+		Integer countryId = country.getId();
+		model.addAttribute("seriesOfCountry", seriesService.findByCountryId(countryId, lang));
 
 		return "country/info";
 	}

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

@@ -19,7 +19,6 @@
 
 import java.util.Optional;
 
-import ru.mystamps.web.entity.Country;
 import ru.mystamps.web.entity.Series;
 import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.dto.AddImageDto;
@@ -48,7 +47,7 @@ public interface SeriesService {
 	Optional<Integer> findSeriesIdByGibbonsNumber(String gibbonsNumberCode);
 
 	Iterable<SeriesInfoDto> findByCategoryId(Integer categoryId, String lang);
-	Iterable<SeriesInfoDto> findBy(Country country, String lang);
+	Iterable<SeriesInfoDto> findByCountryId(Integer countryId, String lang);
 	Iterable<SeriesInfoDto> findByCollectionId(Integer collectionId, String lang);
 	Iterable<SeriesInfoDto> findRecentlyAdded(int quantity, String lang);
 	Iterable<SitemapInfoDto> findAllForSitemap();

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

@@ -34,7 +34,6 @@
 
 import ru.mystamps.web.dao.JdbcSeriesDao;
 import ru.mystamps.web.dao.SeriesDao;
-import ru.mystamps.web.entity.Country;
 import ru.mystamps.web.entity.Currency;
 import ru.mystamps.web.entity.GibbonsCatalog;
 import ru.mystamps.web.entity.Image;
@@ -261,10 +260,10 @@ public Iterable<SeriesInfoDto> findByCategoryId(Integer categoryId, String lang)
 
 	@Override
 	@Transactional(readOnly = true)
-	public Iterable<SeriesInfoDto> findBy(Country country, String lang) {
-		Validate.isTrue(country != null, "Country must be non null");
+	public Iterable<SeriesInfoDto> findByCountryId(Integer countryId, String lang) {
+		Validate.isTrue(countryId != null, "Country id must be non null");
 
-		return jdbcSeriesDao.findByCountryIdAsSeriesInfo(country.getId(), lang);
+		return jdbcSeriesDao.findByCountryIdAsSeriesInfo(countryId, lang);
 	}
 
 	@Override

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

@@ -743,25 +743,25 @@ class SeriesServiceImplTest extends Specification {
 	}
 
 	//
-	// Tests for findBy(Country)
+	// Tests for findByCountryId()
 	//
 
-	def "findBy(Country) should throw exception if country is null"() {
+	def "findByCountryId() should throw exception if country id is null"() {
 		when:
-			service.findBy(null as Country, 'any')
+			service.findByCountryId(null, 'any')
 		then:
 			thrown IllegalArgumentException
 	}
 
-	def "findBy(Country) should call dao and return result"() {
+	def "findByCountryId() should call dao and return result"() {
 		given:
 			Country expectedCountry = TestObjects.createCountry()
 		and:
 			Iterable<Country> expectedResult = [ expectedCountry ]
 		and:
 			jdbcSeriesDao.findByCountryIdAsSeriesInfo(_ as Integer, _ as String) >> expectedResult
 		when:
-			Iterable<Country> result = service.findBy(expectedCountry, 'any')
+			Iterable<Country> result = service.findByCountryId(20, 'any')
 		then:
 			result == expectedResult
 	}