Skip to content

Commit

Permalink
hotfix: BarrierTeam object when None User (#771)
Browse files Browse the repository at this point in the history
Co-authored-by: abarolo <[email protected]>
  • Loading branch information
abarolo and abarolo authored Apr 4, 2024
1 parent 2ed67aa commit 564c95a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
19 changes: 10 additions & 9 deletions api/barrier_downloads/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()]
Expand Down
1 change: 1 addition & 0 deletions tests/barrier_downloads/test_serializer_query_count.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 564c95a

Please sign in to comment.