From f7050bfa3b6d64104d89c2179c941179e74745b3 Mon Sep 17 00:00:00 2001 From: Matthew Piatetsky Date: Tue, 26 Oct 2021 13:42:39 -0400 Subject: [PATCH] feat: make use of more reasonable timezone when recording user activity (#29075) --- lms/djangoapps/course_goals/models.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lms/djangoapps/course_goals/models.py b/lms/djangoapps/course_goals/models.py index 448b9a2178..0e01e32585 100644 --- a/lms/djangoapps/course_goals/models.py +++ b/lms/djangoapps/course_goals/models.py @@ -4,7 +4,6 @@ Course Goals Models import uuid import logging -import pytz from datetime import datetime, timedelta from django.contrib.auth import get_user_model @@ -18,7 +17,7 @@ from simple_history.models import HistoricalRecords from lms.djangoapps.courseware.masquerade import is_masquerading from lms.djangoapps.course_goals.toggles import COURSE_GOALS_NUMBER_OF_DAYS_GOALS -from openedx.core.djangoapps.user_api.preferences.api import get_user_preferences +from lms.djangoapps.courseware.context_processor import get_user_timezone_or_last_seen_timezone_or_utc from openedx.core.lib.mobile_utils import is_request_from_mobile_app # Each goal is represented by a goal key and a string description. @@ -139,8 +138,7 @@ class UserActivity(models.Model): if is_masquerading(user, course_key): return None - user_preferences = get_user_preferences(user) - timezone = pytz.timezone(user_preferences.get('time_zone', 'UTC')) + timezone = get_user_timezone_or_last_seen_timezone_or_utc(user) now = datetime.now(timezone) date = now.date()