Skip to content
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
12 changes: 6 additions & 6 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pythonpro/core/facade.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ def visit_member_landing_page(user: User, source: str):
return UserInteraction(category=UserInteraction.MEMBER_LP, source=source, user=user).save()


def activate_user(user: User, source: str):
return UserInteraction(category=UserInteraction.ACTIVATED, source=source, user=user).save()


def client_checkout(user: User, source: str) -> None:
return UserInteraction(category=UserInteraction.CLIENT_CHECKOUT, source=source, user=user).save()

Expand Down
9 changes: 7 additions & 2 deletions pythonpro/dashboard/tests/test_interaction_creation.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
from model_mommy import mommy

from pythonpro.dashboard.models import TopicInteraction
from pythonpro.domain import user_facade


@pytest.fixture
def remove_tags_mock(mocker):
return mocker.patch('pythonpro.dashboard.views.remove_tags')
return mocker.patch('pythonpro.domain.user_facade._mailchimp_facade.remove_tags')


@pytest.fixture
Expand Down Expand Up @@ -39,10 +40,14 @@ def resp_with_interaction(client_with_lead, topic, logged_user, remove_tags_mock
)


def test_user_first_video(resp, remove_tags_mock, logged_user):
def test_user_mark_on_mainchimp(resp, remove_tags_mock, logged_user):
remove_tags_mock.assert_called_once_with(logged_user.email, 'never-watched-video')


def test_user_activation(resp, remove_tags_mock, logged_user):
assert 'ACTIVATED' == user_facade.find_user_interactions(logged_user)[0].category


def test_user_not_first_video(resp_with_interaction, remove_tags_mock):
assert remove_tags_mock.call_count == 0

Expand Down
5 changes: 3 additions & 2 deletions pythonpro/dashboard/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from pythonpro.dashboard.facade import has_watched_any_topic
from pythonpro.dashboard.forms import TopicInteractionForm
from pythonpro.dashboard.models import TopicInteraction
from pythonpro.mailchimp.facade import remove_tags
from pythonpro.domain import user_facade


@login_required
Expand All @@ -24,6 +24,7 @@ def topic_interaction(request):
form = TopicInteractionForm(data)
if form.is_valid():
if not has_watched_any_topic(user):
remove_tags(user.email, 'never-watched-video')
user_facade.activate_user(user, None)

form.save()
return JsonResponse({'msg': 'ok'})
21 changes: 16 additions & 5 deletions pythonpro/domain/user_facade.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,21 @@ def client_generated_boleto(user):

def subscribe_to_waiting_list(user: _User, source: str) -> None:
"""
Subscribe user to waiting list
:param user:
:param source:
:return:
"""
Subscribe user to waiting list
:param user:
:param source:
:return:
"""
_core_facade.subscribe_to_waiting_list(user, source)
_mailchimp_facade.tag_as(user.email, 'lista-de-espera')


def activate_user(user: _User, source: str) -> None:
"""
Activate user
:param user:
:param source:
:return:
"""
_core_facade.activate_user(user, source)
_mailchimp_facade.remove_tags(user.email, 'never-watched-video')