Skip to content

Removed memberkit migration instructions, made direct login to plataf… #4608

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.

Sign up for GitHub

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

Merged
renzon merged 1 commit into from
Jun 9, 2022
Merged

Removed memberkit migration instructions, made direct login to plataf… #4608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 0 additions & 22 deletions pythonpro/memberkit/templates/memberkit/migration_form.html
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion pythonpro/memberkit/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ def active_subscription(subscription, *args, **kwargs):

def test_migrate_page_status_code(client_with_user, mock_generater_token):
resp = client_with_user.get(reverse('migrate_to_memberkit'))
dj_assert_template_used(resp, 'memberkit/migration_form.html')
assert resp.status_code == 200
assert not mock_generater_token.called

Expand Down
24 changes: 11 additions & 13 deletions pythonpro/memberkit/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
@login_required
def migrate_to_memberkit(request):
user = request.user
if request.method == 'POST':
facade.migrate_when_status_active(user)
try:
login_url = facade.create_login_url(user)
except facade.InactiveUserException:
mail_admins(
f'Verificar migração de {user.email}',
f'Link: https://www.python.pro.br/admin/memberkit/subscription/?q={user.email}'
)
return render(request, 'memberkit/manual_migration.html')
else:
return redirect(login_url)
return render(request, 'memberkit/migration_form.html')
facade.migrate_when_status_active(user)
try:
login_url = facade.create_login_url(user)
except facade.InactiveUserException:
mail_admins(
f'Verificar migração de {user.email}',
f'Link: https://www.python.pro.br/admin/memberkit/subscription/?q={user.email}'
)
return render(request, 'memberkit/manual_migration.html')
else:
return redirect(login_url)