Publish User Created and User Logged in events

Author: spalmurray

codecov_auth/tests/unit/views/test_base.py

@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta, timezone
-from unittest.mock import Mock, patch
+from unittest.mock import Mock, call, patch
 
 import pytest
 from django.conf import settings
@@ -174,6 +174,25 @@ def test_get_or_create_calls_analytics_user_signed_up_when_owner_created(
         )
         user_signed_up_mock.assert_called_once()
 
+    @patch("shared.events.amplitude.AmplitudeEventPublisher.publish")
+    def test_get_or_create_calls_amplitude_user_created_when_owner_created(
+        self, amplitude_publish_mock
+    ):
+        self.mixin_instance._get_or_create_owner(
+            {
+                "user": {"id": 12345, "key": "4567", "login": "testuser"},
+                "has_private_access": False,
+            },
+            self.request,
+        )
+
+        amplitude_publish_mock.assert_has_calls(
+            [
+                call("User Created", {"user_ownerid": 15}),
+                call("set_orgs", {"user_ownerid": 15, "org_ids": []}),
+            ]
+        )
+
     @patch("services.analytics.AnalyticsService.user_signed_in")
     def test_get_or_create_calls_analytics_user_signed_in_when_owner_not_created(
         self, user_signed_in_mock
@@ -192,6 +211,30 @@ def test_get_or_create_calls_analytics_user_signed_in_when_owner_not_created(
         )
         user_signed_in_mock.assert_called_once()
 
+    @patch("shared.events.amplitude.AmplitudeEventPublisher.publish")
+    def test_get_or_create_calls_amplitude_user_logged_in_when_owner_not_created(
+        self, amplitude_publish_mock
+    ):
+        owner = OwnerFactory(service_id=89, service="github", organizations=[1, 2])
+        self.mixin_instance._get_or_create_owner(
+            {
+                "user": {
+                    "id": owner.service_id,
+                    "key": "02or0sa",
+                    "login": owner.username,
+                },
+                "has_private_access": owner.private_access,
+            },
+            self.request,
+        )
+
+        amplitude_publish_mock.assert_has_calls(
+            [
+                call("User Logged in", {"user_ownerid": 16}),
+                call("set_orgs", {"user_ownerid": 16, "org_ids": [1, 2]}),
+            ]
+        )
+
     @override_settings(IS_ENTERPRISE=False)
     @patch("services.analytics.AnalyticsService.user_signed_in")
     def test_set_marketing_tags_on_cookies(self, user_signed_in_mock):

codecov_auth/views/base.py

@@ -15,6 +15,7 @@
 from django.utils import timezone
 from django.utils.timezone import now
 from shared.encryption.token import encode_token
+from shared.events.amplitude import AmplitudeEventPublisher
 from shared.license import LICENSE_ERRORS_MESSAGES, get_current_license
 
 from codecov_auth.models import Owner, OwnerProfile, Session, User
@@ -393,10 +394,21 @@ def _get_or_create_owner(
         owner.save(update_fields=fields_to_update)
 
         marketing_tags = self.retrieve_marketing_tags_from_cookie()
+        amplitude = AmplitudeEventPublisher()
         if was_created:
             self.analytics_service.user_signed_up(owner, **marketing_tags)
+            amplitude.publish("User Created", {"user_ownerid": owner.ownerid})
         else:
             self.analytics_service.user_signed_in(owner, **marketing_tags)
+            amplitude.publish("User Logged in", {"user_ownerid": owner.ownerid})
+        orgs = owner.organizations
+        amplitude.publish(
+            "set_orgs",
+            {
+                "user_ownerid": owner.ownerid,
+                "org_ids": orgs if orgs is not None else [],
+            },
+        )
 
         return (owner, was_created)