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

Features: 1) Replace IntegerField with BooleanField for has_stock, has_price, and personal_orders_only annotations; 2) Modify final ordering logic to append personal_orders_only at the end.

Browse source 
Fixes: 1) Handle missing `download` relation in `download_url` method by creating a new `DigitalAssetDownload` instance.

Extra: 1) Rename `personal_order_only` to `personal_orders_only` for clarity; 2) Remove unused IntegerField import; 3) General cleanup and minor adjustments in filters logic.
This commit is contained in:
Egor Pavlovich Gorbunov 2025-10-03 16:56:29 +03:00
parent 63b3a93938
commit d917584829
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/filters.py
View file

@ -9,7 +9,6 @@ from django.db.models import (
Case, Case,
Exists, Exists,
FloatField, FloatField,
IntegerField,
Max, Max,
OuterRef, OuterRef,
Prefetch, Prefetch,
@ -280,21 +279,21 @@ class ProductFilter(FilterSet):
qs = qs.annotate( qs = qs.annotate(
has_stock=Max( has_stock=Max(
Case( Case(
When(stocks__quantity__gt=0, then=Value(1)), When(stocks__quantity__gt=0, then=Value(True)),
default=Value(0), default=Value(False),
output_field=IntegerField(), output_field=BooleanField(),
) )
), ),
has_price=Max( has_price=Max(
Case( Case(
When(stocks__price__gt=0, then=Value(1)), When(stocks__price__gt=0, then=Value(True)),
default=Value(0), default=Value(False),
output_field=IntegerField(), output_field=BooleanField(),
) )
), ),
).annotate( ).annotate(
personal_order_only=Case( personal_orders_only=Case(
When(has_stock=0, has_price=1, then=Value(True)), When(has_stock=False, has_price=False, then=Value(True)),
default=Value(False), default=Value(False),
output_field=BooleanField(), output_field=BooleanField(),
) )
@ -311,11 +310,11 @@ class ProductFilter(FilterSet):
key = "?" key = "?"
mapped_requested.append(key) mapped_requested.append(key)
continue continue
if key == "personal_order_only": if key == "personal_orders_only":
continue continue
mapped_requested.append(f"-{key}" if desc else key) mapped_requested.append(f"-{key}" if desc else key)
final_ordering = ["personal_order_only"] + mapped_requested final_ordering = mapped_requested + ["personal_orders_only"]
if final_ordering: if final_ordering:
qs = qs.order_by(*final_ordering) qs = qs.order_by(*final_ordering)

5
core/models.py
View file

@ -1780,7 +1780,10 @@ class OrderProduct(ExportModelOperationsMixin("order_product"), NiceModel): # t
def download_url(self: Self) -> str: def download_url(self: Self) -> str:
if self.product and self.product.stocks: if self.product and self.product.stocks:
if self.product.is_digital and self.product.stocks.first().digital_asset: # type: ignore [union-attr] if self.product.is_digital and self.product.stocks.first().digital_asset: # type: ignore [union-attr]
return self.download.url try:
return self.download.url
except self.download.RelatedObjectDoesNotExist:
return DigitalAssetDownload.objects.create(order_product=self).url
return "" return ""
def do_feedback(self, rating=10, comment="", action="add") -> Optional["Feedback"] | int: def do_feedback(self, rating=10, comment="", action="add") -> Optional["Feedback"] | int: