Skip to content

Commit 60a690c

Browse files
committed
task: show a condition in a series sales list.
Part of #1326
1 parent 8dbd9e1 commit 60a690c

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

src/main/java/ru/mystamps/web/feature/series/PurchaseAndSaleDto.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import lombok.Getter;
2121
import lombok.RequiredArgsConstructor;
2222
import ru.mystamps.web.common.Currency;
23+
import ru.mystamps.web.feature.series.sale.SeriesCondition;
2324

2425
import java.math.BigDecimal;
2526
import java.util.Date;
@@ -41,4 +42,5 @@ public class PurchaseAndSaleDto {
4142
private final Currency firstCurrency;
4243
private final BigDecimal secondPrice;
4344
private final Currency secondCurrency;
45+
private final SeriesCondition condition;
4446
}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import ru.mystamps.web.common.Currency;
2121
import ru.mystamps.web.common.JdbcUtils;
2222
import ru.mystamps.web.common.LinkEntityDto;
23+
import ru.mystamps.web.feature.series.sale.SeriesCondition;
2324

2425
import java.math.BigDecimal;
2526
import java.sql.ResultSet;
@@ -98,6 +99,10 @@ private RowMappers() {
9899
BigDecimal secondPrice = rs.getBigDecimal("second_price");
99100
Currency secondCurrency = JdbcUtils.getCurrency(rs, "second_currency");
100101

102+
// LATER: consider extracting this into a helper method
103+
String conditionField = rs.getString("condition");
104+
SeriesCondition condition = rs.wasNull() ? null : SeriesCondition.valueOf(conditionField);
105+
101106
return new PurchaseAndSaleDto(
102107
date,
103108
sellerName,
@@ -108,7 +113,8 @@ private RowMappers() {
108113
firstPrice,
109114
firstCurrency,
110115
secondPrice,
111-
secondCurrency
116+
secondCurrency,
117+
condition
112118
);
113119
}
114120

src/main/resources/sql/series_dao_queries.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ series.find_purchases_and_sales_by_series_id = \
183183
, first_currency \
184184
, second_price \
185185
, second_currency \
186+
, condition \
186187
FROM series_sales ss \
187188
JOIN transaction_participants seller \
188189
ON seller.id = ss.seller_id \

0 commit comments

Comments
 (0)