fix(series import): extract price when a fragment contains other words (for example, currency).

Author: php-coder

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

@@ -366,23 +366,33 @@ public SeriesExtractedInfo extract(String pageUrl, RawParsedDataDto data) {
 		return url;
 	}
 
+	@SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
 	/* default */ BigDecimal extractPrice(String fragment) {
 		if (StringUtils.isBlank(fragment)) {
 			return null;
 		}
 
 		log.debug("Determine price from '{}'", fragment);
 
-		try {
-			BigDecimal price = new BigDecimal(fragment);
-			log.debug("Price is {}", price);
-			// @todo #695 SeriesInfoExtractorServiceImpl.extractPrice(): filter out values <= 0
-			return price;
-			
-		} catch (NumberFormatException ex) {
-			log.debug("Could not extract price: {}", ex.getMessage());
-			return null;
+		String[] candidates = StringUtils.split(fragment, ' ');
+		for (String candidate : candidates) {
+			// replace comma with dot to handle 10,5 in the same way as 10.5
+			if (candidate.contains(",")) {
+				candidate = StringUtils.replaceChars(candidate, ',', '.');
+			}
+			try {
+				BigDecimal price = new BigDecimal(candidate);
+				log.debug("Price is {}", price);
+				// @todo #695 SeriesInfoExtractorServiceImpl.extractPrice(): filter out values <= 0
+				return price;
+
+			} catch (NumberFormatException ignored) {
+				// continue with the next candidate
+			}
 		}
+		
+		log.debug("Could not extract price from a fragment");
+		return null;
 	}
 
 	/* default */ String extractCurrency(String fragment) {

src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImplTest.groovy

@@ -591,7 +591,7 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
 			result == null
 	}
 
-	def 'extractPrice() should extract price from a fragment'() {
+	def 'extractPrice() should extract exactly specified price'() {
 		given:
 			BigDecimal expectedPrice = Random.price()
 		when:
@@ -600,6 +600,19 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
 			result == expectedPrice
 	}
 
+	@Unroll
+	def 'extractPrice() should extract "10" from "#fragment"'(String fragment) {
+		expect:
+			service.extractPrice(fragment) == BigDecimal.TEN
+		where:
+			fragment        | _
+			'10 EUR'        | _
+			'10.0 EUR'      | _
+			'10.00 EUR'     | _
+			'10,00 EUR'     | _
+			'10 руб 16 коп' | _
+	}
+	
 	//
 	// Tests for extractCurrency()
 	//