From 564c95ab816e75e4c1515262a72acf3989768d68 Mon Sep 17 00:00:00 2001 From: abarolo <145478290+abarolo@users.noreply.github.com> Date: Thu, 4 Apr 2024 10:37:13 +0100 Subject: [PATCH] hotfix: BarrierTeam object when None User (#771) Co-authored-by: abarolo --- api/barrier_downloads/serializers.py | 19 ++++++++++--------- .../test_serializer_query_count.py | 1 + 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/api/barrier_downloads/serializers.py b/api/barrier_downloads/serializers.py index 750aa3e19..123fce3b7 100644 --- a/api/barrier_downloads/serializers.py +++ b/api/barrier_downloads/serializers.py @@ -169,18 +169,19 @@ def get_reported_by(self, barrier): return reported_by def get_barrier_owner(self, barrier): - barrier_owner = None barrier_team = barrier.barrier_team.all() - if barrier_team: - first_barrier_owner = barrier_team[0] - first_name = first_barrier_owner.user.first_name - last_name = first_barrier_owner.user.last_name - barrier_owner = ( - f"{first_name} {last_name}" if first_name and last_name else None - ) + if not barrier_team: + return + + owner = barrier_team[0].user + + if not owner: + return - return barrier_owner + first_name = owner.first_name + last_name = owner.last_name + return f"{first_name} {last_name}" if first_name and last_name else None def get_tags(self, barrier): return [tag.title for tag in barrier.tags.all()] diff --git a/tests/barrier_downloads/test_serializer_query_count.py b/tests/barrier_downloads/test_serializer_query_count.py index 864a6fd05..7e85e5d37 100644 --- a/tests/barrier_downloads/test_serializer_query_count.py +++ b/tests/barrier_downloads/test_serializer_query_count.py @@ -58,6 +58,7 @@ def test_csv_serializer_query_count(django_assert_num_queries): b1.tags.add(tag1) TeamMember.objects.create(barrier=b2, user=user, role="Owner") TeamMember.objects.create(barrier=b2, user=user2, role="Contributor") + TeamMember.objects.create(barrier=b1, role="Owner") b2.categories.add(category1) BarrierProgressUpdate.objects.create(