klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-10-30 00:23:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve eboutic readability

Browse Source
This commit is contained in:
Antoine Bartuccio
2025-08-24 00:26:34 +02:00
parent 0bc18be75e
commit 25099528bf
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
eboutic/views.py
View File

@@ -133,28 +133,30 @@ class EbouticMainView(LoginRequiredMixin, FormView):
context["products"] = self.products
context["customer_amount"] = self.request.user.account_balance
purchases = (
Customer.objects.filter(pk=self.customer.pk)
.annotate(
last_refill=Subquery(
Refilling.objects.filter(
counter__type="EBOUTIC", customer_id=self.customer.pk
)
.order_by("-date")
.values("date")[:1]
),
last_purchase=Subquery(
Selling.objects.filter(
counter__type="EBOUTIC", customer_id=self.customer.pk
)
.order_by("-date")
.values("date")[:1]
),
)
.values_list("last_refill", "last_purchase")
)[0]
purchase_times = [
int(purchase.timestamp() * 1000)
for purchase in (
Customer.objects.filter(pk=self.customer.pk)
.annotate(
last_refill=Subquery(
Refilling.objects.filter(
counter__type="EBOUTIC", customer_id=self.customer.pk
)
.order_by("-date")
.values("date")[:1]
),
last_purchase=Subquery(
Selling.objects.filter(
counter__type="EBOUTIC", customer_id=self.customer.pk
)
.order_by("-date")
.values("date")[:1]
),
)
.values("last_refill", "last_purchase")
)[0].values()
for purchase in purchases
if purchase is not None
]