Commit 3e8631c2 by Calen Pennington

Make the use of StudentModules explicit in variable names in user_state_client.py

parent 13dc390f
...@@ -136,7 +136,7 @@ class DjangoXBlockUserStateClient(XBlockUserStateClient): ...@@ -136,7 +136,7 @@ class DjangoXBlockUserStateClient(XBlockUserStateClient):
} }
@contract(username="basestring", block_keys="seq(UsageKey)|set(UsageKey)") @contract(username="basestring", block_keys="seq(UsageKey)|set(UsageKey)")
def _get_field_objects(self, username, block_keys): def _get_student_modules(self, username, block_keys):
""" """
Retrieve the :class:`~StudentModule`s for the supplied ``username`` and ``block_keys``. Retrieve the :class:`~StudentModule`s for the supplied ``username`` and ``block_keys``.
...@@ -186,7 +186,7 @@ class DjangoXBlockUserStateClient(XBlockUserStateClient): ...@@ -186,7 +186,7 @@ class DjangoXBlockUserStateClient(XBlockUserStateClient):
if scope != Scope.user_state: if scope != Scope.user_state:
raise ValueError("Only Scope.user_state is supported, not {}".format(scope)) raise ValueError("Only Scope.user_state is supported, not {}".format(scope))
modules = self._get_field_objects(username, block_keys) modules = self._get_student_modules(username, block_keys)
for module, usage_key in modules: for module, usage_key in modules:
if module.state is None: if module.state is None:
state = {} state = {}
...@@ -256,12 +256,12 @@ class DjangoXBlockUserStateClient(XBlockUserStateClient): ...@@ -256,12 +256,12 @@ class DjangoXBlockUserStateClient(XBlockUserStateClient):
if scope != Scope.user_state: if scope != Scope.user_state:
raise ValueError("Only Scope.user_state is supported") raise ValueError("Only Scope.user_state is supported")
student_modules = self._get_field_objects(username, block_keys) student_modules = self._get_student_modules(username, block_keys)
for student_module, _ in student_modules: for student_module, _ in student_modules:
if fields is None: if fields is None:
field_object.state = "{}" student_module.state = "{}"
else: else:
current_state = json.loads(field_object.state) current_state = json.loads(student_module.state)
for field in fields: for field in fields:
if field in current_state: if field in current_state:
del current_state[field] del current_state[field]
...@@ -295,13 +295,13 @@ class DjangoXBlockUserStateClient(XBlockUserStateClient): ...@@ -295,13 +295,13 @@ class DjangoXBlockUserStateClient(XBlockUserStateClient):
if scope != Scope.user_state: if scope != Scope.user_state:
raise ValueError("Only Scope.user_state is supported") raise ValueError("Only Scope.user_state is supported")
field_objects = self._get_field_objects(username, block_keys) student_modules = self._get_student_modules(username, block_keys)
for field_object, usage_key in field_objects: for student_module, usage_key in student_modules:
if field_object.state is None: if student_module.state is None:
continue continue
for field in json.loads(field_object.state): for field in json.loads(student_module.state):
yield (usage_key, field, field_object.modified) yield (usage_key, field, student_module.modified)
def get_history(self, username, block_key, scope=Scope.user_state): def get_history(self, username, block_key, scope=Scope.user_state):
"""We don't guarantee that history for many blocks will be fast.""" """We don't guarantee that history for many blocks will be fast."""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment