feat(series import): add support for currency-locator.

When specified tries to extract currency from an element identified by a locator. Fallbacks to
"currency-value" otherwise.

Fix #979

Author: php-coder

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

@@ -54,6 +54,7 @@ public class JsoupSiteParser implements SiteParser {
 	private String issueDateLocator;
 	private String sellerLocator;
 	private String priceLocator;
+	private String currencyLocator;
 	private String currencyValue;
 
 	// @todo #975 SiteParserServiceImpl: add unit tests for constructor
@@ -68,6 +69,7 @@ public JsoupSiteParser(SiteParserConfiguration cfg) {
 		issueDateLocator        = cfg.getIssueDateLocator();
 		sellerLocator           = cfg.getSellerLocator();
 		priceLocator            = cfg.getPriceLocator();
+		currencyLocator         = cfg.getCurrencyLocator();
 		currencyValue           = cfg.getCurrencyValue();
 	}
 
@@ -219,6 +221,13 @@ protected String extractPrice(Element body) {
 	}
 
 	protected String extractCurrency(Element body) {
+		if (currencyLocator != null) {
+			String currency = getTextOfTheFirstElement(body, currencyLocator);
+			if (currency != null) {
+				return currency;
+			}
+		}
+		
 		if (currencyValue == null) {
 			return null;
 		}

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

@@ -44,6 +44,7 @@ public class SiteParserConfiguration {
 	private String issueDateLocator;
 	private String sellerLocator;
 	private String priceLocator;
+	private String currencyLocator;
 	private String currencyValue;
 
 	/* default */ SiteParserConfiguration(Map<String, String> params) {
@@ -58,6 +59,8 @@ public class SiteParserConfiguration {
 		issueDateLocator        = params.get("issue-date-locator");
 		sellerLocator           = params.get("seller-locator");
 		priceLocator            = params.get("price-locator");
+		// @todo #979 Add integration test for import of series with currency-locator
+		currencyLocator         = params.get("currency-locator");
 		currencyValue           = params.get("currency-value");
 	}
 

src/test/java/ru/mystamps/web/feature/series/importing/extractor/JsoupSiteParserTest.java

@@ -81,7 +81,7 @@ public void parseShouldExtractSeriesInfo() {
 		parser.setImageUrlLocator("#image-url");
 		parser.setSellerLocator("#seller-info");
 		parser.setPriceLocator("#price");
-		parser.setCurrencyValue(expectedCurrency);
+		parser.setCurrencyLocator("#currency");
 
 		SeriesInfo expectedInfo = new SeriesInfo();
 		expectedInfo.setCategoryName(expectedCategory);
@@ -102,6 +102,7 @@ public void parseShouldExtractSeriesInfo() {
 					+ "<a id='image-url' href='%s'>look at image</a>"
 					+ "<a id='seller-info' href='%s'>%s</a>"
 					+ "<p id='price'>%s</p>"
+					+ "<p id='currency'>%s</p>"
 				+ "</body>"
 			+ "</html",
 			expectedCategory,
@@ -110,7 +111,8 @@ public void parseShouldExtractSeriesInfo() {
 			imageUrl,
 			expectedSellerUrl,
 			expectedSellerName,
-			expectedPrice
+			expectedPrice,
+			expectedCurrency
 		);
 
 		SeriesInfo info = parser.parse(html);
@@ -135,6 +137,7 @@ public void parseShouldExtractSeriesInfoFromFirstMatchedElements() {
 		String expectedSellerName = Random.sellerName();
 		String expectedSellerUrl = baseUri + sellerUrl;
 		String expectedPrice = Random.price().toString();
+		String expectedCurrency = Random.currency().toString();
 
 		parser.setMatchedUrl(baseUri);
 		parser.setCategoryLocator("h1");
@@ -143,6 +146,7 @@ public void parseShouldExtractSeriesInfoFromFirstMatchedElements() {
 		parser.setImageUrlLocator("a.image");
 		parser.setSellerLocator("a.seller");
 		parser.setPriceLocator("b");
+		parser.setCurrencyLocator("div");
 
 		SeriesInfo expectedInfo = new SeriesInfo();
 		expectedInfo.setCategoryName(expectedCategory);
@@ -152,6 +156,7 @@ public void parseShouldExtractSeriesInfoFromFirstMatchedElements() {
 		expectedInfo.setSellerName(expectedSellerName);
 		expectedInfo.setSellerUrl(expectedSellerUrl);
 		expectedInfo.setPrice(expectedPrice);
+		expectedInfo.setCurrency(expectedCurrency);
 
 		String html = String.format(
 			"<html>"
@@ -162,12 +167,14 @@ public void parseShouldExtractSeriesInfoFromFirstMatchedElements() {
 					+ "<a class='image' href='%s'>look at image</a>"
 					+ "<a class='seller' href='%s'>%s</a>"
 					+ "<b>%s</b>"
+					+ "<div>%s</div>"
 					+ "<h1>ignored</h1>"
 					+ "<p>ignored</p>"
 					+ "<span>ignored</span>"
 					+ "<a class='image' href='none'>look at image</a>"
 					+ "<a class='seller' href='none'>seller name</a>"
 					+ "<b>ignored</b>"
+					+ "<div>ignored</div>"
 				+ "</body>"
 			+ "</html",
 			expectedCategory,
@@ -176,7 +183,8 @@ public void parseShouldExtractSeriesInfoFromFirstMatchedElements() {
 			expectedImageUrl,
 			expectedSellerUrl,
 			expectedSellerName,
-			expectedPrice
+			expectedPrice,
+			expectedCurrency
 		);
 
 		SeriesInfo info = parser.parse(html);
@@ -645,20 +653,39 @@ public void extractPriceShouldIgnoreTextOfChildrenTags() {
 	//
 
 	@Test
-	public void extractCurrencyShouldReturnNullWhenCurrencyValueIsNotSet() {
+	public void extractCurrencyShouldReturnNullWhenCurrencyValuesAreNotSet() {
 		parser.setCurrencyValue(null);
+		parser.setCurrencyLocator(null);
 
 		String currency = parser.extractCurrency(null);
 
 		assertThat(currency).isNull();
 	}
 
+	@Test
+	public void extractCurrencyShouldReturnValueOfCurrencyLocator() {
+		String expectedValue = "CZK";
+		
+		parser.setCurrencyLocator("#currency");
+		parser.setCurrencyValue("RUB");
+		
+		String html = String.format("<span id='currency'>%s</span>", expectedValue);
+		Element doc = createDocumentFromText(html);
+		
+		String currency = parser.extractCurrency(doc);
+		
+		assertThat(currency).as("couldn't extract currency from '%s'", doc)
+			.isEqualTo(expectedValue);
+	}
+	
 	@Test
 	public void extractCurrencyShouldReturnCurrencyValue() {
 		String expectedCurrency = Random.currency().toString();
 		parser.setCurrencyValue(expectedCurrency);
+		parser.setCurrencyLocator(Random.jsoupLocator());
+		Element doc = createEmptyDocument();
 
-		String currency = parser.extractCurrency(null);
+		String currency = parser.extractCurrency(doc);
 
 		assertThat(currency).isEqualTo(expectedCurrency);
 	}