fix: when a paid user adds a series to a collection, price must always be specified together with currency

Fix #886

Author: php-coder

Diff for: src/main/java/ru/mystamps/web/feature/collection/AddToCollectionForm.java

@@ -20,6 +20,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import ru.mystamps.web.common.Currency;
+import ru.mystamps.web.support.beanvalidation.BothOrNoneRequired;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
@@ -32,6 +33,11 @@
 @Getter
 @Setter
 @MaxNumberOfStamps
+@BothOrNoneRequired(
+	first = "price",
+	second = "currency",
+	message = "{price.currency.both-required}"
+)
 public class AddToCollectionForm implements AddToCollectionDto {
 
 	@NotNull
@@ -41,7 +47,6 @@ public class AddToCollectionForm implements AddToCollectionDto {
 	// @todo #663 /series/{id}(price): must be greater than zero
 	private BigDecimal price;
 
-	// @todo #663 /series/{id}(currency): must be required when price is specified
 	private Currency currency;
 
 	// In order to ensure that numberOfStamps <= series.quantity,

Diff for: src/main/resources/ru/mystamps/i18n/ValidationMessages.properties

@@ -53,6 +53,7 @@ password.login.match = Password and login must be different
 seller.buyer.match = Seller and buyer must be different
 currencies.prices.match = Price and alternative price must be in a different currencies
 altprice.altcurrency.both-required = Alternative price and currency must be specified or left empty, specifying only one of them makes no-sense
+price.currency.both-required = Price and currency must be specified or left empty, specifying only one of them makes no-sense
 
 name.invalid = Name must consist only letters, hyphen or spaces
 

Diff for: src/main/resources/ru/mystamps/i18n/ValidationMessages_ru.properties

@@ -53,6 +53,7 @@ password.login.match = Пароль и логин не должны совпад
 seller.buyer.match = Продавец и покупатель не должны совпадать
 currencies.prices.match = Цена и альтернативная цена должны быть в различных валютах
 altprice.altcurrency.both-required = Альтернативная цена и валюта должны быть указаны или оставлены пустыми, указание только одного поля не имеет смысла
+price.currency.both-required = Цена и валюта должны быть указаны или оставлены пустыми, указание только одного поля не имеет смысла
 
 name.invalid = Имя может состоять только из букв, дефиса или пробелов
 

Diff for: src/test/robotframework/collection/add-series/validation-paid.robot

@@ -0,0 +1,29 @@
+*** Settings ***
+Documentation    Verify validation of adding a series to collection for a paid user
+Library          SeleniumLibrary
+Resource         ../../auth.steps.robot
+Resource         ../../selenium.utils.robot
+Suite Setup      Before Test Suite
+Suite Teardown   Close Browser
+Test Setup       Disable Client Validation  add-series-form
+Force Tags       collection  validation
+
+*** Test Cases ***
+Add a series with price but without currency
+	Input Text                 id:paid-price            20
+	Select From List By Value  id:paid-currency         ${EMPTY}
+	Submit Form                id:add-series-form
+	Element Text Should Be     id:paid-currency.errors  Price and currency must be specified or left empty, specifying only one of them makes no-sense
+
+Add a series with currency but without price
+	Input Text                 id:paid-price             ${EMPTY}
+	Select From List By Label  id:paid-currency          CZK
+	Submit Form                id:add-series-form
+	Element Text Should Be     id:paid-currency.errors   Price and currency must be specified or left empty, specifying only one of them makes no-sense
+
+*** Keywords ***
+Before Test Suite
+	Open Browser                        ${SITE_URL}/account/auth  ${BROWSER}
+	Register Keyword To Run On Failure  Log Source
+	Log In As                           login=paid  password=test
+	Go To                               ${SITE_URL}/series/1

Diff for: src/test/robotframework/collection/add-series/validation.robot renamed to src/test/robotframework/collection/add-series/validation-user.robot

@@ -1,5 +1,5 @@
 *** Settings ***
-Documentation    Verify validation of adding a series to collection
+Documentation    Verify validation of adding a series to collection for a user
 Library          SeleniumLibrary
 Resource         ../../auth.steps.robot
 Resource         ../../selenium.utils.robot