From cfe561a347aa24688d11048817b1519e8f5768e8 Mon Sep 17 00:00:00 2001 From: renzon Date: Thu, 9 Jun 2022 16:10:45 -0300 Subject: [PATCH] Removed memberkit migration instructions, made direct login to plataforma.dev.pro.br close #4607 --- .../templates/memberkit/migration_form.html | 22 ----------------- pythonpro/memberkit/tests/test_views.py | 1 - pythonpro/memberkit/views.py | 24 +++++++++---------- 3 files changed, 11 insertions(+), 36 deletions(-) delete mode 100755 pythonpro/memberkit/templates/memberkit/migration_form.html diff --git a/pythonpro/memberkit/templates/memberkit/migration_form.html b/pythonpro/memberkit/templates/memberkit/migration_form.html deleted file mode 100755 index 25a30c33..00000000 --- a/pythonpro/memberkit/templates/memberkit/migration_form.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends 'core/base_without_nav.html' %} -{% load static %} - -{% block title %}Migração para nova plataforma{% endblock %} - -{% block body %} -
-
-
-

Migração para nova plataforma

-

-

Olá {{ request.user.first_name }}.

-

Ao clicar no botão abaixo sua conta será migrada para nossa nova plataforma.

-

Você vai receber novas credenciais em seu email {{ request.user.email }}.

-
- {% csrf_token %} - -
-
-
-
-{% endblock body %} diff --git a/pythonpro/memberkit/tests/test_views.py b/pythonpro/memberkit/tests/test_views.py index 24f1d492..fc64ffb3 100644 --- a/pythonpro/memberkit/tests/test_views.py +++ b/pythonpro/memberkit/tests/test_views.py @@ -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 diff --git a/pythonpro/memberkit/views.py b/pythonpro/memberkit/views.py index 741029af..6de38239 100644 --- a/pythonpro/memberkit/views.py +++ b/pythonpro/memberkit/views.py @@ -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)