Add support for specifying Zagorski catalog numbers.

Fix #769

Author: php-coder

NEWS.txt

@@ -18,6 +18,7 @@
 - (functionality)  add capability to specify image URL (as alternative to providing a file)
 - (functionality)  admin can import a series from an external site
 - (integration)    migrate from coveralls.io to codecov.io service for code coverage
+- (functionality)  add support for specifying Zagorski catalog numbers
 
 0.3
 - (functionality)  implemented possibility to user to add series to his collection

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

@@ -135,7 +135,16 @@ public StampsCatalogDao getYvertCatalogDao() {
 			env.getRequiredProperty("series_yvert.add"),
 			env.getRequiredProperty("series_yvert.find_by_series_id")
 		);
-		
+	}
+	
+	@Bean
+	public StampsCatalogDao getZagorskiCatalogDao() {
+		return new JdbcStampsCatalogDao(
+			jdbcTemplate,
+			env.getRequiredProperty("zagorski.create"),
+			env.getRequiredProperty("series_zagorski.add"),
+			env.getRequiredProperty("series_zagorski.find_by_series_id")
+		);
 	}
 
 }

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

@@ -158,7 +158,8 @@ public SeriesService getSeriesService() {
 			getMichelCatalogService(),
 			getScottCatalogService(),
 			getYvertCatalogService(),
-			getGibbonsCatalogService()
+			getGibbonsCatalogService(),
+			getZagorskiCatalogService()
 		);
 	}
 
@@ -245,6 +246,15 @@ public StampsCatalogService getGibbonsCatalogService() {
 		);
 	}
 
+	@Bean
+	public StampsCatalogService getZagorskiCatalogService() {
+		return new StampsCatalogServiceImpl(
+			LoggerFactory.getLogger(StampsCatalogServiceImpl.class),
+			"Zagorski",
+			daoConfig.getZagorskiCatalogDao()
+		);
+	}
+	
 	@Bean
 	public TransactionParticipantService getTransactionParticipantService() {
 		return new TransactionParticipantServiceImpl(

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

@@ -120,6 +120,7 @@ protected void initSeriesFormBinder(WebDataBinder binder) {
 		binder.registerCustomEditor(String.class, "scottNumbers", editor);
 		binder.registerCustomEditor(String.class, "yvertNumbers", editor);
 		binder.registerCustomEditor(String.class, "gibbonsNumbers", editor);
+		binder.registerCustomEditor(String.class, "zagorskiNumbers", editor);
 		binder.registerCustomEditor(String.class, "comment", new StringTrimmerEditor(true));
 	}
 
@@ -455,6 +456,7 @@ public String searchSeriesByCatalog(
 			return "redirect:" + Url.INDEX_PAGE;
 		}
 
+		// @todo #769 Support search by Zagorski number
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
 		List<SeriesInfoDto> series;
 		switch (catalogName) {
@@ -544,14 +546,16 @@ protected static void loadErrorsFromDownloadInterceptor(
 
 		model.put("series", series);
 
-		String michelNumbers  = CatalogUtils.toShortForm(series.getMichel().getNumbers());
-		String scottNumbers   = CatalogUtils.toShortForm(series.getScott().getNumbers());
-		String yvertNumbers   = CatalogUtils.toShortForm(series.getYvert().getNumbers());
-		String gibbonsNumbers = CatalogUtils.toShortForm(series.getGibbons().getNumbers());
+		String michelNumbers   = CatalogUtils.toShortForm(series.getMichel().getNumbers());
+		String scottNumbers    = CatalogUtils.toShortForm(series.getScott().getNumbers());
+		String yvertNumbers    = CatalogUtils.toShortForm(series.getYvert().getNumbers());
+		String gibbonsNumbers  = CatalogUtils.toShortForm(series.getGibbons().getNumbers());
+		String zagorskiNumbers = CatalogUtils.toShortForm(series.getZagorski().getNumbers());
 		model.put("michelNumbers", michelNumbers);
 		model.put("scottNumbers", scottNumbers);
 		model.put("yvertNumbers", yvertNumbers);
 		model.put("gibbonsNumbers", gibbonsNumbers);
+		model.put("zagorskiNumbers", zagorskiNumbers);
 
 		boolean isSeriesInCollection =
 			collectionService.isSeriesInCollection(currentUserId, series.getId());

src/main/java/ru/mystamps/web/controller/dto/AddSeriesForm.java

@@ -130,6 +130,14 @@ public class AddSeriesForm implements AddSeriesDto, HasImageOrImageUrl, Nullable
 
 	@Price
 	private BigDecimal gibbonsPrice;
+
+	// @todo #769 /series/add: validate that Zagorski numbers are specified only for stamps
+	//  from USSR/Russia
+	@CatalogNumbers
+	private String zagorskiNumbers;
+
+	@Price
+	private BigDecimal zagorskiPrice;
 
 	@Size(max = MAX_SERIES_COMMENT_LENGTH, message = "{value.too-long}")
 	private String comment;

src/main/java/ru/mystamps/web/controller/dto/ImportSeriesForm.java

@@ -144,6 +144,16 @@ public BigDecimal getGibbonsPrice() {
 		return null;
 	}
 
+	@Override
+	public String getZagorskiNumbers() {
+		return null;
+	}
+	
+	@Override
+	public BigDecimal getZagorskiPrice() {
+		return null;
+	}
+	
 	@Override
 	public String getComment() {
 		return null;

src/main/java/ru/mystamps/web/dao/dto/AddSeriesDbDto.java

@@ -47,6 +47,8 @@ public class AddSeriesDbDto {
 	private BigDecimal gibbonsPrice;
 	private String gibbonsCurrency;
 
+	private BigDecimal zagorskiPrice;
+	
 	private Integer releaseDay;
 	private Integer releaseMonth;
 	private Integer releaseYear;

src/main/java/ru/mystamps/web/dao/dto/SeriesFullInfoDto.java

@@ -48,4 +48,6 @@ public class SeriesFullInfoDto {
 
 	private final BigDecimal gibbonsPrice;
 	private final String gibbonsCurrency;
+	
+	private final BigDecimal zagorskiPrice;
 }

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

@@ -134,6 +134,7 @@ public Integer add(AddSeriesDbDto series) {
 		params.put("yvert_currency", series.getYvertCurrency());
 		params.put("gibbons_price", series.getGibbonsPrice());
 		params.put("gibbons_currency", series.getGibbonsCurrency());
+		params.put("zagorski_price", series.getZagorskiPrice());
 		params.put("comment", series.getComment());
 		params.put("created_at", series.getCreatedAt());
 		params.put("created_by", series.getCreatedBy());

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

@@ -126,6 +126,8 @@ public static SeriesFullInfoDto forSeriesFullInfoDto(ResultSet rs, int i) throws
 		BigDecimal gibbonsPrice = rs.getBigDecimal("gibbons_price");
 		String gibbonsCurrency  = rs.getString("gibbons_currency");
 
+		BigDecimal zagorskiPrice = rs.getBigDecimal("zagorski_price");
+		
 		LinkEntityDto category =
 			createLinkEntityDto(rs, "category_id", "category_slug", "category_name");
 
@@ -150,7 +152,8 @@ public static SeriesFullInfoDto forSeriesFullInfoDto(ResultSet rs, int i) throws
 			yvertPrice,
 			yvertCurrency,
 			gibbonsPrice,
-			gibbonsCurrency
+			gibbonsCurrency,
+			zagorskiPrice
 		);
 	}