creating source field and implementing his fill by utm_source parameter. resolves #1268

moacirmoda · renzon · commit db24f353ead6 · 2019-06-24T16:28:44.000-03:00
diff --git a/pythonpro/core/admin.py b/pythonpro/core/admin.py
@@ -29,7 +29,7 @@ class UserAdmin(RolePermissionsUserAdminMixin, admin.ModelAdmin):
     add_form_template = 'admin/auth/user/add_form.html'
     change_user_password_template = None
     fieldsets = (
-        (None, {'fields': ('first_name', 'email', 'password')}),
+        (None, {'fields': ('first_name', 'email', 'password', 'source')}),
         (_('Permissions'), {
             'fields': ('is_active', 'is_staff', 'is_superuser',
                        'groups', 'user_permissions')
diff --git a/pythonpro/core/forms.py b/pythonpro/core/forms.py
@@ -45,9 +45,10 @@ class Meta:
         help_text=_("Enter the same password as before, for verification."),
     )
 
-    def save(self, commit=True):
+    def save(self, commit=True, source=None):
         user = super().save(commit=False)
         user.set_password(User.objects.make_random_password(30))
+        user.source = source
         if commit:
             user.save()
         return user
diff --git a/pythonpro/core/migrations/0006_user_source.py b/pythonpro/core/migrations/0006_user_source.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.2 on 2019-06-24 19:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0005_auto_20180603_2026'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='source',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='source'),
+        ),
+    ]
diff --git a/pythonpro/core/models.py b/pythonpro/core/models.py
@@ -33,6 +33,7 @@ class User(AbstractBaseUser, PermissionsMixin):
         ),
     )
     date_joined = models.DateTimeField(_('date joined'), default=timezone.now)
+    source = models.CharField(_('source'), max_length=255, null=True, blank=True)
 
     objects = UserManager()
 
diff --git a/pythonpro/core/templates/core/lead_form.html b/pythonpro/core/templates/core/lead_form.html
@@ -1,4 +1,4 @@
-<form method="post" action="{% url 'core:lead_form' %}">
+<form method="post" action="{% url 'core:lead_form' %}{% if request.GET.utm_source %}?utm_source={{ request.GET.utm_source }}{% endif %}">
     {% csrf_token %}
     <div class="form-group">
         <label for="{{ form.first_name.id_for_label }}">{{ form.first_name.label_tag }}</label>
diff --git a/pythonpro/core/tests/test_lead_landing_page.py b/pythonpro/core/tests/test_lead_landing_page.py
@@ -1,4 +1,4 @@
-from unittest.mock import Mock, call
+from unittest.mock import Mock
 
 import pytest
 from django.urls import reverse
@@ -21,14 +21,9 @@ def create_lead_mock(mocker):
 
 
 @pytest.fixture
-def tag_as_mock(mocker):
-    return mocker.patch('pythonpro.core.views.facade.tag_as')
-
-
-@pytest.fixture
-def resp_lead_creation(client, db, fake: Faker, create_lead_mock, tag_as_mock):
+def resp_lead_creation(client, db, fake: Faker, create_lead_mock):
     client.post(
-        reverse('core:lead_form') + '?mc_source=facebook',
+        reverse('core:lead_form') + '?utm_source=facebook',
         data={
             'first_name': fake.name(),
             'email': fake.email(),
@@ -51,6 +46,6 @@ def test_user_created_as_lead_on_mailchimp(resp_lead_creation, django_user_model
     create_lead_mock.assert_called_once_with(user.first_name, user.email)
 
 
-def test_user_source_marked_on_mailchimp(resp_lead_creation, django_user_model, tag_as_mock: Mock):
+def test_user_source_was_saved_from_url(resp_lead_creation, django_user_model, create_lead_mock: Mock):
     user = django_user_model.objects.first()
-    assert call(user.email, 'source:facebook') == tag_as_mock.call_args
+    assert user.source == 'facebook'
diff --git a/pythonpro/core/views.py b/pythonpro/core/views.py
@@ -106,11 +106,9 @@ def lead_form(request):
         return render(request, 'core/lead_form_errors.html', context={'form': form})
     form = UserSignupForm(request.POST)
     if form.is_valid():
-        user = form.save()
+        source = request.GET.get('utm_source')
+        user = form.save(source=source)
         assign_role(user, 'lead')
         facade.create_or_update_lead(user.first_name, user.email)
-        mc_source = request.GET.get('mc_source')
-        if mc_source:
-            facade.tag_as(user.email, "source:{}".format(mc_source))
         return redirect(reverse('core:thanks'))
     return render(request, 'core/lead_form_errors.html', context={'form': form})

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ class User(AbstractBaseUser, PermissionsMixin):`
`33`	`33`	`),`
`34`	`34`	`)`
`35`	`35`	`date_joined = models.DateTimeField(_('date joined'), default=timezone.now)`
	`36`	`+ source = models.CharField(_('source'), max_length=255, null=True, blank=True)`
`36`	`37`
`37`	`38`	`objects = UserManager()`
`38`	`39`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<form method="post" action="{% url 'core:lead_form' %}">`
	`1`	`+<form method="post" action="{% url 'core:lead_form' %}{% if request.GET.utm_source %}?utm_source={{ request.GET.utm_source }}{% endif %}">`
`2`	`2`	`{% csrf_token %}`
`3`	`3`	`<div class="form-group">`
`4`	`4`	`<label for="{{ form.first_name.id_for_label }}">{{ form.first_name.label_tag }}</label>`