task: show alternative price and currency during a series import.

Also update the integration test to check for alternative price and currency.

Part of #1230

Author: php-coder

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

@@ -43,29 +43,22 @@ public class ImportSeriesSalesForm implements AddSeriesSalesDto {
 	@NotNull
 	private Currency currency;
 
+	// CheckStyle: ignore LineLength for next 1 line
+	// @todo #1230 /series/import/request/{id}: validate that both alt price/currency are present or absent
+	private BigDecimal altPrice;
+	private Currency altCurrency;
+	
 	// We don't expose these fields to a form because we know already what
 	// values should be. Even if user will try to provide its own values, it's not
 	// a problem as we always rewrite them in the controller.
 	private Date date;
 	private String url;
 
 	//
-	// The methods bellow required for AddSeriesSalesDto interface.
-	// They are no-op methods because we don't support all values during series import.
+	// The method below is required for AddSeriesSalesDto interface.
+	// It is no-op method because we don't support all values during series import.
 	//
 
-	// For future: altPrice is required when altCurrency is specified
-	@Override
-	public BigDecimal getAltPrice() {
-		return null;
-	}
-	
-	// For future: altCurrency is required when altPrice is specified
-	@Override
-	public Currency getAltCurrency() {
-		return null;
-	}
-	
 	@Override
 	public Integer getBuyerId() {
 		return null;

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

@@ -167,6 +167,8 @@ public String showRequestAndImportSeriesForm(
 			seriesSaleForm.setSellerId(seriesSale.getSellerId());
 			seriesSaleForm.setPrice(seriesSale.getPrice());
 			seriesSaleForm.setCurrency(seriesSale.getCurrency());
+			seriesSaleForm.setAltPrice(seriesSale.getAltPrice());
+			seriesSaleForm.setAltCurrency(seriesSale.getAltCurrency());
 
 			ImportSellerForm sellerForm = new ImportSellerForm();
 			sellerForm.setName(seriesSale.getSellerName());

src/main/java/ru/mystamps/web/feature/series/importing/sale/RowMappers.java

@@ -39,14 +39,18 @@ private RowMappers() {
 		String sellerUrl = rs.getString("seller_url");
 		BigDecimal price = rs.getBigDecimal("price");
 		Currency currency = JdbcUtils.getCurrency(rs, "currency");
+		BigDecimal altPrice = rs.getBigDecimal("alt_price");
+		Currency altCurrency = JdbcUtils.getCurrency(rs, "alt_currency");
 
 		return new SeriesSaleParsedDataDto(
 			sellerId,
 			sellerGroupId,
 			sellerName,
 			sellerUrl,
 			price,
-			currency
+			currency,
+			altPrice,
+			altCurrency
 		);
 	}
 

src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleParsedDataDto.java

@@ -32,4 +32,6 @@ public class SeriesSaleParsedDataDto {
 	private final String sellerUrl;
 	private final BigDecimal price;
 	private final Currency currency;
+	private final BigDecimal altPrice;
+	private final Currency altCurrency;
 }

src/main/resources/liquibase/version/0.4/2018-12-03--site_parsers.xml

@@ -155,6 +155,18 @@
 			<column name="value" value="RUB" />
 		</insert>
 
+		<insert tableName="site_parser_params">
+			<column name="parser_id" valueComputed="(SELECT id FROM site_parsers WHERE name = 'mockserver')" />
+			<column name="name" value="alt-price-locator" />
+			<column name="value" value="#alt-price" />
+		</insert>
+		
+		<insert tableName="site_parser_params">
+			<column name="parser_id" valueComputed="(SELECT id FROM site_parsers WHERE name = 'mockserver')" />
+			<column name="name" value="alt-currency-locator" />
+			<column name="value" value="#alt-currency" />
+		</insert>
+		
 	</changeSet>
 
 </databaseChangeLog>

src/main/resources/sql/series_import_request_dao_queries.properties

@@ -178,5 +178,7 @@ SELECT seller_id \
       , seller_name \
       , price \
       , currency \
+      , alt_price \
+      , alt_currency \
  FROM series_sales_import_parsed_data \
 WHERE request_id = :request_id

src/main/webapp/WEB-INF/views/series/import/info.html

@@ -495,6 +495,63 @@ <h3 th:text="#{t_gathered_data}">
 									</td>
 								</tr>
 
+								<tr th:if="${hasSalesInfo and (importSeriesForm.seriesSale.altPrice != null or !disabled)}"
+									th:classappend="${#fields.hasErrors('seriesSale.altPrice') or #fields.hasErrors('seriesSale.altCurrency') ? 'has-error' : ''}">
+									<th>
+										<label for="alt-price" class="control-label" th:text="#{t_alternative_price}">
+											Alternative price
+										</label>
+									</th>
+									<td>
+										<table>
+											<tr>
+												<td width="30%">
+													<input id="alt-price"
+														type="text"
+														class="form-control"
+														size="5"
+														value="2300"
+														th:field="*{seriesSale.altPrice}"
+														th:disabled="${disabled}" />
+												</td>
+												<td width="30%">
+													<select id="alt-currency" class="form-control" th:field="*{seriesSale.altCurrency}" th:disabled="${disabled}">
+														<option value=""></option>
+														<option value="USD">USD</option>
+														<option value="EUR">EUR</option>
+														<option value="GBP">GBP</option>
+														<option value="RUB">RUB</option>
+														<option value="CZK" selected="selected">CZK</option>
+														<option value="BYN">BYN</option>
+														<option value="UAH">UAH</option>
+													</select>
+												</td>
+												<td width="40%"></td>
+											</tr>
+											<!--/*/
+											<tr>
+												<td>
+													<span id="alt-price.errors"
+														class="help-block"
+														th:if="${#fields.hasErrors('seriesSale.altPrice')}"
+														th:each="error : ${#fields.errors('seriesSale.altPrice')}"
+														th:text="${error}"></span>
+												</td>
+											</tr>
+											<tr>
+												<td>
+													<span id="alt-currency.errors"
+														class="help-block"
+														th:if="${#fields.hasErrors('seriesSale.altCurrency')}"
+														th:each="error : ${#fields.errors('seriesSale.altCurrency')}"
+														th:text="${error}"></span>
+												</td>
+											</tr>
+											/*/-->
+										</table>
+									</td>
+								</tr>
+								
 								<tr th:unless="${disabled}">
 									<td></td>
 									<td>

src/test/java/ru/mystamps/web/service/TestObjects.java

@@ -395,6 +395,9 @@ public static SeriesSaleParsedDataDto createSeriesSaleParsedDataDto() {
 			sellerName,
 			sellerUrl,
 			Random.price(),
+			Random.currency(),
+			Random.price(),
+			// FIXME: alternative currency shouldn't match with currency
 			Random.currency()
 		);
 	}

src/test/robotframework/series/import/request-logic.robot

@@ -93,20 +93,24 @@ Import series and series sale with existing seller from an external site
 	Submit Form                 id:import-series-form
 	${requestLocation}=         Get Location
 	# sale info should be parsed and shown at the request page
-	List Selection Should Be    id:seller    Eicca Toppinen
-	Textfield Value Should Be   id:price     111
-	List Selection Should Be    id:currency  RUB
+	List Selection Should Be    id:seller        Eicca Toppinen
+	Textfield Value Should Be   id:price         111
+	List Selection Should Be    id:currency      RUB
+	Textfield Value Should Be   id:alt-price     1.5
+	List Selection Should Be    id:alt-currency  EUR
 	Submit Form                 id:create-series-form
 	# after importing a series, sale info should be shown at the info page
 	${currentDate}=             Get Current Date  result_format=%d.%m.%Y
-	Element Text Should Be      id:series-sale-1-info         ${currentDate} Eicca Toppinen was selling for 111.00 RUB
+	Element Text Should Be      id:series-sale-1-info         ${currentDate} Eicca Toppinen was selling for 111.00 RUB (1.50 EUR)
 	Link Should Point To        id:series-sale-1-seller       http://example.com/eicca-toppinen
 	Link Should Point To        id:series-sale-1-transaction  ${MOCK_SERVER}/series/import/request-logic/existing-seller.html
 	Go To                       ${requestLocation}
 	# after importing a series, sale info at the request page should be shown as read-only
 	Element Should Be Disabled  id:seller
 	Element Should Be Disabled  id:price
 	Element Should Be Disabled  id:currency
+	Element Should Be Disabled  id:alt-price
+	Element Should Be Disabled  id:alt-currency
 
 Import series and series sale with a new seller from an external site
 	[Documentation]             Verify import series and sale (with a new seller)

src/test/wiremock/__files/series/import/request-logic/existing-seller.html

@@ -7,7 +7,7 @@
 	<body>
 		Image:  <a id="test-image" href="http://127.0.0.1:8080/image/1">series image</a><br />
 		Seller: <a id="test-seller" href="http://example.com/eicca-toppinen">Eicca Toppinen</a><br />
-		Price:  <span id="test-price">111</span> RUB<br />
+		Price:  <span id="test-price">111</span> RUB (<span id="alt-price">1.5</span> <span id="alt-currency">EUR</span>)<br />
 		<!--
 			This is needed to simplify an integration test:
 			required fields "category" and "quantity" will be filled automatically