Skip to content

Commit

Permalink
minor bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
rohangpta committed Oct 16, 2022
1 parent 3137905 commit 7baf414
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 12 deletions.
12 changes: 8 additions & 4 deletions backend/clubs/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ class ClubEventSerializer(serializers.ModelSerializer):
creator = serializers.HiddenField(default=serializers.CurrentUserDefault())

def get_ticketed(self, obj) -> bool:
return Event.tickets.exists()
return obj.tickets.count() > 0

def get_event_url(self, obj):
# if no url, return that
Expand Down Expand Up @@ -2012,7 +2012,9 @@ def get_clubs(self, obj):
# hide non public memberships if not superuser
if user is None or not user.has_perm("clubs.manage_club"):
queryset = queryset.filter(
membership__person=obj, membership__public=True, approved=True,
membership__person=obj,
membership__public=True,
approved=True,
)

serializer = MembershipClubListSerializer(
Expand Down Expand Up @@ -2413,7 +2415,8 @@ def save(self):
ApplicationMultipleChoice.objects.filter(question=question_obj).delete()
for choice in multiple_choice:
ApplicationMultipleChoice.objects.create(
value=choice["value"], question=question_obj,
value=choice["value"],
question=question_obj,
)

# manually create committee choices as Django does not
Expand Down Expand Up @@ -2702,7 +2705,8 @@ def save(self):
for name in committees:
if name not in prev_committee_names:
ApplicationCommittee.objects.create(
name=name, application=application_obj,
name=name,
application=application_obj,
)

return application_obj
Expand Down
29 changes: 21 additions & 8 deletions backend/clubs/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1080,7 +1080,8 @@ def get_queryset(self):
self.request.user, get_user_model()
):
SearchQuery(
person=self.request.user, query=self.request.query_params.get("search"),
person=self.request.user,
query=self.request.query_params.get("search"),
).save()

# select subset of clubs if requested
Expand Down Expand Up @@ -1672,7 +1673,9 @@ def constitutions(self, request, *args, **kwargs):
query = (
Club.objects.filter(badges=badge, archived=False)
.order_by(Lower("name"))
.prefetch_related(Prefetch("asset_set", to_attr="prefetch_asset_set"),)
.prefetch_related(
Prefetch("asset_set", to_attr="prefetch_asset_set"),
)
)
if request.user.is_authenticated:
query = query.prefetch_related(
Expand Down Expand Up @@ -2371,7 +2374,7 @@ def buyers(self, request, *args, **kwargs):
)

buyers = tickets.filter(owner__isnull=False).values(
"id", "fullname", "owner_id", "type"
"fullname", "id", "owner_id", "type"
)

return Response({"buyers": buyers})
Expand Down Expand Up @@ -3219,7 +3222,9 @@ def destroy(self, request, *args, **kwargs):

def get_queryset(self):
return MembershipRequest.objects.filter(
person=self.request.user, withdrew=False, club__archived=False,
person=self.request.user,
withdrew=False,
club__archived=False,
)


Expand Down Expand Up @@ -4343,7 +4348,9 @@ def get(self, request):

try:
response = zoom_api_call(
request.user, "GET", "https://api.zoom.us/v2/users/{uid}/settings",
request.user,
"GET",
"https://api.zoom.us/v2/users/{uid}/settings",
)
except requests.exceptions.HTTPError as e:
raise DRFValidationError(
Expand Down Expand Up @@ -4464,7 +4471,9 @@ def get_operation_id(self, **kwargs):
def get_object(self):
user = self.request.user
prefetch_related_objects(
[user], "profile__school", "profile__major",
[user],
"profile__school",
"profile__major",
)
return user

Expand Down Expand Up @@ -4897,7 +4906,9 @@ def question_response(self, *args, **kwargs):
}
)
submission = ApplicationSubmission.objects.create(
user=self.request.user, application=application, committee=committee,
user=self.request.user,
application=application,
committee=committee,
)
for question_pk in questions:
question = ApplicationQuestion.objects.filter(pk=question_pk).first()
Expand All @@ -4918,7 +4929,9 @@ def question_response(self, *args, **kwargs):
text = question_data.get("text", None)
if text is not None and text != "":
obj = ApplicationQuestionResponse.objects.create(
text=text, question=question, submission=submission,
text=text,
question=question,
submission=submission,
).save()
response = Response(ApplicationQuestionResponseSerializer(obj).data)
elif question_type == ApplicationQuestion.MULTIPLE_CHOICE:
Expand Down

0 comments on commit 7baf414

Please sign in to comment.