Support search by Zagorski number.

Fix #776

Author: php-coder

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

@@ -157,7 +157,8 @@ public StampsCatalogDao getZagorskiCatalogDao() {
 			jdbcTemplate,
 			env.getRequiredProperty("zagorski.create"),
 			env.getRequiredProperty("series_zagorski.add"),
-			env.getRequiredProperty("series_zagorski.find_by_series_id")
+			env.getRequiredProperty("series_zagorski.find_by_series_id"),
+			env.getRequiredProperty("series_zagorski.find_series_ids_by_number")
 		);
 	}
 

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

@@ -457,7 +457,7 @@ public String searchSeriesByCatalog(
 			return "redirect:" + Url.INDEX_PAGE;
 		}
 
-		// @todo #769 Support search by Zagorski number
+		// @todo #776 Add integration tests for search series by Zagorski number
 		// @todo #770 Support search by Solovyov number
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
 		List<SeriesInfoDto> series;
@@ -474,6 +474,9 @@ public String searchSeriesByCatalog(
 			case "gibbons":
 				series = seriesService.findByGibbonsNumber(catalogNumber, lang);
 				break;
+			case "zagorski":
+				series = seriesService.findByZagorskiNumber(catalogNumber, lang);
+				break;
 			default:
 				series = Collections.emptyList();
 				break;

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> findByZagorskiNumber(String zagorskiCatalogNumber, String lang);
 
 	List<SeriesInfoDto> findByCategorySlug(String slug, String lang);
 	List<SeriesInfoDto> findByCountrySlug(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 #776 SeriesServiceImpl.findByZagorskiNumber(): add unit tests
+	@Override
+	@Transactional(readOnly = true)
+	public List<SeriesInfoDto> findByZagorskiNumber(String zagorskiNumberCode, String lang) {
+		return findByCatalogNumber(zagorskiCatalogService, zagorskiNumberCode, lang);
+	}
+	
 	@Override
 	@Transactional(readOnly = true)
 	public List<SeriesInfoDto> findByCategorySlug(String slug, String lang) {

src/main/resources/sql/stamps_catalog_dao_queries.properties

@@ -205,3 +205,10 @@ SELECT sgc.series_id AS series_id \
   JOIN gibbons_catalog mc \
     ON mc.id = sgc.gibbons_id \
  WHERE mc.code = :number
+
+series_zagorski.find_series_ids_by_number = \
+SELECT szc.series_id AS series_id \
+  FROM series_zagorski_catalog szc \
+  JOIN zagorski_catalog zc \
+    ON zc.id = szc.zagorski_id \
+ WHERE zc.code = :number

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="zagorski" th:text="#{t_zagorski}">Zagorski</option>
 									</select>
 								</div>
 								<div class="form-group">