Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ticket/bb 20474 add has initiatives to current user #5205

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion bluebottle/members/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,18 @@ class CurrentUserSerializer(BaseUserPreviewSerializer):
segments = serializers.PrimaryKeyRelatedField(
many=True, queryset=Segment.objects
)
has_initiatives = serializers.SerializerMethodField()

def get_has_initiatives(self, obj):
return obj.own_initiatives.exists()

class Meta(object):
model = BB_USER_MODEL
fields = UserPreviewSerializer.Meta.fields + (
'id_for_ember', 'primary_language', 'email', 'full_name', 'phone_number',
'last_login', 'date_joined', 'location',
'verified', 'permissions', 'matching_options_set',
'organization', 'segments', 'required'
'organization', 'segments', 'required', 'has_initiatives'
)


Expand Down
11 changes: 11 additions & 0 deletions bluebottle/members/tests/test_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,17 @@ def test_require_profile_fields(self):
self.assertTrue(settings_platform.require_address)
self.assertTrue(settings_platform.require_birthdate)

def test_create_initiatives(self):
LocationFactory.create_batch(3)
self.app.set_user(self.superuser)
page = self.app.get(reverse('admin:members_memberplatformsettings_change'))
form = page.forms[0]
form['create_initiatives'].checked = True

form.submit()
settings_platform = MemberPlatformSettings.load()
self.assertTrue(settings_platform.create_initiatives)


class MemberAdminExportTest(BluebottleTestCase):
"""
Expand Down
23 changes: 23 additions & 0 deletions bluebottle/members/tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

from bluebottle.auth.middleware import authorization_logger
from bluebottle.clients import properties
from bluebottle.initiatives.tests.factories import InitiativeFactory
from bluebottle.members.models import MemberPlatformSettings, UserActivity, Member
from bluebottle.offices.tests.factories import LocationFactory
from bluebottle.segments.tests.factories import SegmentTypeFactory, SegmentFactory
Expand Down Expand Up @@ -1079,6 +1080,17 @@ def test_get_current_user_with_unverified_required_location(self):
response = self.client.get(self.current_user_url, token=self.user_token)
self.assertEqual(response.json()['required'], [])

def test_get_current_user_with_initiatives(self):
InitiativeFactory.create(
owner=self.user
)
response = self.client.get(self.current_user_url, token=self.user_token)
self.assertEqual(response.json()['has_initiatives'], True)

def test_get_current_user_without_initiatives(self):
response = self.client.get(self.current_user_url, token=self.user_token)
self.assertEqual(response.json()['has_initiatives'], False)


class MemberSettingsAPITestCase(BluebottleTestCase):

Expand All @@ -1099,3 +1111,14 @@ def test_required_questions(self):
settings.save()
response = self.client.get(self.url, token=self.user_token)
self.assertEqual(response.json()['platform']['members']['required_questions_location'], 'contribution')

def test_create_initiatives(self):
settings = MemberPlatformSettings.load()
settings.create_initiatives = False
settings.save()
response = self.client.get(self.url, token=self.user_token)
self.assertEqual(response.json()['platform']['members']['create_initiatives'], False)
settings.create_initiatives = True
settings.save()
response = self.client.get(self.url, token=self.user_token)
self.assertEqual(response.json()['platform']['members']['create_initiatives'], True)