feat: a series condition is supported for series import, series sale import and creation.

This commit adds support only for series import. Series sales supported has already been added in
previous commits.

Fix #1326

Author: php-coder

NEWS.txt

@@ -5,6 +5,7 @@
 - (feature)     admin can add a comment to a series
 - (feature)     admin can add a release year to a series
 - (improvement) on a country info page show the series with an image
+- (feature)     add a condition (MNH/MNHOG/MVLH/CTO/cancelled) to a series sale
 
 0.4.3
 - (feature)        add support for Ukrainian hryvnia

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

@@ -49,6 +49,9 @@ public class ImportSeriesSalesForm implements AddSeriesSalesDto {
 	private BigDecimal altPrice;
 	private Currency altCurrency;
 
+	// @todo #1326 Series import: add integration test for series condition
+	private SeriesCondition condition;
+	
 	// 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.
@@ -65,9 +68,4 @@ public Integer getBuyerId() {
 		return null;
 	}
 
-	@Override
-	public SeriesCondition getCondition() {
-		return null;
-	}
-	
 }

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

@@ -171,6 +171,7 @@ public String showRequestAndImportSeriesForm(
 			seriesSaleForm.setCurrency(seriesSale.getCurrency());
 			seriesSaleForm.setAltPrice(seriesSale.getAltPrice());
 			seriesSaleForm.setAltCurrency(seriesSale.getAltCurrency());
+			seriesSaleForm.setCondition(seriesSale.getCondition());
 
 			ImportSellerForm sellerForm = new ImportSellerForm();
 			sellerForm.setName(seriesSale.getSellerName());

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

@@ -35,6 +35,7 @@
 import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportService;
 import ru.mystamps.web.feature.series.importing.sale.SeriesSalesParsedDataDbDto;
 import ru.mystamps.web.feature.series.sale.AddSeriesSalesDto;
+import ru.mystamps.web.feature.series.sale.SeriesCondition;
 import ru.mystamps.web.feature.series.sale.SeriesSalesService;
 import ru.mystamps.web.support.spring.security.HasAuthority;
 
@@ -231,6 +232,12 @@ public void saveParsedData(Integer requestId, SeriesExtractedInfo seriesInfo, St
 			seriesSalesParsedData.setAltCurrency(seriesInfo.getAltCurrency());
 		}
 
+		// @todo #1326 SeriesImportServiceImpl.saveParsedData(): add unit test for condition
+		SeriesCondition condition = seriesInfo.getCondition();
+		if (condition != null) {
+			seriesSalesParsedData.setCondition(condition.toString());
+		}
+		
 		// IMPORTANT: don't add code that modifies database above this line!
 		// @todo #684 Series import: add integration test
 		//  for the case when parsed value don't match database

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

@@ -50,6 +50,7 @@ public void addParsedData(Integer requestId, SeriesSalesParsedDataDbDto data) {
 		params.put("currency", data.getCurrency());
 		params.put("alt_price", data.getAltPrice());
 		params.put("alt_currency", data.getAltCurrency());
+		params.put("condition", data.getCondition());
 		params.put("created_at", data.getCreatedAt());
 		params.put("updated_at", data.getUpdatedAt());
 

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

@@ -19,6 +19,7 @@
 
 import ru.mystamps.web.common.Currency;
 import ru.mystamps.web.common.JdbcUtils;
+import ru.mystamps.web.feature.series.sale.SeriesCondition;
 
 import java.math.BigDecimal;
 import java.sql.ResultSet;
@@ -41,6 +42,10 @@ private RowMappers() {
 		Currency currency = JdbcUtils.getCurrency(rs, "currency");
 		BigDecimal altPrice = rs.getBigDecimal("alt_price");
 		Currency altCurrency = JdbcUtils.getCurrency(rs, "alt_currency");
+		
+		// LATER: consider extracting this into a helper method
+		String conditionField = rs.getString("cond");
+		SeriesCondition condition = rs.wasNull() ? null : SeriesCondition.valueOf(conditionField);
 
 		return new SeriesSaleParsedDataDto(
 			sellerId,
@@ -50,7 +55,8 @@ private RowMappers() {
 			price,
 			currency,
 			altPrice,
-			altCurrency
+			altCurrency,
+			condition
 		);
 	}
 

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

@@ -20,6 +20,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import ru.mystamps.web.common.Currency;
+import ru.mystamps.web.feature.series.sale.SeriesCondition;
 
 import java.math.BigDecimal;
 
@@ -34,4 +35,5 @@ public class SeriesSaleParsedDataDto {
 	private final Currency currency;
 	private final BigDecimal altPrice;
 	private final Currency altCurrency;
+	private final SeriesCondition condition;
 }

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

@@ -36,6 +36,7 @@ public class SeriesSalesParsedDataDbDto {
 	private String currency;
 	private BigDecimal altPrice;
 	private String altCurrency;
+	private String condition;
 	private Date createdAt;
 	private Date updatedAt;
 

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

@@ -10,5 +10,6 @@
 	<include file="0.4.4/2020-05-04--collections_series_condition.xml" relativeToChangelogFile="true" />
 	<include file="0.4.4/2020-05-23--modify_condition_field.xml" relativeToChangelogFile="true" />
 	<include file="0.4.4/2020-06-01--yvert_code_length.xml" relativeToChangelogFile="true" />
+	<include file="0.4.4/2020-06-03--series_sales_import_parsed_data_condition.xml" relativeToChangelogFile="true" />
 
 </databaseChangeLog>

src/main/resources/liquibase/version/0.4.4/2020-06-03--series_sales_import_parsed_data_condition.xml

@@ -0,0 +1,19 @@
+<?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.8.xsd">
+	
+	<changeSet id="add-condition-field-to-series_sales_import_parsed_data" author="php-coder" context="scheme">
+		
+		<addColumn tableName="series_sales_import_parsed_data">
+			<column name="cond"
+				type="VARCHAR(9)"
+				afterColumn="alt_currency"
+				remarks="Must match to the series_sales.cond field" />
+		</addColumn>
+		
+	</changeSet>
+	
+</databaseChangeLog>

src/main/resources/sql/series_import_request_dao_queries.properties

@@ -160,6 +160,7 @@ INSERT \
      , currency \
      , alt_price \
      , alt_currency \
+     , cond \
      , created_at \
      , updated_at \
      ) \
@@ -173,6 +174,7 @@ VALUES \
      , :currency \
      , :alt_price \
      , :alt_currency \
+     , :condition \
      , :created_at \
      , :updated_at \
      )
@@ -186,5 +188,6 @@ SELECT seller_id \
       , currency \
       , alt_price \
       , alt_currency \
+      , cond \
  FROM series_sales_import_parsed_data \
 WHERE request_id = :request_id

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

@@ -522,6 +522,32 @@ <h3 th:text="#{t_gathered_data}">
 									</td>
 								</tr>
 
+								<tr th:if="${hasSalesInfo and (importSeriesForm.seriesSale.condition != null)}"
+									th:classappend="${#fields.hasErrors('seriesSale.condition') ? 'has-error' : ''}">
+									<th>
+										<label for="condition" class="control-label" th:text="#{t_condition}">
+											Condition
+										</label>
+									</th>
+									<td>
+										<select id="condition" class="form-control" th:field="*{seriesSale.condition}" th:disabled="${disabled}">
+											<option value=""></option>
+											<option value="MNH">MNH</option>
+											<option value="MNHOG">MNHOG</option>
+											<option value="MVLH">MVLH</option>
+											<option value="CTO">CTO</option>
+											<option value="CANCELLED" th:text="#{t_cancelled}">Сancelled</option>
+										</select>
+										<!--/*/
+										<span id="condition.errors"
+											class="help-block"
+											th:if="${#fields.hasErrors('seriesSale.condition')}"
+											th:each="error : ${#fields.errors('seriesSale.condition')}"
+											th:text="${error}"></span>
+										/*/-->
+									</td>
+								</tr>
+								
 								<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}">

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

@@ -436,7 +436,8 @@ public static SeriesSaleParsedDataDto createSeriesSaleParsedDataDto() {
 			Random.currency(),
 			Random.price(),
 			// FIXME: alternative currency shouldn't match with currency
-			Random.currency()
+			Random.currency(),
+			nullOr(Random.seriesCondition())
 		);
 	}