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

php-coder · php-coder · commit 431dd2e262c7 · 2020-03-09T21:34:26.000Z
Part of #1230
diff --git a/src/main/frontend/src/components/SeriesSaleImportForm.js b/src/main/frontend/src/components/SeriesSaleImportForm.js
@@ -69,6 +69,14 @@ class SeriesSaleImportForm extends React.Component {
 				document.getElementById('currency').value = data.currency;
 			}
 			
+			if (data.altPrice) {
+				document.getElementById('alt-price').value = data.altPrice;
+			}
+			
+			if (data.altCurrency) {
+				document.getElementById('alt-currency').value = data.altCurrency;
+			}
+			
 			if (data.sellerId) {
 				document.getElementById('seller').value = data.sellerId;
 			}
diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleExtractedInfo.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleExtractedInfo.java
@@ -28,4 +28,6 @@ public class SeriesSaleExtractedInfo {
 	private final Integer sellerId;
 	private final BigDecimal price;
 	private final String currency;
+	private final BigDecimal altPrice;
+	private final String altCurrency;
 }
diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImpl.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImpl.java
@@ -87,7 +87,9 @@ public SeriesSaleExtractedInfo downloadAndParse(String url) {
 		return new SeriesSaleExtractedInfo(
 			seriesInfo.getSellerId(),
 			seriesInfo.getPrice(),
-			seriesInfo.getCurrency()
+			seriesInfo.getCurrency(),
+			seriesInfo.getAltPrice(),
+			seriesInfo.getAltCurrency()
 		);
 	}
 	
diff --git a/src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java b/src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java
@@ -32,7 +32,7 @@ public final class ResourceUrl {
 	public static final String STATIC_RESOURCES_URL = "https://stamps.filezz.ru";
 	
 	// MUST be updated when any of our resources were modified
-	public static final String RESOURCES_VERSION = "v0.4.2.4";
+	public static final String RESOURCES_VERSION = "v0.4.2.5";
 
 	// CheckStyle: ignore LineLength for next 10 lines
 	private static final String CATALOG_UTILS_JS    = "/public/js/" + RESOURCES_VERSION + "/CatalogUtils.min.js";
diff --git a/src/test/robotframework/series/sales/import/logic.robot b/src/test/robotframework/series/sales/import/logic.robot
@@ -18,6 +18,8 @@ Import a series sale with an existing seller
 	List Selection Should Be     id:seller           Eicca Toppinen
 	Textfield Value Should Be    id:price            350
 	List Selection Should Be     id:currency         RUB
+	Textfield Value Should Be    id:alt-price        6.3
+	List Selection Should Be     id:alt-currency     EUR
 
 Import a series sale without information
 	Input Text                     id:series-sale-url  ${MOCK_SERVER}/series/sales/import/logic/empty.html
diff --git a/src/test/wiremock/__files/series/sales/import/logic/existing-seller.html b/src/test/wiremock/__files/series/sales/import/logic/existing-seller.html
@@ -6,6 +6,6 @@
 	</head>
 	<body>
 		Seller: <a id="test-seller" href="http://example.com/eicca-toppinen">Eicca Toppinen</a><br />
-		Price:  <span id="test-price">350</span><br />
+		Price:  <span id="test-price">350</span> (<span id="alt-price">6.3</span> <span id="alt-currency">EUR</span>)<br />
 	</body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,14 @@ class SeriesSaleImportForm extends React.Component {`
`69`	`69`	`document.getElementById('currency').value = data.currency;`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ if (data.altPrice) {`
	`73`	`+ document.getElementById('alt-price').value = data.altPrice;`
	`74`	`+ }`
	`75`	`+`
	`76`	`+ if (data.altCurrency) {`
	`77`	`+ document.getElementById('alt-currency').value = data.altCurrency;`
	`78`	`+ }`
	`79`	`+`
`72`	`80`	`if (data.sellerId) {`
`73`	`81`	`document.getElementById('seller').value = data.sellerId;`
`74`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,6 @@ public class SeriesSaleExtractedInfo {`
`28`	`28`	`private final Integer sellerId;`
`29`	`29`	`private final BigDecimal price;`
`30`	`30`	`private final String currency;`
	`31`	`+ private final BigDecimal altPrice;`
	`32`	`+ private final String altCurrency;`
`31`	`33`	`}`