From 5a16c548a7b83b66cf844e1c8981a121e87a30e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20=C3=98rstad?= <tobiasio@ntnu.no>
Date: Mon, 19 Apr 2021 08:44:53 +0200
Subject: [PATCH] Refactor user/offerlist
---
backend/secfit/users/views.py | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/backend/secfit/users/views.py b/backend/secfit/users/views.py
index 9e81f3b..0c47126 100644
--- a/backend/secfit/users/views.py
+++ b/backend/secfit/users/views.py
@@ -97,32 +97,28 @@ class OfferList(
serializer.save(owner=self.request.user)
def get_queryset(self):
- result = Offer.objects.none()
+ qs = Offer.objects.none()
if self.request.user:
qs = Offer.objects.filter(
Q(owner=self.request.user) | Q(recipient=self.request.user)
).distinct()
- qp = self.request.query_params
- user = self.request.user
# filtering by status (if provided)
- status = qp.get("status", None)
- if status is not None and self.request is not None:
+ status = self.request.query_params.get("status", None)
+ if status is not None:
qs = qs.filter(status=status)
- if qp.get("status", None) is None:
- qs = Offer.objects.filter(Q(owner=user)).distinct()
# filtering by category (sent or received)
- category = qp.get("category", None)
- if category is not None and qp is not None:
+ category = self.request.query_params.get("category", None)
+ if category is not None:
if category == "sent":
- qs = qs.filter(owner=user)
+ qs = qs.filter(owner=self.request.user)
elif category == "received":
- qs = qs.filter(recipient=user)
- return qs
- else:
- return result
+ qs = qs.filter(recipient=self.request.user)
+
+ return qs
+
class OfferDetail(
--
GitLab