diff --git a/completion_aggregator/models.py b/completion_aggregator/models.py index 3f848c3d..62c1d0fd 100644 --- a/completion_aggregator/models.py +++ b/completion_aggregator/models.py @@ -201,6 +201,7 @@ def emit_completion_aggregator_logs(updated_aggregators): event_name, { "user_id": aggregator.user_id, + "username": aggregator.user.username, "course_id": str(aggregator.course_key), "block_id": str(aggregator.block_key), "modified": aggregator.modified, diff --git a/tests/fixtures/raw/openedx.completion_aggregator.progress.chapter.json b/tests/fixtures/raw/openedx.completion_aggregator.progress.chapter.json index 007e09a7..3bd42191 100644 --- a/tests/fixtures/raw/openedx.completion_aggregator.progress.chapter.json +++ b/tests/fixtures/raw/openedx.completion_aggregator.progress.chapter.json @@ -3,6 +3,7 @@ "timestamp": "2023-12-05T21:34:52.909063+00:00", "data": { "user_id": 4, + "username": "openedx", "course_id": "course-v1:edX+DemoX+Demo_Course", "context_key": "course-v1:edX+DemoX+Demo_Course", "block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@b443e0d6bc4d43c1bed991dbd8a10d42", @@ -15,7 +16,7 @@ "course_id": "course-v1:edX+DemoX+Demo_Course", "course_user_tags": {}, "session": "056aca2a1c6b76742b283e73d3424453", - "user_id": 3, + "user_id": 4, "username": "openedx", "ip": "172.18.0.1", "host": "localhost:18000", diff --git a/tests/fixtures/raw/openedx.completion_aggregator.progress.course.json b/tests/fixtures/raw/openedx.completion_aggregator.progress.course.json index dbd5ece4..3e50bc5a 100644 --- a/tests/fixtures/raw/openedx.completion_aggregator.progress.course.json +++ b/tests/fixtures/raw/openedx.completion_aggregator.progress.course.json @@ -3,6 +3,7 @@ "timestamp": "2023-12-05T21:34:52.909063+00:00", "data": { "user_id": 4, + "username": "openedx", "course_id": "course-v1:edX+DemoX+Demo_Course", "context_key": "course-v1:edX+DemoX+Demo_Course", "block_id": "block-v1:edX+DemoX+Demo_Course+type@course+block@course", @@ -15,7 +16,7 @@ "course_id": "course-v1:edX+DemoX+Demo_Course", "course_user_tags": {}, "session": "056aca2a1c6b76742b283e73d3424453", - "user_id": 3, + "user_id": 4, "username": "openedx", "ip": "172.18.0.1", "host": "localhost:18000", diff --git a/tests/fixtures/raw/openedx.completion_aggregator.progress.sequential.json b/tests/fixtures/raw/openedx.completion_aggregator.progress.sequential.json index 949f44aa..e1726192 100644 --- a/tests/fixtures/raw/openedx.completion_aggregator.progress.sequential.json +++ b/tests/fixtures/raw/openedx.completion_aggregator.progress.sequential.json @@ -3,6 +3,7 @@ "timestamp": "2023-12-05T21:34:52.909063+00:00", "data": { "user_id": 4, + "username": "openedx", "course_id": "course-v1:edX+DemoX+Demo_Course", "context_key": "course-v1:edX+DemoX+Demo_Course", "block_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@bf1eac10ebb649e3aaf9cc07325f8e04", @@ -15,7 +16,7 @@ "course_id": "course-v1:edX+DemoX+Demo_Course", "course_user_tags": {}, "session": "056aca2a1c6b76742b283e73d3424453", - "user_id": 3, + "user_id": 4, "username": "openedx", "ip": "172.18.0.1", "host": "localhost:18000", diff --git a/tests/fixtures/raw/openedx.completion_aggregator.progress.vertical.json b/tests/fixtures/raw/openedx.completion_aggregator.progress.vertical.json index 3d8d8a49..9618c1c0 100644 --- a/tests/fixtures/raw/openedx.completion_aggregator.progress.vertical.json +++ b/tests/fixtures/raw/openedx.completion_aggregator.progress.vertical.json @@ -3,6 +3,7 @@ "timestamp": "2023-12-05T21:34:52.909063+00:00", "data": { "user_id": 4, + "username": "openedx", "course_id": "course-v1:edX+DemoX+Demo_Course", "context_key": "course-v1:edX+DemoX+Demo_Course", "block_id": "block-v1:edX+DemoX+Demo_Course+type@vertical+block@e1fabd9fa55f441caa75580f258ffbc3", @@ -15,7 +16,7 @@ "course_id": "course-v1:edX+DemoX+Demo_Course", "course_user_tags": {}, "session": "056aca2a1c6b76742b283e73d3424453", - "user_id": 3, + "user_id": 4, "username": "openedx", "ip": "172.18.0.1", "host": "localhost:18000", diff --git a/tests/test_models.py b/tests/test_models.py index 2a7dddba..8c6d583d 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -249,6 +249,7 @@ def assert_emit_method_called(self, obj): f"openedx.completion_aggregator.progress.{obj.aggregation_name}", { "user_id": obj.user_id, + "username": obj.user.username, "course_id": str(obj.course_key), "block_id": str(obj.block_key), "modified": obj.modified,