Make variant alias required (#28)

Author: adinhodovic

django_google_optimize/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.2 on 2020-01-29 07:56
+# Generated by Django 3.0.2 on 2020-01-29 08:36
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('index', models.IntegerField()),
-                ('alias', models.CharField(blank=True, max_length=50, null=True)),
+                ('alias', models.CharField(default='', max_length=50)),
                 ('experiment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='experiment_variant', to='django_google_optimize.GoogleExperiment')),
             ],
         ),

django_google_optimize/models.py

@@ -11,7 +11,7 @@ class GoogleExperiment(models.Model):
 
 class ExperimentVariant(models.Model):
     index = models.IntegerField()
-    alias = models.CharField(max_length=50, blank=True, null=True)
+    alias = models.CharField(max_length=50, default="")
     experiment = models.ForeignKey(
         GoogleExperiment,
         null=True,

django_google_optimize/utils.py

@@ -40,22 +40,12 @@ def get_experiments_variants(request):
 
         variant_name = cookie_data[experiment_id]
 
-        experiment_variants = experiment.experiment_variant.all()
-
-        if experiment_variants:
-            variant = experiment_variants.filter(index=variant_name).first()
-            if variant:
-                if variant.alias:
-                    variant_name = variant.alias
-            else:
-                logger.warning(
-                    "No experiment variant added with the index %s", variant_name
-                )
-                return None
-
-        experiment_alias = experiment.experiment_alias
-        if experiment_alias:
-            active_experiments[experiment_alias] = variant_name
+        variant = experiment.experiment_variant.all().filter(index=variant_name).first()
+        if variant:
+            variant_name = variant.alias
+
+        if experiment.experiment_alias:
+            active_experiments[experiment.experiment_alias] = variant_name
         else:
             active_experiments[experiment_id] = variant_name
 

tests/test_utils.py

@@ -63,17 +63,6 @@ def test_logs_failed_cookie_parsing(logger):
     logger.assert_called_with("Failed to parse _gaexp %s", "test")
 
 
-@pytest.mark.django_db
-@mock.patch("logging.Logger.warning")
-def test_logs_no_experiment_variant(logger):
-    exp = GoogleExperimentFactory()
-    ExperimentVariantFactory(index=0, alias="new_design", experiment=exp)
-    request = HttpRequest()
-    request.COOKIES["_gaexp"] = f"GAX1.2.{exp.experiment_id}.18147.1"
-    get_experiments_variants(request)
-    logger.assert_called_with("No experiment variant added with the index %s", 1)
-
-
 @pytest.mark.django_db
 @mock.patch("logging.Logger.warning")
 def test_logs_experiment_id_not_in_cookies(logger):
@@ -137,16 +126,6 @@ def test_parses_experiments_without_experiment_alias():
     assert values == {exp.experiment_id: variant.alias}
 
 
-@pytest.mark.django_db
-def test_parses_experiments_without_variant_alias():
-    exp = GoogleExperimentFactory()
-    variant = ExperimentVariantFactory(index=1, alias=None, experiment=exp)
-    request = HttpRequest()
-    request.COOKIES["_gaexp"] = f"GAX1.2.{exp.experiment_id}.18147.{variant.index}"
-    values = get_experiments_variants(request)
-    assert values == {exp.experiment_alias: variant.index}
-
-
 @pytest.mark.django_db
 def test_filters_active_experiments():
     exp = GoogleExperimentFactory()