Skip to content

Commit add39cc

Browse files
committed
fix(series import): fix incorrect quantity extraction when a fragment doesn't contain "stamps" word.
Part of #1376
1 parent b0e772b commit add39cc

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class SeriesInfoExtractorServiceImpl implements SeriesInfoExtractorServic
6363
// Regular expression matches number of the stamps in a series.
6464
// CheckStyle: ignore LineLength for next 2 lines
6565
private static final Pattern NUMBER_OF_STAMPS_REGEXP = Pattern.compile(
66-
"(?<quantity>[1-9][0-9]*)(-?(ти|ой|ух))?( ((без)?зубцов(ая|ы[ех])))?\\*{0,2}| (мар(ок|к[аи])|(люкс[- ])?блок(а|ов)?|БЛ))",
66+
"(?<quantity>[1-9][0-9]*)(-?(ти|ой|ух))?( ((без)?зубцов(ая|ы[ех])))?[ ]?(м(ар(ок|к[аи])|\\b)|(люкс[- ])?блок(а|ов)?|БЛ)",
6767
Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
6868
);
6969

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

+1
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
394394
fragment | _
395395
'2 чего-либо' | _
396396
'0 марок' | _
397+
'№1576-1578=4,2МЕ' | _
397398
'Велоцираптор 2003 Блок с/з' | _
398399
(SeriesValidation.MAX_STAMPS_IN_SERIES + 1) + ' марок' | _
399400
}

0 commit comments

Comments
 (0)