From 860ecbffc591709ed8e7fdb9f2d708c119acb60d Mon Sep 17 00:00:00 2001 From: Lyn Nagara Date: Tue, 31 Dec 2019 12:56:04 -0800 Subject: [PATCH] fix(SnubaEvent): Fix bug in get_minimal_user This code didn't previously work (user should be an interface of an event), it just happens to not currently be called in any situation where snuba data isn't populated. --- src/sentry/models/event.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/sentry/models/event.py b/src/sentry/models/event.py index 05dded33a7bd91..2afaa565ee5abc 100644 --- a/src/sentry/models/event.py +++ b/src/sentry/models/event.py @@ -437,15 +437,12 @@ def get_minimal_user(self): email = self.snuba_data["email"] username = self.snuba_data["username"] ip_address = self.snuba_data["ip_address"] - else: - user_id = self.data["user_id"] - email = self.data["email"] - username = self.data["username"] - ip_address = self.data["ip_address"] - return User.to_python( - {"id": user_id, "email": email, "username": username, "ip_address": ip_address} - ) + return User.to_python( + {"id": user_id, "email": email, "username": username, "ip_address": ip_address} + ) + + return super(SnubaEvent, self).get_minimal_user() # If the data for these is available from snuba, we assume # it was already normalized on the way in and we can just return