SeriesServiceImplTest.findByGibbonsNumber(): use StampsCatalogService.findSeriesIdsByNumber() method.

Also remove arguments validation as findSeriesIdsByNumber() validates them.

Addressed to #299

Author: php-coder

src/main/java/ru/mystamps/web/config/DaoConfig.java

@@ -58,7 +58,8 @@ public StampsCatalogDao getGibbonsCatalogDao() {
 			jdbcTemplate,
 			env.getRequiredProperty("gibbons.create"),
 			env.getRequiredProperty("series_gibbons.add"),
-			env.getRequiredProperty("series_gibbons.find_by_series_id")
+			env.getRequiredProperty("series_gibbons.find_by_series_id"),
+			env.getRequiredProperty("series_gibbons.find_series_ids_by_number")
 		);
 	}
 

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

@@ -47,6 +47,4 @@ public interface SeriesDao {
 	long countSeriesById(Integer seriesId);
 	long countAddedSince(Date date);
 	long countUpdatedSince(Date date);
-	
-	List<Integer> findSeriesIdsByGibbonsNumberCode(String gibbonsNumber);
 }

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

@@ -104,9 +104,6 @@ public class JdbcSeriesDao implements SeriesDao {
 	@Value("${series.count_series_updated_since}")
 	private String countSeriesUpdatedSinceSql;
 
-	@Value("${series.find_series_ids_by_gibbons_number}")
-	private String findSeriesIdsByGibbonsNumberSql;
-	
 	@Override
 	public Integer add(AddSeriesDbDto series) {
 		Map<String, Object> params = new HashMap<>();
@@ -309,13 +306,4 @@ public long countUpdatedSince(Date date) {
 		);
 	}
 
-	@Override
-	public List<Integer> findSeriesIdsByGibbonsNumberCode(String gibbonsNumber) {
-		return jdbcTemplate.queryForList(
-			findSeriesIdsByGibbonsNumberSql,
-			Collections.singletonMap("gibbons_number", gibbonsNumber),
-			Integer.class
-		);
-	}
-	
 }

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

@@ -283,13 +283,7 @@ public List<SeriesInfoDto> findByYvertNumber(String yvertNumberCode, String lang
 	@Override
 	@Transactional(readOnly = true)
 	public List<SeriesInfoDto> findByGibbonsNumber(String gibbonsNumberCode, String lang) {
-		Validate.isTrue(gibbonsNumberCode != null, "Gibbons number code must be non null");
-		Validate.isTrue(
-			!gibbonsNumberCode.trim().isEmpty(),
-			"Gibbons number code must be non empty"
-		);
-		
-		List<Integer> seriesIds = seriesDao.findSeriesIdsByGibbonsNumberCode(gibbonsNumberCode);
+		List<Integer> seriesIds = gibbonsCatalogService.findSeriesIdsByNumber(gibbonsNumberCode);
 		if (seriesIds.isEmpty()) {
 			return Collections.emptyList();
 		}

src/main/resources/sql/series_dao_queries.properties

@@ -247,10 +247,3 @@ series.count_series_updated_since = \
 SELECT COUNT(*) \
   FROM series \
  WHERE updated_at >= :date
-
-series.find_series_ids_by_gibbons_number = \
-SELECT sgc.series_id AS series_id \
-  FROM series_gibbons_catalog sgc \
-  JOIN gibbons_catalog mc \
-    ON mc.id = sgc.gibbons_id \
- WHERE mc.code = :gibbons_number

src/main/resources/sql/stamps_catalog_dao_queries.properties

@@ -198,3 +198,10 @@ SELECT syc.series_id AS series_id \
   JOIN yvert_catalog mc \
     ON mc.id = syc.yvert_id \
  WHERE mc.code = :number
+
+series_gibbons.find_series_ids_by_number = \
+SELECT sgc.series_id AS series_id \
+  FROM series_gibbons_catalog sgc \
+  JOIN gibbons_catalog mc \
+    ON mc.id = sgc.gibbons_id \
+ WHERE mc.code = :number

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

@@ -1030,35 +1030,18 @@ class SeriesServiceImplTest extends Specification {
 	// Tests for findByGibbonsNumber()
 	//
 
-	@Unroll
-	def "findByGibbonsNumber() should throw exception for invalid argument '#catalogNumber'"(String catalogNumber) {
-		when:
-			service.findByGibbonsNumber(catalogNumber, 'en')
-		then:
-			thrown IllegalArgumentException
-		where:
-			catalogNumber | _
-			null          | _
-			''            | _
-			' '           | _
-	}
-	
-	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
 	def "findByGibbonsNumber() should find series ids"() {
 		given:
 			String expectedGibbonsNumber = '5'
 		when:
 			service.findByGibbonsNumber(expectedGibbonsNumber, 'en')
 		then:
-			1 * seriesDao.findSeriesIdsByGibbonsNumberCode({ String gibbonsNumber ->
-				assert gibbonsNumber == expectedGibbonsNumber
-				return true
-			}) >> []
+			1 * gibbonsCatalogService.findSeriesIdsByNumber(expectedGibbonsNumber) >> []
 	}
 
 	def "findByGibbonsNumber() shouldn't try to find series info if there are no series"() {
 		given:
-			seriesDao.findSeriesIdsByGibbonsNumberCode(_ as String) >> []
+			gibbonsCatalogService.findSeriesIdsByNumber(_ as String) >> []
 		when:
 			List<SeriesInfoDto> result = service.findByGibbonsNumber('5', 'en')
 		then:
@@ -1074,7 +1057,7 @@ class SeriesServiceImplTest extends Specification {
 		and:
 			List<Integer> expectedSeriesIds = [ 1 ]
 		and:
-			seriesDao.findSeriesIdsByGibbonsNumberCode(_ as String) >> expectedSeriesIds
+			gibbonsCatalogService.findSeriesIdsByNumber(_ as String) >> expectedSeriesIds
 		and:
 			List<SeriesInfoDto> expectedResult = []
 		when: