Browse Source

feat(eventuser): Migrate unmerge task away from EventUser model (#59674)

## Objective:

Migrate unmerge task away from the EventUser model.
NisanthanNanthakumar 1 year ago
parent
commit
5373a31075
2 changed files with 9 additions and 4 deletions
  1. 4 2
      src/sentry/tasks/unmerge.py
  2. 5 2
      tests/snuba/tasks/test_unmerge.py

+ 4 - 2
src/sentry/tasks/unmerge.py

@@ -14,7 +14,6 @@ from sentry.eventstore.models import BaseEvent
 from sentry.models.activity import Activity
 from sentry.models.environment import Environment
 from sentry.models.eventattachment import EventAttachment
-from sentry.models.eventuser import EventUser
 from sentry.models.group import Group
 from sentry.models.groupenvironment import GroupEnvironment
 from sentry.models.grouphash import GroupHash
@@ -27,6 +26,7 @@ from sentry.tasks.base import instrumented_task
 from sentry.tsdb.base import TSDBModel
 from sentry.types.activity import ActivityType
 from sentry.unmerge import InitialUnmergeArgs, SuccessiveUnmergeArgs, UnmergeArgs, UnmergeArgsBase
+from sentry.utils.eventuser import EventUser
 from sentry.utils.query import celery_run_batch_query
 from sentry.utils.safe import get_path
 
@@ -381,10 +381,12 @@ def get_event_user_from_interface(value, project):
         endpoint="sentry.tasks.unmerge.get_event_user_from_interface",
     )
     return EventUser(
-        ident=value.get("id"),
+        user_ident=value.get("id"),
         email=value.get("email"),
         username=value.get("valuename"),
         ip_address=value.get("ip_address"),
+        project_id=project.id,
+        name=None,
     )
 
 

+ 5 - 2
tests/snuba/tasks/test_unmerge.py

@@ -5,10 +5,12 @@ import hashlib
 import itertools
 import logging
 import uuid
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 from unittest import mock
 from unittest.mock import patch
 
+from django.utils import timezone
+
 from sentry import eventstream, tagstore, tsdb
 from sentry.eventstore.models import Event
 from sentry.models.environment import Environment
@@ -179,7 +181,8 @@ class UnmergeTestCase(TestCase, SnubaTestCase):
             return now + timedelta(seconds=offset)
 
         project = self.create_project()
-
+        project.date_added = timezone.now() - timedelta(minutes=10)
+        project.save()
         sequence = itertools.count(0)
         tag_values = itertools.cycle(["red", "green", "blue"])
         user_values = itertools.cycle([{"id": 1}, {"id": 2}])