SeriesService.findBy(Category): renamed to findByCategoryId() to replace usage of Category entity.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -103,7 +103,8 @@ public String showInfo(
 		model.addAttribute("category", category);
 
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
-		model.addAttribute("seriesOfCategory", seriesService.findBy(category, lang));
+		Integer categoryId = category.getId();
+		model.addAttribute("seriesOfCategory", seriesService.findByCategoryId(categoryId, lang));
 
 		return "category/info";
 	}

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

@@ -19,7 +19,6 @@
 
 import java.util.Optional;
 
-import ru.mystamps.web.entity.Category;
 import ru.mystamps.web.entity.Collection;
 import ru.mystamps.web.entity.Country;
 import ru.mystamps.web.entity.Series;
@@ -49,7 +48,7 @@ public interface SeriesService {
 	Optional<Integer> findSeriesIdByYvertNumber(String yvertNumberCode);
 	Optional<Integer> findSeriesIdByGibbonsNumber(String gibbonsNumberCode);
 
-	Iterable<SeriesInfoDto> findBy(Category category, String lang);
+	Iterable<SeriesInfoDto> findByCategoryId(Integer categoryId, String lang);
 	Iterable<SeriesInfoDto> findBy(Country country, String lang);
 	Iterable<SeriesInfoDto> findBy(Collection collection, String lang);
 	Iterable<SeriesInfoDto> findRecentlyAdded(int quantity, String lang);

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.Category;
 import ru.mystamps.web.entity.Country;
 import ru.mystamps.web.entity.Collection;
 import ru.mystamps.web.entity.Currency;
@@ -255,10 +254,10 @@ public Optional<Integer> findSeriesIdByGibbonsNumber(String gibbonsNumberCode) {
 
 	@Override
 	@Transactional(readOnly = true)
-	public Iterable<SeriesInfoDto> findBy(Category category, String lang) {
-		Validate.isTrue(category != null, "Category must be non null");
+	public Iterable<SeriesInfoDto> findByCategoryId(Integer categoryId, String lang) {
+		Validate.isTrue(categoryId != null, "Category id must be non null");
 
-		return jdbcSeriesDao.findByCategoryIdAsSeriesInfo(category.getId(), lang);
+		return jdbcSeriesDao.findByCategoryIdAsSeriesInfo(categoryId, lang);
 	}
 
 	@Override

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

@@ -720,25 +720,25 @@ class SeriesServiceImplTest extends Specification {
 	}
 
 	//
-	// Tests for findBy(Category)
+	// Tests for findByCategoryId()
 	//
 
-	def "findBy(Category) should throw exception if category is null"() {
+	def "findByCategoryId() should throw exception if category id is null"() {
 		when:
-			service.findBy(null as Category, 'any')
+			service.findByCategoryId(null, 'any')
 		then:
 			thrown IllegalArgumentException
 	}
 
-	def "findBy(Category) should call dao and return result"() {
+	def "findByCategoryId() should call dao and return result"() {
 		given:
 			Category expectedCategory = TestObjects.createCategory()
 		and:
 			Iterable<Category> expectedResult = [ expectedCategory ]
 		and:
 			jdbcSeriesDao.findByCategoryIdAsSeriesInfo(_ as Integer, _ as String) >> expectedResult
 		when:
-			Iterable<Category> result = service.findBy(expectedCategory, 'any')
+			Iterable<Category> result = service.findByCategoryId(10, 'any')
 		then:
 			result == expectedResult
 	}