From 2850470c9740b93c4df30746270312cdaec9201f Mon Sep 17 00:00:00 2001
From: ray <ray@codeinstitute.net>
Date: Thu, 30 Jan 2025 10:24:51 +0000
Subject: [PATCH] Removing other username entries from logs

---
 common/djangoapps/track/views/__init__.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/djangoapps/track/views/__init__.py b/common/djangoapps/track/views/__init__.py
index 2366a5b815..a2ac62f298 100644
--- a/common/djangoapps/track/views/__init__.py
+++ b/common/djangoapps/track/views/__init__.py
@@ -92,6 +92,11 @@ def user_track(request):
         except ValueError:
             pass
 
+        try:
+            data.pop('username')
+        except KeyError:
+            pass
+
     context_override = contexts.course_context_from_url(page)
     context_override['user_id'] = user_id
     context_override['event_source'] = 'browser'
@@ -128,13 +133,13 @@ def server_track(request, event_type, event, page=None):
         return  # don't log
 
     try:
-        username = request.user.username
+        user_id = request.user.id
     except:
-        username = "anonymous"
+        user_id = 0
 
     context_override = _get_course_context(page)
     context_override.update({
-        'username': username,
+        'user_id': user_id,
         'event_source': 'server',
         'page': page
     })
@@ -170,7 +175,6 @@ def task_track(request_info, task_info, event_type, event, page=None):
 
     context_override = contexts.course_context_from_url(page)
     context_override.update({
-        'username': request_info.get('username', 'unknown'),
         'ip': request_info.get('ip', 'unknown'),
         'agent': request_info.get('agent', 'unknown'),
         'host': request_info.get('host', 'unknown'),