Support search by Solovyov number.

Fix #777

Author: php-coder

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

@@ -116,7 +116,8 @@ public StampsCatalogDao getSolovyovCatalogDao() {
 			jdbcTemplate,
 			env.getRequiredProperty("solovyov.create"),
 			env.getRequiredProperty("series_solovyov.add"),
-			env.getRequiredProperty("series_solovyov.find_by_series_id")
+			env.getRequiredProperty("series_solovyov.find_by_series_id"),
+			env.getRequiredProperty("series_solovyov.find_series_ids_by_number")
 		);
 	}
 

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

@@ -458,7 +458,7 @@ public String searchSeriesByCatalog(
 		}
 
 		// @todo #776 Add integration tests for search series by Zagorski number
-		// @todo #770 Support search by Solovyov number
+		// @todo #777 Add integration tests for search series by Solovyov number
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
 		List<SeriesInfoDto> series;
 		switch (catalogName) {
@@ -474,6 +474,9 @@ public String searchSeriesByCatalog(
 			case "gibbons":
 				series = seriesService.findByGibbonsNumber(catalogNumber, lang);
 				break;
+			case "solovyov":
+				series = seriesService.findBySolovyovNumber(catalogNumber, lang);
+				break;
 			case "zagorski":
 				series = seriesService.findByZagorskiNumber(catalogNumber, lang);
 				break;

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

@@ -28,20 +28,18 @@
 
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.StampsCatalogDao;
 
 @RequiredArgsConstructor
-@AllArgsConstructor
 public class JdbcStampsCatalogDao implements StampsCatalogDao {
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
 	private final String addCatalogNumberSql;
 	private final String addCatalogNumbersToSeriesSql;
 	private final String findBySeriesIdSql;
-	private String findSeriesIdsByNumberSql;
+	private final String findSeriesIdsByNumberSql;
 
 	@Override
 	public List<String> add(Set<String> catalogNumbers) {

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

@@ -46,6 +46,7 @@ public interface SeriesService {
 	List<SeriesInfoDto> findByScottNumber(String scottNumberCode, String lang);
 	List<SeriesInfoDto> findByYvertNumber(String yvertNumberCode, String lang);
 	List<SeriesInfoDto> findByGibbonsNumber(String gibbonsNumberCode, String lang);
+	List<SeriesInfoDto> findBySolovyovNumber(String solovyovCatalogNumber, String lang);
 	List<SeriesInfoDto> findByZagorskiNumber(String zagorskiCatalogNumber, String lang);
 
 	List<SeriesInfoDto> findByCategorySlug(String slug, String lang);

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

@@ -271,6 +271,13 @@ public List<SeriesInfoDto> findByGibbonsNumber(String gibbonsNumberCode, String
 		return findByCatalogNumber(gibbonsCatalogService, gibbonsNumberCode, lang);
 	}
 
+	// @todo #777 SeriesServiceImpl.findBySolovyovNumber(): add unit tests
+	@Override
+	@Transactional(readOnly = true)
+	public List<SeriesInfoDto> findBySolovyovNumber(String solovyovNumberCode, String lang) {
+		return findByCatalogNumber(solovyovCatalogService, solovyovNumberCode, lang);
+	}
+	
 	// @todo #776 SeriesServiceImpl.findByZagorskiNumber(): add unit tests
 	@Override
 	@Transactional(readOnly = true)

src/main/resources/sql/stamps_catalog_dao_queries.properties

@@ -206,6 +206,13 @@ SELECT sgc.series_id AS series_id \
     ON mc.id = sgc.gibbons_id \
  WHERE mc.code = :number
 
+series_solovyov.find_series_ids_by_number = \
+SELECT ssc.series_id AS series_id \
+  FROM series_solovyov_catalog ssc \
+  JOIN solovyov_catalog sc \
+    ON sc.id = ssc.solovyov_id \
+ WHERE sc.code = :number
+
 series_zagorski.find_series_ids_by_number = \
 SELECT szc.series_id AS series_id \
   FROM series_zagorski_catalog szc \

src/main/webapp/WEB-INF/views/site/index.html

@@ -253,6 +253,7 @@ <h4 class="panel-title" th:text="#{t_search_by_catalog}">Search by catalog</h4>
 										<option value="scott" th:text="#{t_scott}">Scott</option>
 										<option value="yvert" th:text="#{t_yvert}">Yvert</option>
 										<option value="gibbons" th:text="#{t_sg}">Gibbons</option>
+										<option value="solovyov" th:text="#{t_solovyov}">Solovyov</option>
 										<option value="zagorski" th:text="#{t_zagorski}">Zagorski</option>
 									</select>
 								</div>