Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Now returning None if the currency is empty #92

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions django_prices/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,7 @@ def compress(self, data_list: Optional[Tuple[Decimal, str]]) -> Optional[Money]:
if amount is None:
return None

if not currency:
return None
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be a validation error?


return Money(amount, currency)
8 changes: 7 additions & 1 deletion tests/test_forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def test_form_field_passes_all_validations_for_correct_money_value():
assert form.errors == {}


def test_form_field_fixed_currency_andrequired_pass_on_valid_data():
def test_form_field_fixed_currency_and_required_pass_on_valid_data():
form = FixedCurrencyRequiredPriceForm(data={"price_0": "20", "price_1": "BTC"})
form.full_clean()
assert form.errors == {}
Expand Down Expand Up @@ -108,6 +108,12 @@ def test_form_field_fixed_currency_and_optional_error_on_wrong_currency():
}


def test_form_field_fixed_currency_and_optional_error_on_empty_currency():
form = FixedCurrencyOptionalPriceForm(data={"price_0": "20", "price_1": ""})
form.full_clean()
assert form.cleaned_data["price"] is None


def test_form_field_fixed_currency_and_optional_none_on_no_amount():
form = FixedCurrencyOptionalPriceForm(data={"price_0": "", "price_1": "BTC"})
form.full_clean()
Expand Down