Skip to content

Commit

Permalink
Merge branch 'integration/BB-20411-quarterly-reminder-emails' into ti…
Browse files Browse the repository at this point in the history
…cket/BB-20531-task-for-q-mails
  • Loading branch information
gannetson committed Aug 31, 2022
2 parents 300957e + 24ce94b commit c9d389b
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 2 deletions.
5 changes: 3 additions & 2 deletions bluebottle/members/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ class Meta(object):

class ManageProfileSerializer(UserProfileSerializer):
"""
Serializer for the a member's private profile.
Serializer for the member's private profile.
"""
partial = True
from_facebook = serializers.SerializerMethodField()
Expand All @@ -341,7 +341,8 @@ def get_from_facebook(self, instance):
class Meta(object):
model = BB_USER_MODEL
fields = UserProfileSerializer.Meta.fields + (
'email', 'newsletter', 'campaign_notifications', 'matching_options_set', 'location',
'email', 'newsletter', 'campaign_notifications', 'receive_reminder_emails',
'matching_options_set', 'location',
'birthdate', 'gender', 'first_name', 'last_name', 'phone_number',
'from_facebook', 'place',
)
Expand Down
25 changes: 25 additions & 0 deletions bluebottle/members/tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -1167,3 +1167,28 @@ def test_create_initiatives(self):
settings.save()
response = self.client.get(self.url, token=self.user_token)
self.assertEqual(response.json()['platform']['members']['create_initiatives'], True)


class MemberProfileAPITestCase(BluebottleTestCase):

def setUp(self):
super().setUp()
self.user = BlueBottleUserFactory.create()
self.user_token = 'JWT {}'.format(self.user.get_jwt_token())
self.url = reverse('manage-profile', args=(self.user.id, ))

def test_get_profile_has_receive_reminder_emails(self):
response = self.client.get(self.url, token=self.user_token)
data = response.json()
self.assertEqual(data['receive_reminder_emails'], True)

def test_uncheck_has_receive_reminder_emails(self):
response = self.client.get(self.url, token=self.user_token)
data = response.json()
data['receive_reminder_emails'] = False
del data['picture']
del data['avatar']
response = self.client.put(self.url, data, token=self.user_token)
self.assertEqual(response.status_code, 200)
self.user.refresh_from_db()
self.assertFalse(self.user.receive_reminder_emails)

0 comments on commit c9d389b

Please sign in to comment.