Minor b2b improvements (#2825)

* Correctly handling currency codes in b2b happiness messages
* Convinient refund() fixture to get rid of _set_current_user in tests
* Ability to refund b2b shipped but not paid orders

Author: f213

conftest.py

@@ -2,34 +2,33 @@
 from django.core.cache import cache
 from django.utils import translation
 
-# fmt: off
 pytest_plugins = [
+    "apps.b2b.factory",
+    "apps.banking.factory",
+    "apps.banking.fixtures",
+    "apps.dashamail.fixtures",
     "apps.diplomas.factory",
+    "apps.homework.factory",
+    "apps.lms.factory",
     "apps.orders.factory",
-    "apps.b2b.factory",
+    "apps.orders.fixtures",
     "apps.products.factory",
-    "apps.banking.factory",
-    "core.factory",
-
     "apps.products.fixtures",
     "apps.users.fixtures",
-    "apps.lms.factory",
-    "apps.homework.factory",
-    "apps.dashamail.fixtures",
+    "core.factory",
     "core.fixtures",
 ]
-# fmt: on
 
 
 @pytest.fixture(autouse=True)
-def _cache() -> None:  # type: ignore
+def _cache() -> None:
     """Clear django cache after each test run."""
     yield
     cache.clear()
 
 
 @pytest.fixture
-def _en() -> None: # type: ignore
+def _en() -> None:
     """Disable django translation"""
-    with translation.override('en'):
+    with translation.override("en"):
         yield

src/apps/amocrm/tests/services/order/conftest.py

@@ -21,8 +21,3 @@ def paid_order_with_lead(user, course, factory, amocrm_lead):
 @pytest.fixture
 def paid_order_without_lead(user, course, factory):
     return factory.order(user=user, item=course, is_paid=True, author=user)
-
-
-@pytest.fixture(autouse=True)
-def set_current_user(_set_current_user):
-    return _set_current_user

src/apps/amocrm/tests/services/order/tests_order_pusher.py

@@ -48,9 +48,9 @@ def not_paid_order_with_lead(factory, user, course, amocrm_lead):
 
 
 @pytest.fixture
-def returned_order_with_lead(factory, user, course, amocrm_lead):
+def returned_order_with_lead(factory, user, course, amocrm_lead, refund):
     order = factory.order(user=user, item=course, is_paid=True, author=user, amocrm_lead=amocrm_lead)
-    order.refund()
+    refund(order)
     return order
 
 

src/apps/b2b/models.py

@@ -1,9 +1,10 @@
+from decimal import Decimal
 from typing import TYPE_CHECKING
 
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import pgettext_lazy
 
-from apps.banking.currency import CurrencyCodes
+from apps.banking import currency
 from core.models import TimestampedModel, models
 
 if TYPE_CHECKING:
@@ -27,7 +28,7 @@ class Deal(TimestampedModel):
     canceled = models.DateTimeField(_("Date when the deal got canceled"), null=True, blank=True)
     shipped_without_payment = models.DateTimeField(_("Date when the deal got shipped without payment"), null=True, blank=True)
     price = models.DecimalField(_("Price"), max_digits=9, decimal_places=2)
-    currency = models.CharField(_("Currency"), choices=CurrencyCodes.choices, default="RUB")
+    currency = models.CharField(_("Currency"), choices=currency.CurrencyCodes.choices(), default="RUB")
     currency_rate_on_creation = models.DecimalField(max_digits=9, decimal_places=2, null=True)
 
     class Meta:
@@ -50,6 +51,12 @@ def get_status_representation(self) -> "StrPromise":
 
         return pgettext_lazy("deals", "In progress")
 
+    def get_single_order_price(self) -> Decimal:
+        try:
+            return Decimal(self.price * currency.get_rate_or_default(self.currency) / self.students.count())
+        except ArithmeticError:
+            return Decimal(0)
+
 
 class Student(TimestampedModel):
     user = models.ForeignKey("users.User", on_delete=models.PROTECT)

src/apps/b2b/services/deal_completer.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from decimal import Decimal
 
 from django.conf import settings
 from django.contrib.admin.models import CHANGE
@@ -28,7 +27,7 @@ def act(self) -> None:
 
         orders: list[Order] = []
 
-        orders += create_orders(deal=self.deal, single_order_price=self.get_single_order_price())
+        orders += create_orders(deal=self.deal, single_order_price=self.deal.get_single_order_price())
         orders += assign_existing_orders(deal=self.deal)
 
         if not self.ship_only:
@@ -41,12 +40,6 @@ def act(self) -> None:
             self.mark_deal_as_shipped_without_payment()
             self.write_auditlog()
 
-    def get_single_order_price(self) -> Decimal:
-        try:
-            return Decimal(self.deal.price * currency.get_rate_or_default(self.deal.currency) / self.deal.students.count())
-        except ArithmeticError:
-            return Decimal(0)
-
     def mark_deal_as_complete(self) -> None:
         self.deal.completed = timezone.now()
         self.deal.save()
@@ -71,7 +64,7 @@ def send_happiness_message(self) -> None:
 
         send_telegram_message.delay(
             chat_id=settings.HAPPINESS_MESSAGES_CHAT_ID,
-            text=f"💰+{format_price(self.deal.price)} ₽, {self.deal.customer}, {self.deal.course} продавец {self.deal.author}",
+            text=f"💰+{format_price(self.deal.price)} {currency.get_symbol(self.deal.currency)}, {self.deal.customer}, {self.deal.course} продавец {self.deal.author}",
         )
 
     def write_auditlog(self) -> None:

src/apps/b2b/tests/deal_completer/test_deal_completer_happiness_message.py

@@ -44,6 +44,15 @@ def test_message_text(send_message, completer, deal):
     completer(deal=deal)()
 
     assert str(deal.author) in send_message.call_args[1]["text"]
-    assert "200\xa0500" in send_message.call_args[1]["text"]
+    assert "200\xa0500 ₽" in send_message.call_args[1]["text"]
     assert "Росатом" in send_message.call_args[1]["text"]
     assert "безопасность" in send_message.call_args[1]["text"]
+
+
+@pytest.mark.usefixtures("usd")
+def test_currency(send_message, completer, deal):
+    deal.update(price=Decimal(100), currency="usd")
+
+    completer(deal=deal)()
+
+    assert "100 $" in send_message.call_args[1]["text"]

src/apps/b2b/tests/deal_completer/test_deal_completer_new_order_creation.py

@@ -4,12 +4,10 @@
 
 from apps.orders.models import Order
 
-pytestmark = [pytest.mark.django_db]
-
-
-@pytest.fixture(autouse=True)
-def _usd_rate(factory):
-    factory.currency(name="USD", rate=Decimal(100))
+pytestmark = [
+    pytest.mark.django_db,
+    pytest.mark.usefixtures("usd"),
+]
 
 
 def test_orders_are_created(completer, factory):
@@ -66,6 +64,7 @@ def test_price_calculation(completer, factory, student_count, single_order_price
     assert str(order.price) == single_order_price
 
 
+@pytest.mark.usefixtures("usd")
 @pytest.mark.parametrize(
     ("currency", "single_order_price"),
     [
@@ -83,6 +82,6 @@ def test_currency_price_calculation(completer, factory, currency, single_order_p
     assert str(order.price) == single_order_price
 
 
-def test_zero_price(completer, factory):
+def test_zero_price(factory):
     deal = factory.deal(student_count=0, price=Decimal(0))
-    assert completer(deal=deal).get_single_order_price() == 0
+    assert deal.get_single_order_price() == 0

src/apps/banking/currency.py

@@ -1,16 +1,35 @@
 import contextlib
 from decimal import Decimal
+from enum import Enum
+from typing import TYPE_CHECKING
 
 from django.apps import apps
-from django.db.models import TextChoices
 from django.utils.translation import gettext_lazy as _
 
+if TYPE_CHECKING:
+    from django.utils.functional import _StrPromise
 
-class CurrencyCodes(TextChoices):
-    RUB = "RUB", _("RUB")
-    USD = "USD", _("USD")
-    KZT = "KZT", _("KZT")
-    KIS = "KIS", _("KIS (for zero-price orders)")
+
+class CurrencyCodes(Enum):
+    RUB = "RUB", _("RUB"), "₽"
+    USD = "USD", _("USD"), "$"
+    KZT = "KZT", _("KZT"), "₸"
+    KIS = "KIS", _("KIS (for zero-price orders)"), "💋"
+
+    @classmethod
+    def choices(cls) -> tuple[tuple[str, "_StrPromise"], ...]:
+        currencies = [(member.name, member.value[1]) for member in cls if member if member.name.isupper()]
+
+        return tuple(currencies)
+
+
+def get_symbol(code: str) -> str:
+    symbol = getattr(CurrencyCodes, code.upper())
+
+    if symbol is None:
+        raise ValueError("Non-existant currency symbol")
+
+    return symbol.value[2]
 
 
 def get_rate(name: str) -> Decimal | None:

src/apps/banking/fixtures.py

@@ -0,0 +1,8 @@
+from decimal import Decimal
+
+import pytest
+
+
+@pytest.fixture
+def usd(factory):
+    return factory.currency(name="USD", rate=Decimal(100))

src/apps/banking/models.py

@@ -5,7 +5,7 @@
 
 
 class Currency(TimestampedModel):
-    name = models.CharField(max_length=4, unique=True, choices=CurrencyCodes.choices, db_index=True)
+    name = models.CharField(max_length=4, unique=True, choices=CurrencyCodes.choices(), db_index=True)
     rate = models.DecimalField(max_digits=6, decimal_places=2, verbose_name=_("Rate"))
 
     class Meta: