SeriesService.findByCategoryId(): rename to findByCategorySlug().

No functional changes.

Author: php-coder

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

@@ -106,12 +106,11 @@ public String showInfoBySlug(
 			return null;
 		}
 
-		Integer id  = category.getId();
 		String slug = category.getSlug();
 		String name = category.getName();
 
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
-		List<SeriesInfoDto> series = seriesService.findByCategoryId(id, lang);
+		List<SeriesInfoDto> series = seriesService.findByCategorySlug(slug, lang);
 
 		model.addAttribute("categorySlug", slug);
 		model.addAttribute("categoryName", name);

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

@@ -34,7 +34,7 @@ public interface SeriesDao {
 	List<SeriesInfoDto> findLastAdded(int quantity, String lang);
 	SeriesFullInfoDto findByIdAsSeriesFullInfo(Integer seriesId, String lang);
 	List<SeriesInfoDto> findByIdsAsSeriesInfo(List<Integer> seriesIds, String lang);
-	List<SeriesInfoDto> findByCategoryIdAsSeriesInfo(Integer categoryId, String lang);
+	List<SeriesInfoDto> findByCategorySlugAsSeriesInfo(String slug, String lang);
 	List<SeriesInfoDto> findByCountrySlugAsSeriesInfo(String slug, String lang);
 	List<SeriesInfoDto> findByCollectionIdAsSeriesInfo(Integer collectionId, String lang);
 	long countAll();

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

@@ -70,8 +70,8 @@ public class JdbcSeriesDao implements SeriesDao {
 	@Value("${series.find_by_ids}")
 	private String findByIdsSql;
 
-	@Value("${series.find_by_category_id}")
-	private String findByCategoryIdSql;
+	@Value("${series.find_by_category_slug}")
+	private String findByCategorySlugSql;
 
 	@Value("${series.find_by_country_slug}")
 	private String findByCountrySlugSql;
@@ -223,12 +223,12 @@ public List<SeriesInfoDto> findByIdsAsSeriesInfo(List<Integer> seriesIds, String
 	}
 
 	@Override
-	public List<SeriesInfoDto> findByCategoryIdAsSeriesInfo(Integer categoryId, String lang) {
+	public List<SeriesInfoDto> findByCategorySlugAsSeriesInfo(String slug, String lang) {
 		Map<String, Object> params = new HashMap<>();
-		params.put("category_id", categoryId);
+		params.put("slug", slug);
 		params.put("lang", lang);
 
-		return jdbcTemplate.query(findByCategoryIdSql, params, RowMappers::forSeriesInfoDto);
+		return jdbcTemplate.query(findByCategorySlugSql, params, RowMappers::forSeriesInfoDto);
 	}
 
 	@Override

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

@@ -46,7 +46,7 @@ public interface SeriesService {
 	List<SeriesInfoDto> findByYvertNumber(String yvertNumberCode, String lang);
 	List<SeriesInfoDto> findByGibbonsNumber(String gibbonsNumberCode, String lang);
 
-	List<SeriesInfoDto> findByCategoryId(Integer categoryId, String lang);
+	List<SeriesInfoDto> findByCategorySlug(String slug, String lang);
 	List<SeriesInfoDto> findByCountrySlug(String slug, String lang);
 	List<SeriesInfoDto> findByCollectionId(Integer collectionId, String lang);
 	List<SeriesInfoDto> findRecentlyAdded(int quantity, String lang);

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

@@ -313,10 +313,10 @@ public List<SeriesInfoDto> findByGibbonsNumber(String gibbonsNumberCode, String
 
 	@Override
 	@Transactional(readOnly = true)
-	public List<SeriesInfoDto> findByCategoryId(Integer categoryId, String lang) {
-		Validate.isTrue(categoryId != null, "Category id must be non null");
+	public List<SeriesInfoDto> findByCategorySlug(String slug, String lang) {
+		Validate.isTrue(slug != null, "Category slug must be non null");
 
-		return seriesDao.findByCategoryIdAsSeriesInfo(categoryId, lang);
+		return seriesDao.findByCategorySlugAsSeriesInfo(slug, lang);
 	}
 
 	@Override

src/main/resources/sql/series_dao_queries.properties

@@ -126,7 +126,7 @@ LEFT JOIN countries count \
        ON count.id = s.country_id \
     WHERE s.id IN (:series_ids)
 
-series.find_by_category_id = \
+series.find_by_category_slug = \
    SELECT s.id \
         , cat.id AS category_id \
         , cat.slug AS category_slug \
@@ -144,7 +144,7 @@ series.find_by_category_id = \
        ON cat.id = s.category_id \
 LEFT JOIN countries count \
        ON count.id = s.country_id \
-    WHERE cat.id = :category_id
+    WHERE cat.slug = :slug
 
 series.find_by_country_slug = \
    SELECT s.id \

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

@@ -1007,25 +1007,25 @@ class SeriesServiceImplTest extends Specification {
 	}
 
 	//
-	// Tests for findByCategoryId()
+	// Tests for findByCategorySlug()
 	//
 
-	def "findByCategoryId() should throw exception if category id is null"() {
+	def "findByCategorySlug() should throw exception if category slug is null"() {
 		when:
-			service.findByCategoryId(null, 'any')
+			service.findByCategorySlug(null, 'any')
 		then:
 			thrown IllegalArgumentException
 	}
 
-	def "findByCategoryId() should call dao and return result"() {
+	def "findByCategorySlug() should call dao and return result"() {
 		given:
 			SeriesInfoDto series = TestObjects.createSeriesInfoDto()
 		and:
 			List<SeriesInfoDto> expectedResult = [ series ]
 		and:
-			seriesDao.findByCategoryIdAsSeriesInfo(_ as Integer, _ as String) >> expectedResult
+			seriesDao.findByCategorySlugAsSeriesInfo(_ as String, _ as String) >> expectedResult
 		when:
-			List<SeriesInfoDto> result = service.findByCategoryId(10, 'any')
+			List<SeriesInfoDto> result = service.findByCategorySlug('iceland', 'any')
 		then:
 			result == expectedResult
 	}