Skip to content

Commit d210b20

Browse files
committed
improve: detect US dollar currency when the price is prefixed with "US$"
1 parent 9ebc064 commit d210b20

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public class SeriesInfoExtractorServiceImpl implements SeriesInfoExtractorServic
8585
private static final Pattern UAH_CURRENCY_REGEXP = Pattern.compile("([0-9] |\\b)грн\\b");
8686

8787
// Regular expression that matches US dollar.
88-
private static final Pattern USD_CURRENCY_REGEXP = Pattern.compile("[0-9]\\$");
88+
private static final Pattern USD_CURRENCY_REGEXP = Pattern.compile("([0-9]\\$|US\\$[0-9])");
8989

9090
// CheckStyle: ignore LineLength for next 4 lines
9191
private static final Pattern VALID_CATEGORY_NAME_EN = Pattern.compile(CategoryValidation.NAME_EN_REGEXP);

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -743,8 +743,9 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
743743
expect:
744744
service.extractCurrency(fragment) == 'USD'
745745
where:
746-
fragment | _
747-
'1,36$' | _
746+
fragment | _
747+
'1,36$' | _
748+
'US$16.50' | _
748749
}
749750

750751
}

0 commit comments

Comments
 (0)