Remove fixed currency values from service and dao code.

Addressed to #778

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/dao/dto/AddSeriesDbDto.java

@@ -36,17 +36,9 @@ public class AddSeriesDbDto {
 	private Boolean perforated;
 
 	private BigDecimal michelPrice;
-	private String michelCurrency;
-	
 	private BigDecimal scottPrice;
-	private String scottCurrency;
-	
 	private BigDecimal yvertPrice;
-	private String yvertCurrency;
-	
 	private BigDecimal gibbonsPrice;
-	private String gibbonsCurrency;
-	
 	private BigDecimal solovyovPrice;
 	private BigDecimal zagorskiPrice;
 

src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesDao.java

@@ -127,13 +127,9 @@ public Integer add(AddSeriesDbDto series) {
 		params.put("release_month", series.getReleaseMonth());
 		params.put("release_year", series.getReleaseYear());
 		params.put("michel_price", series.getMichelPrice());
-		params.put("michel_currency", series.getMichelCurrency());
 		params.put("scott_price", series.getScottPrice());
-		params.put("scott_currency", series.getScottCurrency());
 		params.put("yvert_price", series.getYvertPrice());
-		params.put("yvert_currency", series.getYvertCurrency());
 		params.put("gibbons_price", series.getGibbonsPrice());
-		params.put("gibbons_currency", series.getGibbonsCurrency());
 		params.put("solovyov_price", series.getSolovyovPrice());
 		params.put("zagorski_price", series.getZagorskiPrice());
 		params.put("comment", series.getComment());

src/main/java/ru/mystamps/web/service/SeriesServiceImpl.java

@@ -34,7 +34,6 @@
 
 import ru.mystamps.web.dao.SeriesDao;
 import ru.mystamps.web.dao.dto.AddSeriesDbDto;
-import ru.mystamps.web.dao.dto.Currency;
 import ru.mystamps.web.dao.dto.ImageInfoDto;
 import ru.mystamps.web.dao.dto.PurchaseAndSaleDto;
 import ru.mystamps.web.dao.dto.SeriesFullInfoDto;
@@ -92,22 +91,18 @@ public Integer add(AddSeriesDto dto, Integer userId, boolean userCanAddComments)
 
 		if (dto.getMichelPrice() != null) {
 			series.setMichelPrice(dto.getMichelPrice());
-			series.setMichelCurrency(Currency.EUR.toString());
 		}
 
 		if (dto.getScottPrice() != null) {
 			series.setScottPrice(dto.getScottPrice());
-			series.setScottCurrency(Currency.USD.toString());
 		}
 
 		if (dto.getYvertPrice() != null) {
 			series.setYvertPrice(dto.getYvertPrice());
-			series.setYvertCurrency(Currency.EUR.toString());
 		}
 
 		if (dto.getGibbonsPrice() != null) {
 			series.setGibbonsPrice(dto.getGibbonsPrice());
-			series.setGibbonsCurrency(Currency.GBP.toString());
 		}
 
 		if (dto.getSolovyovPrice() != null) {

src/main/resources/sql/series_dao_queries.properties

@@ -33,13 +33,13 @@ VALUES \
      , :release_month \
      , :release_year \
      , :michel_price \
-     , :michel_currency \
+     , 'EUR' \
      , :scott_price \
-     , :scott_currency \
+     , 'USD' \
      , :yvert_price \
-     , :yvert_currency \
+     , 'EUR' \
      , :gibbons_price \
-     , :gibbons_currency \
+     , 'GBP' \
      , :solovyov_price \
      , :zagorski_price \
      , :comment \

src/test/groovy/ru/mystamps/web/service/SeriesServiceImplTest.groovy

@@ -231,95 +231,75 @@ class SeriesServiceImplTest extends Specification {
 	}
 
 	@Unroll
-	@SuppressWarnings([
-		'ClosureAsLastMethodParameter',
-		'UnnecessaryReturnKeyword',
-		'LineLength',
-	])
-	def "add() should pass michel price (#expectedPrice) and currency (#expectedCurrency) to series dao"(BigDecimal expectedPrice, String expectedCurrency) {
+	@SuppressWarnings([ 'ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword' ])
+	def 'add() should pass michel price (#expectedPrice) to series dao'(BigDecimal expectedPrice) {
 		given:
 			form.setMichelPrice(expectedPrice)
 		when:
 			service.add(form, Random.userId(), bool())
 		then:
 			1 * seriesDao.add({ AddSeriesDbDto series ->
 				assert series?.michelPrice == expectedPrice
-				assert series?.michelCurrency == expectedCurrency
 				return true
 			}) >> Random.id()
 		where:
-			expectedPrice  | expectedCurrency
-			Random.price() | Currency.EUR.toString()
-			null           | null
+			expectedPrice  | _
+			Random.price() | _
+			null           | _
 	}
 
 	@Unroll
-	@SuppressWarnings([
-		'ClosureAsLastMethodParameter',
-		'LineLength',
-		'UnnecessaryReturnKeyword',
-	])
-	def "add() should pass scott price (#expectedPrice) and currency (#expectedCurrency) to series dao"(BigDecimal expectedPrice, String expectedCurrency) {
+	@SuppressWarnings([ 'ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword' ])
+	def 'add() should pass scott price (#expectedPrice) to series dao'(BigDecimal expectedPrice) {
 		given:
 			form.setScottPrice(expectedPrice)
 		when:
 			service.add(form, Random.userId(), bool())
 		then:
 			1 * seriesDao.add({ AddSeriesDbDto series ->
 				assert series?.scottPrice == expectedPrice
-				assert series?.scottCurrency == expectedCurrency
 				return true
 			}) >> Random.id()
 		where:
-			expectedPrice  | expectedCurrency
-			Random.price() | Currency.USD.toString()
-			null           | null
+			expectedPrice  | _
+			Random.price() | _
+			null           | _
 	}
 
 	@Unroll
-	@SuppressWarnings([
-		'ClosureAsLastMethodParameter',
-		'LineLength',
-		'UnnecessaryReturnKeyword',
-	])
-	def "add() should pass yvert price (#expectedPrice) and currency (#expectedCurrency) to series dao"(BigDecimal expectedPrice, String expectedCurrency) {
+	@SuppressWarnings([ 'ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword' ])
+	def 'add() should pass yvert price (#expectedPrice) to series dao'(BigDecimal expectedPrice) {
 		given:
 			form.setYvertPrice(expectedPrice)
 		when:
 			service.add(form, Random.userId(), bool())
 		then:
 			1 * seriesDao.add({ AddSeriesDbDto series ->
 				assert series?.yvertPrice == expectedPrice
-				assert series?.yvertCurrency == expectedCurrency
 				return true
 			}) >> Random.id()
 		where:
-			expectedPrice  | expectedCurrency
-			Random.price() | Currency.EUR.toString()
-			null           | null
+			expectedPrice  | _
+			Random.price() | _
+			null           | _
 	}
 
 	@Unroll
-	@SuppressWarnings([
-		'ClosureAsLastMethodParameter',
-		'LineLength',
-		'UnnecessaryReturnKeyword',
-	])
-	def "add() should pass gibbons price (#expectedPrice) and currency (#expectedCurrency) to series dao"(BigDecimal expectedPrice, String expectedCurrency) {
+	@SuppressWarnings([ 'ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword' ])
+	def 'add() should pass gibbons price (#expectedPrice) to series dao'(BigDecimal expectedPrice) {
 		given:
 			form.setGibbonsPrice(expectedPrice)
 		when:
 			service.add(form, Random.userId(), bool())
 		then:
 			1 * seriesDao.add({ AddSeriesDbDto series ->
 				assert series?.gibbonsPrice == expectedPrice
-				assert series?.gibbonsCurrency == expectedCurrency
 				return true
 			}) >> Random.id()
 		where:
-			expectedPrice  | expectedCurrency
-			Random.price() | Currency.GBP.toString()
-			null           | null
+			expectedPrice  | _
+			Random.price() | _
+			null           | _
 	}
 
 	@Unroll