handle invalid club code in request creation

pennlabs · Nov 17, 2024 · 6315065 · 6315065
1 parent 87af1ab
commit 6315065
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/backend/clubs/models.py b/backend/clubs/models.py
@@ -1107,11 +1107,8 @@ def __str__(self):
 
     def send_request(self, request=None):
         domain = get_domain(request)
-
         edit_url = settings.EDIT_URL.format(domain=domain, club=self.club.code)
-
         club_name = self.club.name
-
         full_name = self.requester.get_full_name()
 
         context = {
@@ -1141,11 +1138,8 @@ def __str__(self):
 
     def send_request(self, request=None):
         domain = get_domain(request)
-
         edit_url = settings.EDIT_URL.format(domain=domain, club=self.club.code)
-
         club_name = self.club.name
-
         full_name = self.requester.get_full_name()
 
         context = {

diff --git a/backend/clubs/views.py b/backend/clubs/views.py
@@ -3781,8 +3781,11 @@ def create(self, request, *args, **kwargs):
         If a membership request object already exists, reuse it.
         """
         club = request.data.get("club", None)
-
-        club_instance = Club.objects.get(code=club)
+        club_instance = Club.objects.filter(code=club).first()
+        if club_instance is None:
+            return Response(
+                {"detail": "Invalid club code"}, status=status.HTTP_400_BAD_REQUEST
+            )
 
         create_defaults = {"club": club_instance, "requester": request.user}
 
@@ -3886,8 +3889,11 @@ def create(self, request, *args, **kwargs):
         If a ownership request object already exists, reuse it.
         """
         club = request.data.get("club", None)
-
-        club_instance = Club.objects.get(code=club)
+        club_instance = Club.objects.filter(code=club).first()
+        if club_instance is None:
+            return Response(
+                {"detail": "Invalid club code"}, status=status.HTTP_400_BAD_REQUEST
+            )
 
         create_defaults = {"club": club_instance, "requester": request.user}