Skip to content

Commit 076fa10

Browse files
renzonrenzon
renzon
authored and
renzon
committed
Enhanced module's app facade
close #2832
1 parent 73f36e5 commit 076fa10

27 files changed

+120
-107
lines changed

‎pythonpro/checkout/tests/test_bootcamp_lp_when_subscription_closed.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99

1010
@pytest.fixture
1111
def tag_as_mock(mocker):
12-
return mocker.patch('pythonpro.domain.user_facade._email_marketing_facade.tag_as.delay')
12+
return mocker.patch('pythonpro.domain.user_domain._email_marketing_facade.tag_as.delay')
1313

1414

1515
@pytest.fixture
1616
def visit_member_landing_page_mock(mocker):
17-
return mocker.patch('pythonpro.domain.user_facade._core_facade.visit_member_landing_page')
17+
return mocker.patch('pythonpro.domain.user_domain._core_facade.visit_member_landing_page')
1818

1919

2020
@pytest.fixture
2121
def subscribe_to_waiting_list_mock(mocker):
22-
return mocker.patch('pythonpro.checkout.views.user_facade.subscribe_to_waiting_list')
22+
return mocker.patch('pythonpro.checkout.views.user_domain.subscribe_to_waiting_list')
2323

2424

2525
begin_and_finish = [
@@ -79,7 +79,7 @@ def test_post_with_user(dt, client, freezer, subscribe_to_waiting_list_mock, log
7979

8080
@pytest.fixture
8181
def subscribe_anonymous_user_to_waiting_list_mock(mocker):
82-
return mocker.patch('pythonpro.checkout.views.user_facade.subscribe_anonymous_user_to_waiting_list')
82+
return mocker.patch('pythonpro.checkout.views.user_domain.subscribe_anonymous_user_to_waiting_list')
8383

8484

8585
@pytest.mark.parametrize('dt', begin_and_finish)

‎pythonpro/checkout/tests/test_bootcamp_lp_when_subscription_open.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@pytest.fixture
1111
def tag_as_mock(mocker):
12-
return mocker.patch('pythonpro.domain.user_facade._email_marketing_facade.tag_as.delay')
12+
return mocker.patch('pythonpro.domain.user_domain._email_marketing_facade.tag_as.delay')
1313

1414

1515
@pytest.fixture

‎pythonpro/checkout/tests/test_bootcamp_redirects.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
@pytest.fixture
1010
def tag_as_mock(mocker):
11-
return mocker.patch('pythonpro.domain.user_facade._email_marketing_facade.tag_as.delay')
11+
return mocker.patch('pythonpro.domain.user_domain._email_marketing_facade.tag_as.delay')
1212

1313

1414
def assert_redirect_with_querystring(client, from_path, tag_as_mock, to_path):

‎pythonpro/checkout/tests/test_waiting_list_ty.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pytest
22
from django.urls import reverse
33

4-
from pythonpro.domain import user_facade
4+
from pythonpro.domain import user_domain
55

66

77
@pytest.fixture
@@ -12,7 +12,7 @@ def subscription_closed(settings):
1212
@pytest.fixture
1313
def create_or_update_with_no_role_mock(mocker):
1414
create_or_update_with_no_role = mocker.patch(
15-
'pythonpro.domain.user_facade._email_marketing_facade.create_or_update_with_no_role.delay'
15+
'pythonpro.domain.user_domain._email_marketing_facade.create_or_update_with_no_role.delay'
1616
)
1717
return create_or_update_with_no_role
1818

@@ -40,7 +40,7 @@ def test_status_code(resp):
4040

4141

4242
def test_user_interacton(resp, logged_user):
43-
assert 'WAITING_LIST' == user_facade.find_user_interactions(logged_user)[0].category
43+
assert 'WAITING_LIST' == user_domain.find_user_interactions(logged_user)[0].category
4444

4545

4646
@pytest.fixture

‎pythonpro/checkout/views.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from pythonpro.checkout import forms as checkout_forms
1313
from pythonpro.checkout.forms import WaitingForm
1414
from pythonpro.core.facade import is_webdev
15-
from pythonpro.domain import user_facade
15+
from pythonpro.domain import user_domain
1616

1717

1818
def _redirect_to_bootcamp_lp(request):
@@ -36,17 +36,17 @@ def bootcamp_lp(request):
3636
source = request.GET.get('utm_source', default='unknown')
3737
data = form.cleaned_data
3838
if request.user.is_authenticated:
39-
user_facade.subscribe_to_waiting_list(request.user, data['phone'], source)
39+
user_domain.subscribe_to_waiting_list(request.user, data['phone'], source)
4040
else:
41-
user_facade.subscribe_anonymous_user_to_waiting_list(
41+
user_domain.subscribe_anonymous_user_to_waiting_list(
4242
data['email'], data['first_name'], data['phone'], source
4343
)
4444
return redirect(reverse('checkout:waiting_list_ty'))
4545
return render(request, 'checkout/bootcamp_lp_subscription_closed.html', {'form': form})
4646

4747
if not checkout_facade.is_launch_open():
4848
if request.user.is_authenticated:
49-
user_facade.visit_member_landing_page(request.user, source=request.GET.get('utm_source', default='unknown'))
49+
user_domain.visit_member_landing_page(request.user, source=request.GET.get('utm_source', default='unknown'))
5050

5151
form = checkout_forms.WaitingForm()
5252
return render(request, 'checkout/bootcamp_lp_subscription_closed.html', {'form': form})
@@ -57,7 +57,7 @@ def bootcamp_lp(request):
5757
def _no_wevdev_discount(request, discount_slug, promotion_end_date,
5858
template_name='checkout/bootcamp_lp_subscription_open.html'):
5959
if request.user.is_authenticated:
60-
user_facade.visit_member_landing_page(request.user, source=request.GET.get('utm_source', default='unknown'))
60+
user_domain.visit_member_landing_page(request.user, source=request.GET.get('utm_source', default='unknown'))
6161

6262
form = facade.ContactForm()
6363
payment_item_config = facade.find_payment_item_config(discount_slug)
@@ -167,7 +167,7 @@ def bootcamp_lp_d3(request):
167167
return _redirect_to_bootcamp_lp(request)
168168

169169
if request.user.is_authenticated:
170-
user_facade.visit_member_landing_page(request.user, source=request.GET.get('utm_source', default='unknown'))
170+
user_domain.visit_member_landing_page(request.user, source=request.GET.get('utm_source', default='unknown'))
171171

172172
form = facade.ContactForm()
173173
payment_item_config = no_discount_item_config = facade.find_payment_item_config('bootcamp')
@@ -198,7 +198,7 @@ def bootcamp_lp_d3_webdev(request):
198198
if not is_debug and (has_discount or not (checkout_facade.is_launch_open() and is_webdev(user))):
199199
return _redirect_to_bootcamp_lp(request)
200200

201-
user_facade.visit_member_landing_page(request.user, source=request.GET.get('utm_source', default='unknown'))
201+
user_domain.visit_member_landing_page(request.user, source=request.GET.get('utm_source', default='unknown'))
202202
has_client_discount = True
203203
data = {'name': request.user.first_name, 'email': request.user.email}
204204
form = facade.ContactForm(data)
@@ -284,7 +284,7 @@ def _render_with_webdev_and_first_day_discounts(
284284
request, client_discount_slug, first_day_discount_slug, promotion_end_date,
285285
template_name='checkout/bootcamp_lp_subscription_open.html'
286286
):
287-
user_facade.visit_member_landing_page(request.user, source=request.GET.get('utm_source', default='unknown'))
287+
user_domain.visit_member_landing_page(request.user, source=request.GET.get('utm_source', default='unknown'))
288288
has_client_discount = True
289289
data = {'name': request.user.first_name, 'email': request.user.email}
290290
form = facade.ContactForm(data)

‎pythonpro/core/admin.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,42 +56,42 @@ class UserAdmin(RolePermissionsUserAdminMixin, admin.ModelAdmin):
5656
actions = ['make_bootcamper', 'make_webdev', 'make_member', 'make_data_scientist', 'make_pythonista']
5757

5858
def make_webdev(self, request, queryset):
59-
from pythonpro.domain import user_facade
59+
from pythonpro.domain import user_domain
6060
for user in queryset:
6161
try:
62-
user_facade.promote_webdev(user, 'django_admin')
62+
user_domain.promote_webdev(user, 'django_admin')
6363
except UserRoleException:
6464
pass # No need to handle on admin
6565

6666
def make_bootcamper(self, request, queryset):
67-
from pythonpro.domain import user_facade
67+
from pythonpro.domain import user_domain
6868
for user in queryset:
6969
try:
70-
user_facade.promote_bootcamper(user, 'django_admin')
70+
user_domain.promote_bootcamper(user, 'django_admin')
7171
except UserRoleException:
7272
pass # No need to handle on admin
7373

7474
def make_pythonista(self, request, queryset):
75-
from pythonpro.domain import user_facade
75+
from pythonpro.domain import user_domain
7676
for user in queryset:
7777
try:
78-
user_facade.promote_pythonista(user, 'django_admin')
78+
user_domain.promote_pythonista(user, 'django_admin')
7979
except UserRoleException:
8080
pass # No need to handle on admin
8181

8282
def make_data_scientist(self, request, queryset):
83-
from pythonpro.domain import user_facade
83+
from pythonpro.domain import user_domain
8484
for user in queryset:
8585
try:
86-
user_facade.promote_data_scientist(user, 'django_admin')
86+
user_domain.promote_data_scientist(user, 'django_admin')
8787
except UserRoleException:
8888
pass # No need to handle on admin
8989

9090
def make_member(self, request, queryset):
91-
from pythonpro.domain import user_facade
91+
from pythonpro.domain import user_domain
9292
for user in queryset:
9393
try:
94-
user_facade.promote_member(user, 'django_admin')
94+
user_domain.promote_member(user, 'django_admin')
9595
except UserRoleException:
9696
pass # No need to handle on admin
9797

‎pythonpro/core/tests/test_admin.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
from rolepermissions.roles import RolesManager
55

66
from pythonpro.core.admin import UserAdmin
7-
from pythonpro.domain import user_facade
7+
from pythonpro.domain import user_domain
88

99

1010
@pytest.fixture
1111
def sync_user_delay(mocker):
12-
return mocker.patch('pythonpro.domain.user_facade.sync_user_on_discourse.delay')
12+
return mocker.patch('pythonpro.domain.user_domain.sync_user_on_discourse.delay')
1313

1414

1515
@pytest.fixture
1616
def email_market_mocks(mocker):
17-
maybe_function_names = dir(user_facade._email_marketing_facade)
17+
maybe_function_names = dir(user_domain._email_marketing_facade)
1818
task_function_mocks = []
1919
for name in maybe_function_names:
20-
maybe_task_function = getattr(user_facade._email_marketing_facade, name)
20+
maybe_task_function = getattr(user_domain._email_marketing_facade, name)
2121
if hasattr(maybe_task_function, 'delay'):
2222
task_function_mocks.append(mocker.patch(
23-
f'pythonpro.domain.user_facade._email_marketing_facade.{name}.delay', side_effeict=maybe_task_function
23+
f'pythonpro.domain.user_domain._email_marketing_facade.{name}.delay', side_effeict=maybe_task_function
2424
))
2525
return task_function_mocks
2626

‎pythonpro/core/tests/test_lead_landing_page.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def test_user_with_webdev_roles_can_access_landing_page(resp_with_user_with_webd
7474

7575
@pytest.fixture
7676
def create_lead_mock(mocker):
77-
return mocker.patch('pythonpro.domain.user_facade._email_marketing_facade.create_or_update_lead.delay')
77+
return mocker.patch('pythonpro.domain.user_domain._email_marketing_facade.create_or_update_lead.delay')
7878

7979

8080
@pytest.fixture()
@@ -141,7 +141,7 @@ def resp_lead_change_pasword(resp_lead_creation, client):
141141

142142
@pytest.fixture(autouse=True)
143143
def sync_user_delay(mocker):
144-
return mocker.patch('pythonpro.domain.user_facade.sync_user_on_discourse.delay')
144+
return mocker.patch('pythonpro.domain.user_domain.sync_user_on_discourse.delay')
145145

146146

147147
def test_user_discourse_sync(resp_lead_creation, sync_user_delay):

‎pythonpro/core/views.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from pythonpro.core import facade as core_facade
1515
from pythonpro.core.forms import LeadForm, UserEmailForm, UserSignupForm, PythonProResetForm
1616
from pythonpro.core.models import User
17-
from pythonpro.domain import user_facade
17+
from pythonpro.domain import user_domain
1818

1919

2020
def index(request):
@@ -187,8 +187,8 @@ def _lead_form(request, *args, **kwargs):
187187
tags.append(f"{key}={value}")
188188

189189
try:
190-
user = user_facade.register_lead(first_name, email, source, tags=tags)
191-
except user_facade.UserCreationException as e:
190+
user = user_domain.register_lead(first_name, email, source, tags=tags)
191+
except user_domain.UserCreationException as e:
192192
return render(request, 'core/lead_form_errors.html', context={'form': e.form}, status=400)
193193

194194
login(request, user)

‎pythonpro/dashboard/tests/test_interaction_creation.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
from model_bakery import baker
44

55
from pythonpro.dashboard.models import TopicInteraction
6-
from pythonpro.domain import user_facade
6+
from pythonpro.domain import user_domain
77
from pythonpro.modules.models import Topic
88

99

1010
@pytest.fixture
1111
def remove_tags_mock(mocker):
12-
return mocker.patch('pythonpro.domain.user_facade._email_marketing_facade.remove_tags.delay')
12+
return mocker.patch('pythonpro.domain.user_domain._email_marketing_facade.remove_tags.delay')
1313

1414

1515
@pytest.fixture
@@ -54,7 +54,7 @@ def test_user_mark_on_email_marketing(resp, remove_tags_mock, logged_user):
5454

5555

5656
def test_user_activation(resp, remove_tags_mock, logged_user):
57-
assert 'ACTIVATED' == user_facade.find_user_interactions(logged_user)[0].category
57+
assert 'ACTIVATED' == user_domain.find_user_interactions(logged_user)[0].category
5858

5959

6060
def test_topic_interaction_status_code(resp):

0 commit comments

Comments
 (0)