[change] Changed api to return reset attribute and updated tests

Author: Iishaan Tanwar

openwisp_radius/api/serializers.py

@@ -335,7 +335,7 @@ def get_reset(self, obj):
                 group=self.context["group"],
                 group_check=obj,
             )
-            start_time, end_time = counter.get_reset_timestamps()
+            _, end_time = counter.get_reset_timestamps()
             return end_time
         except (SkipCheck, ValueError, KeyError):
             return None

openwisp_radius/tests/test_api/test_api.py

@@ -1070,6 +1070,7 @@ def test_user_group_check_serializer_counter_does_not_exist(self):
                 "result": None,
                 "type": None,
                 "value": "2000000000",
+                "reset": None,
             },
         )
 
@@ -1098,6 +1099,7 @@ def test_user_radius_usage_view(self):
                     "value": "10800",
                     "result": 0,
                     "type": "seconds",
+                    "reset": checks[0]["reset"],
                 },
             )
             self.assertDictEqual(
@@ -1108,6 +1110,7 @@ def test_user_radius_usage_view(self):
                     "value": "3000000000",
                     "result": 0,
                     "type": "bytes",
+                    "reset": checks[1]["reset"],
                 },
             )
 
@@ -1139,6 +1142,7 @@ def test_user_radius_usage_view(self):
                     "value": "10800",
                     "result": 261,
                     "type": "seconds",
+                    "reset": checks[0]["reset"],
                 },
             )
             self.assertDictEqual(
@@ -1149,6 +1153,7 @@ def test_user_radius_usage_view(self):
                     "value": "3000000000",
                     "result": 2000000000,
                     "type": "bytes",
+                    "reset": checks[1]["reset"],
                 },
             )
 
@@ -1177,6 +1182,7 @@ def test_user_radius_usage_view(self):
                     "value": "10800",
                     "result": 522,
                     "type": "seconds",
+                    "reset": checks[0]["reset"],
                 },
             )
             self.assertDictEqual(
@@ -1187,6 +1193,7 @@ def test_user_radius_usage_view(self):
                     "value": "3000000000",
                     "result": 3000000000,
                     "type": "bytes",
+                    "reset": checks[1]["reset"],
                 },
             )
 
@@ -1215,6 +1222,7 @@ def test_user_radius_usage_view(self):
                     "value": "10800",
                     "result": 783,
                     "type": "seconds",
+                    "reset": checks[0]["reset"],
                 },
             )
             self.assertDictEqual(
@@ -1225,6 +1233,7 @@ def test_user_radius_usage_view(self):
                     "value": "3000000000",
                     "result": 3000000000,
                     "type": "bytes",
+                    "reset": checks[1]["reset"],
                 },
             )
 
@@ -1251,6 +1260,7 @@ def test_user_group_check_serializer_counter_does_not_exist(self):
                 "result": None,
                 "type": None,
                 "value": "2000000000",
+                "reset": None,
             },
         )
 

setup.py

@@ -50,7 +50,7 @@
         ),
         "passlib~=1.7.1",
         "djangorestframework-link-header-pagination~=0.1.1",
-        "weasyprint>=65,<67",
+        "weasyprint>=65,<68",
         "dj-rest-auth>=6.0,<7.1",
         "django-sendsms~=0.5.0",
         "jsonfield~=3.1.0",