Included tag form last cohort on email marketing domain

renzon · renzon · commit 9af647a94fde · 2021-06-09T23:16:41.000-03:00
close #3790
diff --git a/pythonpro/domain/subscription_domain.py b/pythonpro/domain/subscription_domain.py
@@ -83,14 +83,17 @@ def activate_subscription_on_all_services(subscription: Subscription, responsibl
     memberkit_facade.activate(subscription, responsible, observation)
     sync_user_on_discourse(subscription)
     subscriber = subscription.subscriber
+    tags = list(subscription.email_marketing_tags)
+    if subscription.include_on_cohort:
+        cohort_facade.subscribe_to_last_cohort(subscriber)
+        cohort = cohort_facade.find_most_recent_cohort()
+        tags.append(f'turma-{cohort.slug}')
     email_marketing_facade.create_or_update_user.delay(
         subscriber.get_full_name(),
         subscriber.email,
         None,
-        *subscription.email_marketing_tags,
+        *tags,
         id=subscription.id,
         phone=phone
     )
-    if subscription.include_on_cohort:
-        cohort_facade.subscribe_to_last_cohort(subscriber)
     return subscription
diff --git a/pythonpro/memberkit/migrations/0007_allow_subscripiton_be_saved_without_payment.py b/pythonpro/memberkit/migrations/0007_allow_subscripiton_be_saved_without_payment.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.2.4 on 2021-06-10 02:08
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('django_pagarme', '0005_change_primary_key_to_big_integer'),
+        ('memberkit', '0006_include_cohort_subscription_flag'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subscription',
+            name='payment',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING,
+                                       to='django_pagarme.pagarmepayment'),
+        ),
+    ]
diff --git a/pythonpro/memberkit/models.py b/pythonpro/memberkit/models.py
@@ -42,7 +42,7 @@ class Status(models.TextChoices):
     status = models.CharField(max_length=1, choices=Status.choices)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
-    payment = models.OneToOneField('django_pagarme.PagarmePayment', on_delete=models.DO_NOTHING, null=True)
+    payment = models.OneToOneField('django_pagarme.PagarmePayment', on_delete=models.DO_NOTHING, null=True, blank=True)
     subscription_types = models.ManyToManyField(SubscriptionType, related_name='subscriptions')
     subscriber = models.ForeignKey(get_user_model(), on_delete=models.DO_NOTHING, null=True,
                                    related_name='subscriptions')
