task: implement extraction and persistence of alternative price and currency during a series import.

Part of #1230

Author: php-coder

src/main/java/ru/mystamps/web/feature/series/importing/RawParsedDataDto.java

@@ -34,4 +34,6 @@ public class RawParsedDataDto {
 	private final String sellerUrl;
 	private final String price;
 	private final String currency;
+	private final String altPrice;
+	private final String altCurrency;
 }

src/main/java/ru/mystamps/web/feature/series/importing/SeriesExtractedInfo.java

@@ -39,4 +39,6 @@ public class SeriesExtractedInfo {
 	private final String sellerUrl;
 	private final BigDecimal price;
 	private final String currency;
+	private final BigDecimal altPrice;
+	private final String altCurrency;
 }

src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportServiceImpl.java

@@ -221,6 +221,14 @@ public void saveParsedData(Integer requestId, SeriesExtractedInfo seriesInfo, St
 			seriesSalesParsedData.setCurrency(seriesInfo.getCurrency());
 		}
 
+		// @todo #1230 SeriesImportServiceImpl.saveParsedData():
+		//  add unit test for alternative price and currency
+		BigDecimal altPrice = seriesInfo.getAltPrice();
+		if (altPrice != null) {
+			seriesSalesParsedData.setAltPrice(altPrice);
+			seriesSalesParsedData.setAltCurrency(seriesInfo.getAltCurrency());
+		}
+		
 		// IMPORTANT: don't add code that modifies database above this line!
 		// @todo #684 Series import: add integration test
 		//  for the case when parsed value don't match database

src/main/java/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImpl.java

@@ -106,6 +106,8 @@ public SeriesExtractedInfo extract(String pageUrl, RawParsedDataDto data) {
 		String sellerUrl = extractSellerUrl(sellerId, data.getSellerUrl());
 		BigDecimal price = extractPrice(data.getPrice());
 		String currency = extractCurrency(data.getCurrency());
+		BigDecimal altPrice = extractPrice(data.getAltPrice());
+		String altCurrency = extractCurrency(data.getAltCurrency());
 
 		return new SeriesExtractedInfo(
 			categoryIds,
@@ -119,7 +121,9 @@ public SeriesExtractedInfo extract(String pageUrl, RawParsedDataDto data) {
 			sellerName,
 			sellerUrl,
 			price,
-			currency
+			currency,
+			altPrice,
+			altCurrency
 		);
 	}
 

src/main/java/ru/mystamps/web/feature/series/importing/event/DownloadingSucceededEventListener.java

@@ -96,7 +96,9 @@ public void onApplicationEvent(DownloadingSucceeded event) {
 			info.getSellerName(),
 			info.getSellerUrl(),
 			info.getPrice(),
-			info.getCurrency()
+			info.getCurrency(),
+			info.getAltPrice(),
+			info.getAltCurrency()
 		);
 
 		SeriesExtractedInfo seriesInfo = extractorService.extract(event.getUrl(), data);

src/main/java/ru/mystamps/web/feature/series/importing/extractor/JsoupSiteParser.java

@@ -56,6 +56,8 @@ public class JsoupSiteParser implements SiteParser {
 	private String priceLocator;
 	private String currencyLocator;
 	private String currencyValue;
+	private String altPriceLocator;
+	private String altCurrencyLocator;
 
 	// @todo #975 SiteParserServiceImpl: add unit tests for constructor
 	public JsoupSiteParser(SiteParserConfiguration cfg) {
@@ -71,6 +73,8 @@ public JsoupSiteParser(SiteParserConfiguration cfg) {
 		priceLocator            = cfg.getPriceLocator();
 		currencyLocator         = cfg.getCurrencyLocator();
 		currencyValue           = cfg.getCurrencyValue();
+		altPriceLocator         = cfg.getAltPriceLocator();
+		altCurrencyLocator      = cfg.getAltCurrencyLocator();
 	}
 
 	/**
@@ -99,6 +103,8 @@ public SeriesInfo parse(String htmlPage) {
 		info.setSellerUrl(extractSellerUrl(body));
 		info.setPrice(extractPrice(body));
 		info.setCurrency(extractCurrency(body));
+		info.setAltPrice(extractAltPrice(body));
+		info.setAltCurrency(extractAltCurrency(body));
 
 		return info;
 	}
@@ -241,6 +247,26 @@ protected String extractCurrency(Element body) {
 		return currencyValue;
 	}
 
+	protected String extractAltPrice(Element body) {
+		String price = getTextOfTheFirstElement(body, altPriceLocator);
+		if (price == null) {
+			return null;
+		}
+		
+		LOG.debug("Extracted alt price: '{}'", price);
+		return price;
+	}
+	
+	protected String extractAltCurrency(Element body) {
+		String currency = getTextOfTheFirstElement(body, altCurrencyLocator);
+		if (currency == null) {
+			return null;
+		}
+		
+		LOG.debug("Extracted alt currency: '{}'", currency);
+		return currency;
+	}
+	
 	private static Element getFirstElement(Element body, String locator) {
 		if (locator == null) {
 			return null;

src/main/java/ru/mystamps/web/feature/series/importing/extractor/SeriesInfo.java

@@ -41,6 +41,8 @@ public class SeriesInfo {
 	private String sellerUrl;
 	private String price;
 	private String currency;
+	private String altPrice;
+	private String altCurrency;
 
 	/**
 	 * Check whether any info about a series is available.

src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserConfiguration.java

@@ -46,6 +46,8 @@ public class SiteParserConfiguration {
 	private String priceLocator;
 	private String currencyLocator;
 	private String currencyValue;
+	private String altPriceLocator;
+	private String altCurrencyLocator;
 
 	/* default */ SiteParserConfiguration(Map<String, String> params) {
 		name = params.get("name");
@@ -62,6 +64,8 @@ public class SiteParserConfiguration {
 		// @todo #979 Add integration test for import of series with currency-locator
 		currencyLocator         = params.get("currency-locator");
 		currencyValue           = params.get("currency-value");
+		altPriceLocator         = params.get("alt-price-locator");
+		altCurrencyLocator      = params.get("alt-currency-locator");
 	}
 
 }

src/main/java/ru/mystamps/web/feature/series/importing/sale/JdbcSeriesSalesImportDao.java

@@ -48,6 +48,8 @@ public void addParsedData(Integer requestId, SeriesSalesParsedDataDbDto data) {
 		params.put("seller_url", data.getSellerUrl());
 		params.put("price", data.getPrice());
 		params.put("currency", data.getCurrency());
+		params.put("alt_price", data.getAltPrice());
+		params.put("alt_currency", data.getAltCurrency());
 		params.put("created_at", data.getCreatedAt());
 		params.put("updated_at", data.getUpdatedAt());
 

src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImpl.java

@@ -75,7 +75,9 @@ public SeriesSaleExtractedInfo downloadAndParse(String url) {
 			info.getSellerName(),
 			info.getSellerUrl(),
 			info.getPrice(),
-			info.getCurrency()
+			info.getCurrency(),
+			info.getAltPrice(),
+			info.getAltCurrency()
 		);
 
 		// CheckStyle: ignore LineLength for next 1 line

src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesParsedDataDbDto.java

@@ -34,6 +34,8 @@ public class SeriesSalesParsedDataDbDto {
 	private String sellerUrl;
 	private BigDecimal price;
 	private String currency;
+	private BigDecimal altPrice;
+	private String altCurrency;
 	private Date createdAt;
 	private Date updatedAt;
 

src/main/resources/liquibase/version/0.4.3.xml

@@ -6,5 +6,6 @@
 		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
 
 	<include file="0.4.3/2020-03-07--site_parser_params_value_length.xml" relativeToChangelogFile="true" />
+	<include file="0.4.3/2020-03-08--add_alt_price_to_series_sales_import_parsed_data.xml" relativeToChangelogFile="true" />
 
 </databaseChangeLog>

src/main/resources/liquibase/version/0.4.3/2020-03-08--add_alt_price_to_series_sales_import_parsed_data.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+	
+	<changeSet id="add-alt-price-to-series_sales_import_parsed_data" author="php-coder" context="scheme">
+		
+		<addColumn tableName="series_sales_import_parsed_data">
+			<column name="alt_price" type="DECIMAL(19,2)" afterColumn="currency" />
+			<column name="alt_currency" type="CHAR(3)" afterColumn="alt_price" />
+		</addColumn>
+		
+	</changeSet>
+	
+</databaseChangeLog>

src/main/resources/sql/series_import_request_dao_queries.properties

@@ -152,6 +152,8 @@ INSERT \
      , seller_name \
      , price \
      , currency \
+     , alt_price \
+     , alt_currency \
      , created_at \
      , updated_at \
      ) \
@@ -163,6 +165,8 @@ VALUES \
      , :seller_name \
      , :price \
      , :currency \
+     , :alt_price \
+     , :alt_currency \
      , :created_at \
      , :updated_at \
      )