fureunoir/schon
fureunoir/schon
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into storefront-nuxt

Browse source
This commit is contained in:
Egor Pavlovich Gorbunov 2025-11-18 12:53:20 +03:00
commit 4750bed093
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/core/graphene/mutations.py
View file

@ -228,9 +228,9 @@ class BuyOrder(BaseMutation):
)
match str(type(instance)):
case "<class 'payments.models.Transaction'>":
case "<class 'engine.payments.models.Transaction'>":
return BuyOrder(transaction=instance)
case "<class 'core.models.Order'>":
case "<class 'engine.core.models.Order'>":
return BuyOrder(order=instance)
case _:
raise TypeError(_(f"wrong type came from order.buy() method: {type(instance)!s}"))
@ -493,9 +493,9 @@ class BuyWishlist(BaseMutation):
instance = order.buy(force_balance=force_balance, force_payment=force_payment)
match str(type(instance)):
case "<class 'payments.models.Transaction'>":
case "<class 'engine.payments.models.Transaction'>":
return BuyWishlist(transaction=instance)
case "<class 'core.models.Order'>":
case "<class 'engine.core.models.Order'>":
return BuyWishlist(order=instance)
case _:
raise TypeError(_(f"wrong type came from order.buy() method: {type(instance)!s}"))
@ -535,9 +535,9 @@ class BuyProduct(BaseMutation):
order.add_product(product_uuid=product_uuid, attributes=format_attributes(attributes))
instance = order.buy(force_balance=force_balance, force_payment=force_payment)
match str(type(instance)):
case "<class 'payments.models.Transaction'>":
case "<class 'engine.payments.models.Transaction'>":
return BuyProduct(transaction=instance)
case "<class 'core.models.Order'>":
case "<class 'engine.core.models.Order'>":
return BuyProduct(order=instance)
case _:
raise TypeError(_(f"wrong type came from order.buy() method: {type(instance)!s}"))

4
engine/core/utils/commerce.py
View file

@ -81,7 +81,7 @@ def get_daily_finished_orders_count(period: timedelta = timedelta(days=30)) -> d
Order.objects.filter(status="FINISHED", buy_time__lte=current, buy_time__gte=period_start)
.annotate(day=TruncDate("buy_time"))
.values("day")
.annotate(cnt=Count("id"))
.annotate(cnt=Count("pk"))
.order_by("day")
)
result: dict[date, int] = {}
@ -169,7 +169,7 @@ def get_customer_mix(period: timedelta = timedelta(days=30)) -> dict[str, int]:
return {"new": 0, "returning": 0}
lifetime_counts = (
Order.objects.filter(status="FINISHED", user_id__in=period_users).values("user_id").annotate(c=Count("id"))
Order.objects.filter(status="FINISHED", user_id__in=period_users).values("user_id").annotate(c=Count("pk"))
)
new_cnt = 0
ret_cnt = 0

4
engine/core/viewsets.py
View file

@ -704,9 +704,9 @@ class OrderViewSet(EvibesViewSet):
chosen_products=serializer.validated_data.get("chosen_products"),
)
match str(type(instance)):
case "<class 'payments.models.Transaction'>":
case "<class 'engine.payments.models.Transaction'>":
return Response(status=status.HTTP_202_ACCEPTED, data=TransactionProcessSerializer(instance).data)
case "<class 'core.models.Order'>":
case "<class 'engine.core.models.Order'>":
return Response(status=status.HTTP_200_OK, data=OrderDetailSerializer(instance).data)
case _:
raise TypeError(_(f"wrong type came from order.buy() method: {type(instance)!s}"))

6
engine/vibes_auth/graphene/mutations.py
View file

@ -205,7 +205,7 @@ class ObtainJSONWebToken(BaseMutation):
try:
serializer.is_valid(raise_exception=True)
return ObtainJSONWebToken(
user=User.objects.get(serializer.validated_data["user"]["uuid"]),
user=User.objects.get(uuid=serializer.validated_data["user"]["uuid"]),
refresh_token=serializer.validated_data["refresh"],
access_token=serializer.validated_data["access"],
)
@ -226,7 +226,7 @@ class RefreshJSONWebToken(BaseMutation):
try:
serializer.is_valid(raise_exception=True)
return RefreshJSONWebToken(
user=User.objects.get(serializer.validated_data["user"]["uuid"]),
user=User.objects.get(uuid=serializer.validated_data["user"]["uuid"]),
access_token=serializer.validated_data["access"],
refresh_token=serializer.validated_data["refresh"],
)
@ -248,7 +248,7 @@ class VerifyJSONWebToken(BaseMutation):
serializer.is_valid(raise_exception=True)
# noinspection PyTypeChecker
return VerifyJSONWebToken(
token_is_valid=True, user=User.objects.get(serializer.validated_data["user"]["uuid"])
token_is_valid=True, user=User.objects.get(uuid=serializer.validated_data["user"]["uuid"])
)
detail = traceback.format_exc() if settings.DEBUG else ""
# noinspection PyTypeChecker