[req-changes] Minor fixes

Author: pandafy

.github/workflows/ci.yml

@@ -8,8 +8,6 @@ on:
   pull_request:
     branches:
       - master
-      # TODO: Remove before merging
-      - issues/643-coa
 
 jobs:
   build:

openwisp_radius/api/serializers.py

@@ -305,8 +305,9 @@ def get_result(self, obj):
                 group_check=obj,
             )
             consumed = counter.consumed()
-            if consumed > int(obj.value):
-                consumed = int(obj.value)
+            value = int(obj.value)
+            if consumed > value:
+                consumed = value
             return consumed
         except (SkipCheck, ValueError, KeyError):
             return None

openwisp_radius/counters/base.py

@@ -80,7 +80,7 @@ def get_attribute_type(self):
 
     def get_reset_timestamps(self):
         try:
-            return resets[self.reset](self.user, self)
+            return resets[self.reset](self.user, counter=self)
         except KeyError:
             raise SkipCheck(
                 message=f'Reset time with key "{self.reset}" not available.',
@@ -101,7 +101,7 @@ def get_counter(self):
         # or if nothing is returned (no sessions present), return zero
         return row[0] or 0
 
-    def check(self, gigawords=True):
+    def check(self):
         if not self.group_check:
             raise SkipCheck(
                 message=(

openwisp_radius/counters/resets.py

@@ -11,29 +11,29 @@ def _timestamp(start, end):
     return int(start.timestamp()), int(end.timestamp())
 
 
-def _daily(user=None, counter=None):
+def _daily(user=None, **kwargs):
     dt = _today()
     start = datetime(dt.year, dt.month, dt.day)
     end = datetime(dt.year, dt.month, dt.day) + timedelta(days=1)
     return _timestamp(start, end)
 
 
-def _weekly(user=None, counter=None):
+def _weekly(user=None, **kwargs):
     dt = _today()
     start = dt - timedelta(days=dt.weekday())
     start = datetime(start.year, start.month, start.day)
     end = start + timedelta(days=7)
     return _timestamp(start, end)
 
 
-def _monthly(user=None, counter=None):
+def _monthly(user=None, **kwargs):
     dt = _today()
     start = datetime(dt.year, dt.month, 1)
     end = datetime(dt.year, dt.month, 1) + relativedelta(months=1)
     return _timestamp(start, end)
 
 
-def _monthly_subscription(user):
+def _monthly_subscription(user, **kwargs):
     dt = _today()
     day_joined = user.date_joined.day
     # subscription cycle starts on the day of month the user joined
@@ -45,7 +45,7 @@ def _monthly_subscription(user):
     return _timestamp(start, end)
 
 
-def _never(user=None, counter=None):
+def _never(user=None, **kwargs):
     return 0, None