Fixed bug of removing user's id on ActiveCampaign

renzon · renzon · commit 8da0c61a1148 · 2020-06-04T18:28:15.000-03:00
Inserted user on Usuários Ativos List close #2467
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/pythonpro/email_marketing/facade.py b/pythonpro/email_marketing/facade.py
@@ -66,14 +66,13 @@ def _create_or_update(name: str, email: str, role: str, *tags, id='0', phone=Non
     if settings.ACTIVE_CAMPAIGN_TURNED_ON is False:
         return
     prospect_list_id = _get_lists()['Prospects']
-    id = _normalise_id(id)
     tags = list(tags)
+    id = _normalise_id(id)
 
     data = {
         'email': email,
         'first_name': name.split()[0],
         'tags': ','.join(tags),
-        'field[%PYTHONPRO_ID%]': id,
         f'p[{prospect_list_id}]': prospect_list_id,
         'status': '1',
     }
@@ -82,6 +81,7 @@ def _create_or_update(name: str, email: str, role: str, *tags, id='0', phone=Non
     if id == _normalise_id('0'):
         contact = _client.contacts.create_contact(data)
     else:
+        data['field[%PYTHONPRO_ID%]'] = id
         try:
             contact_id = _find_active_campaign_contact_id(id)
         except ActiveCampaignError:
@@ -91,6 +91,8 @@ def _create_or_update(name: str, email: str, role: str, *tags, id='0', phone=Non
             contact = _client.contacts.edit_contact(data)
     if role:
         grant_role(email, id, role)
+    usuarios_ativos_list_id = _get_lists()['Usuários Ativos']
+    _client.contacts.update_list_status(usuarios_ativos_list_id, contact['subscriber_id'], 1)
     return contact
 
 
@@ -141,6 +143,10 @@ def tag_as(email: str, id: int, *tags):
         data['id'] = _find_active_campaign_contact_id(id)
     except ActiveCampaignError:
         data['email'] = email
+    else:
+        # Activating users all the time she is tagged
+        usuarios_ativos_list_id = _get_lists()['Usuários Ativos']
+        _client.contacts.update_list_status(usuarios_ativos_list_id, data['id'], 1)
     return _client.contacts.add_tag(data)
 
 
diff --git a/pythonpro/email_marketing/tests/test_user_creation.py b/pythonpro/email_marketing/tests/test_user_creation.py
@@ -36,6 +36,7 @@ def test_lists(resps):
     lists = facade._get_lists()
     assert lists == {
         'Python Pro': '1', 'Python Birds': '2', 'Pytools': '3', 'Prospects': '4', 'Plantão de Dúvidas': '5',
+        'Usuários Ativos': '12'
     }
 
 
@@ -69,15 +70,22 @@ def resps_user_not_found(setup_active_settings):
             ),
             json=_user_editon_ok, status=200
         )
+        r.add(
+            r.POST,
+            (
+                'https://foo.pythonhosted.com/api/3/contactLists'
+            ),
+            json=_user_editon_ok, status=200
+        )
 
         yield r
 
 
 def test_client_creation_user_not_found(resps_user_not_found, grant_role_mock):
     facade.create_or_update_client('Renzo Nuccitelli', 'renzo@python.pro.br', 'turma', id=1)
     body_payload = (
-        'email=renzo%40python.pro.br&first_name=Renzo&tags=turma&field%5B%25'
-        'PYTHONPRO_ID%25%5D=0000000001&p%5B4%5D=4&status=1'
+        'email=renzo%40python.pro.br&first_name=Renzo&tags=turma&p%5B4%5D=4&status=1'
+        '&field%5B%25PYTHONPRO_ID%25%5D=0000000001'
     )
     assert resps_user_not_found.calls[2].request.body == body_payload
 
@@ -120,15 +128,22 @@ def resps_user_found(setup_active_settings):
             ),
             json=_user_editon_ok, status=200
         )
+        r.add(
+            r.POST,
+            (
+                'https://foo.pythonhosted.com/api/3/contactLists'
+            ),
+            json=_user_editon_ok, status=200
+        )
 
         yield r
 
 
 def test_client_creation_user_found(resps_user_found, grant_role_mock):
     facade.create_or_update_client('Renzo Nuccitelli', 'renzo@python.pro.br', 'turma', id=1)
     body_payload = (
-        'email=renzo%40python.pro.br&first_name=Renzo&tags=turma&field%5B%25'
-        'PYTHONPRO_ID%25%5D=0000000001&p%5B4%5D=4&status=1&id=1'
+        'email=renzo%40python.pro.br&first_name=Renzo&tags=turma&p%5B4%5D=4&status=1'
+        '&field%5B%25PYTHONPRO_ID%25%5D=0000000001&id=1'
     )
     assert resps_user_found.calls[2].request.body == body_payload
 
@@ -157,15 +172,22 @@ def resps_two_users_found(setup_active_settings):
             ),
             json=_user_editon_ok, status=200
         )
+        r.add(
+            r.POST,
+            (
+                'https://foo.pythonhosted.com/api/3/contactLists'
+            ),
+            json=_user_editon_ok, status=200
+        )
 
         yield r
 
 
 def test_client_creation_two_users_found(resps_two_users_found, grant_role_mock):
     facade.create_or_update_client('Renzo Nuccitelli', 'renzo@python.pro.br', 'turma', id=1)
     body_payload = (
-        'email=renzo%40python.pro.br&first_name=Renzo&tags=turma&field%5B%25'
-        'PYTHONPRO_ID%25%5D=0000000001&p%5B4%5D=4&status=1'
+        'email=renzo%40python.pro.br&first_name=Renzo&tags=turma&p%5B4%5D=4&status=1'
+        '&field%5B%25PYTHONPRO_ID%25%5D=0000000001'
     )
     assert resps_two_users_found.calls[2].request.body == body_payload
 
@@ -249,6 +271,10 @@ def test_granted_client_role(resps_user_found, grant_role_mock):
         'id': '5', 'name': 'Plantão de Dúvidas', 'cdate': '2019-12-06 15:28:51', 'private': '0', 'userid': '1',
         'subscriber_count': 0
     },
+    '5': {
+        'id': '12', 'name': 'Usuários Ativos', 'cdate': '2020-06-06 15:28:51', 'private': '0', 'userid': '1',
+        'subscriber_count': 0
+    },
     'result_code': 1,
     'result_message': 'Sucesso:algo retornou',
     'result_output': 'json'
