diff --git a/greg/api/serializers/sponsor.py b/greg/api/serializers/sponsor.py index 4171419e37535b0329af166d40287d92b3b22b24..240635d362f880254f22c0cb7adbb646222fa637 100644 --- a/greg/api/serializers/sponsor.py +++ b/greg/api/serializers/sponsor.py @@ -9,4 +9,4 @@ class SponsorSerializer(serializers.ModelSerializer): class Meta: model = Sponsor - fields = ["id", "feide_id", "first_name", "last_name", "orgunits"] + fields = ["id", "feide_id", "first_name", "last_name", "work_email", "orgunits"] diff --git a/greg/models.py b/greg/models.py index 1d96f92219510818c72460b73b4150fdd38dfe68..fe55c06e05de03e90e62c095245b527b76e6ae9b 100644 --- a/greg/models.py +++ b/greg/models.py @@ -524,12 +524,13 @@ class Sponsor(BaseModel): return f"{self.feide_id} ({self.first_name} {self.last_name})" def __repr__(self) -> str: - return "{}(id={!r}, feide_id={!r}, first_name={!r}, last_name={!r})".format( + return "{}(id={!r}, feide_id={!r}, first_name={!r}, last_name={!r}, work_email={!r})".format( self.__class__.__name__, self.pk, self.feide_id, self.first_name, self.last_name, + self.work_email, ) class Meta: diff --git a/greg/tests/api/test_sponsor.py b/greg/tests/api/test_sponsor.py index 459fd64e8a2dc9073902c51f8d76e85464c5b27e..5b48fc5a686b3d77d88a5092650114a9ed576669 100644 --- a/greg/tests/api/test_sponsor.py +++ b/greg/tests/api/test_sponsor.py @@ -18,6 +18,7 @@ def test_add_sponsor(client): "feide_id": "sponsor@example.org", "first_name": "Test", "last_name": "Sponsor", + "work_email": "sponsor123@example.org", } post_response = client.post(reverse("v1:sponsor-list"), data=data) @@ -33,6 +34,7 @@ def test_add_sponsor(client): assert list_response_data["feide_id"] == data["feide_id"] assert list_response_data["first_name"] == data["first_name"] assert list_response_data["last_name"] == data["last_name"] + assert list_response_data["work_email"] == data["work_email"] @pytest.mark.django_db diff --git a/greg/tests/models/test_identity.py b/greg/tests/models/test_identity.py index b59957a2d769f2a9ac85708f47f93c1dba59255c..c116629fe5b8bd580a9ba963d467a9ed8ebeee2b 100644 --- a/greg/tests/models/test_identity.py +++ b/greg/tests/models/test_identity.py @@ -5,5 +5,6 @@ import pytest def test_identity_repr(person_foo_verified): assert ( repr(person_foo_verified) - == "Identity(id=3, person_id=1, type='passport_number', source='Test', value='12345', verified_by=Sponsor(id=1, feide_id='guy@example.org', first_name='Sponsor', last_name='Guy'), verified_at=datetime.datetime(2021, 6, 15, 12, 34, 56, tzinfo=datetime.timezone.utc))" + == "Identity(id=3, person_id=1, type='passport_number', source='Test', value='12345', verified_by=Sponsor(id=1, feide_id='guy@example.org', first_name='Sponsor', last_name='Guy', work_email='sponsor_guy@example.com'), " + "verified_at=datetime.datetime(2021, 6, 15, 12, 34, 56, tzinfo=datetime.timezone.utc))" ) diff --git a/greg/tests/models/test_sponsor.py b/greg/tests/models/test_sponsor.py index 0346024ca243a2da78d37e93733f87b480218766..81b95701d304c2d32bc5e413a83ddc00f46fab8b 100644 --- a/greg/tests/models/test_sponsor.py +++ b/greg/tests/models/test_sponsor.py @@ -56,7 +56,8 @@ def test_add_muliple_sponsors_to_unit(sponsor_foo, sponsor_bar, unit1, unit2): def test_sponsor_repr(sponsor_guy): assert ( repr(sponsor_guy) - == "Sponsor(id=1, feide_id='guy@example.org', first_name='Sponsor', last_name='Guy')" + == "Sponsor(id=1, feide_id='guy@example.org', first_name='Sponsor', last_name='Guy', " + "work_email='sponsor_guy@example.com')" ) diff --git a/greg/tests/models/test_sponsor_orgunit.py b/greg/tests/models/test_sponsor_orgunit.py index c05c635ccc20258a0c30ae7a5e4078d919a09406..b1f3c41b187b58efd7e1fb518d386a9ebd266462 100644 --- a/greg/tests/models/test_sponsor_orgunit.py +++ b/greg/tests/models/test_sponsor_orgunit.py @@ -5,5 +5,5 @@ import pytest def test_sponsor_org_repr(sponsor_org_unit): assert ( repr(sponsor_org_unit) - == "SponsorOrganizationalUnit(id=1, sponsor=Sponsor(id=1, feide_id='guy@example.org', first_name='Sponsor', last_name='Guy'), organizational_unit=OrganizationalUnit(id=1, name_en='foo_unit', parent=None), hierarchical_access=False)" + == "SponsorOrganizationalUnit(id=1, sponsor=Sponsor(id=1, feide_id='guy@example.org', first_name='Sponsor', last_name='Guy', work_email='sponsor_guy@example.com'), organizational_unit=OrganizationalUnit(id=1, name_en='foo_unit', parent=None), hierarchical_access=False)" )