Merge pull request learningequality#10781 from LianaHarris360/full-fa…

…cility-save-learner-statuses Updates LearnerDeviceStatus status saving method to remove NotImpleme…
MisRob · Jun 8, 2023 · 726134e · 726134e
2 parents 4fbffdb + b10bfba
commit 726134e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/kolibri/core/device/models.py b/kolibri/core/device/models.py
@@ -464,15 +464,11 @@ def save_statuses(cls, status):
         :param status: A status tuple of which to save, see `DeviceStatus`
         :type status: tuple(string, int)
         """
-        if not get_device_setting(
+        if get_device_setting(
             "subset_of_users_device", default=not device_provisioned()
         ):
-            raise NotImplementedError(
-                "Saving all learner statuses is not supported on full-facility devices"
-            )
-
-        for user_id in FacilityUser.objects.all().values_list("id", flat=True):
-            cls.save_learner_status(user_id, status)
+            for user_id in FacilityUser.objects.all().values_list("id", flat=True):
+                cls.save_learner_status(user_id, status)
 
     @classmethod
     def save_learner_status(cls, learner_user_id, status):
@@ -507,15 +503,11 @@ def clear_statuses(cls):
         provisioned as a `subset_of_users_device`
         :return:
         """
-        if not get_device_setting(
+        if get_device_setting(
             "subset_of_users_device", default=not device_provisioned()
         ):
-            raise NotImplementedError(
-                "Saving all learner statuses is not supported on full-facility devices"
-            )
-
-        for user_id in FacilityUser.objects.all().values_list("id", flat=True):
-            cls.clear_learner_status(user_id)
+            for user_id in FacilityUser.objects.all().values_list("id", flat=True):
+                cls.clear_learner_status(user_id)
 
     @classmethod
     def clear_learner_status(cls, learner_user_id):

diff --git a/kolibri/core/device/test/test_models.py b/kolibri/core/device/test/test_models.py
@@ -139,8 +139,8 @@ def test_clear_learner_status(self):
 
     @mock.patch("kolibri.core.device.models.device_provisioned", return_value=True)
     def test_save_statuses__not_subset_of_users_device(self, _):
-        with self.assertRaises(NotImplementedError):
-            LearnerDeviceStatus.save_statuses(DeviceStatus.InsufficientStorage)
+        LearnerDeviceStatus.save_statuses(DeviceStatus.InsufficientStorage)
+        self.assertEqual(LearnerDeviceStatus.objects.count(), 0)
 
     @mock.patch("kolibri.core.device.models.get_device_setting", return_value=True)
     def test_save_statuses(self, mock_device_setting):