fix(/series/import/request/{id}): don't show price when it's empty.

Fix #991

Author: php-coder

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

@@ -17,6 +17,7 @@
  */
 package ru.mystamps.web.feature.series.importing;
 
+import java.math.BigDecimal;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Date;
@@ -218,8 +219,12 @@ public void saveParsedData(Integer requestId, RawParsedDataDto data) {
 		seriesSalesParsedData.setSellerGroupId(seriesInfo.getSellerGroupId());
 		seriesSalesParsedData.setSellerName(seriesInfo.getSellerName());
 		seriesSalesParsedData.setSellerUrl(seriesInfo.getSellerUrl());
-		seriesSalesParsedData.setPrice(seriesInfo.getPrice());
-		seriesSalesParsedData.setCurrency(seriesInfo.getCurrency());
+		
+		BigDecimal price = seriesInfo.getPrice();
+		if (price != null) {
+			seriesSalesParsedData.setPrice(price);
+			seriesSalesParsedData.setCurrency(seriesInfo.getCurrency());
+		}
 
 		// IMPORTANT: don't add code that modifies database above this line!
 		// @todo #684 Series import: add integration test

src/main/resources/liquibase/version/0.4.xml

@@ -56,5 +56,6 @@
 	<include file="0.4/2018-07-15--series_import_parsed_data_group_id_field.xml" relativeToChangelogFile="true" />
 	<include file="0.4/2018-10-16--similar_series.xml" relativeToChangelogFile="true"/>
 	<include file="0.4/2018-12-03--site_parsers.xml" relativeToChangelogFile="true"/>
+	<include file="0.4/2018-12-20--nullify_currency_without_price.xml" relativeToChangelogFile="true"/>
 
 </databaseChangeLog>

src/main/resources/liquibase/version/0.4/2018-12-20--nullify_currency_without_price.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+		xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd">
+	
+	<changeSet id="nullify-prices-with-currency-only" author="php-coder" context="test-data, prod-data">
+		
+		<!-- Be caution: there is no rollback! -->
+		<sql>
+			UPDATE series_sales_import_parsed_data
+			   SET currency = NULL
+			 WHERE currency IS NOT NULL AND price IS NULL
+		</sql>
+		
+	</changeSet>
+	
+</databaseChangeLog>
+

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

@@ -427,7 +427,7 @@ <h3 th:text="#{t_gathered_data}">
 									</td>
 								</tr>
 
-								<tr th:if="${hasSalesInfo}" th:classappend="${#fields.hasErrors('seriesSale.price') or #fields.hasErrors('seriesSale.currency') ? 'has-error' : ''}">
+								<tr th:if="${hasSalesInfo and (importSeriesForm.seriesSale.price != null or !disabled)}" th:classappend="${#fields.hasErrors('seriesSale.price') or #fields.hasErrors('seriesSale.currency') ? 'has-error' : ''}">
 									<th>
 										<label for="price" class="control-label" th:text="#{t_price}">
 											Price