Merge remote-tracking branch 'origin/v3.6'

server/src/uds/migrations/0043_auto_20220704_2120.py

@@ -38,4 +38,12 @@ class Migration(migrations.Migration):
             name='mfa',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='authenticators', to='uds.mfa'),
         ),
+        migrations.RemoveIndex(
+            model_name='statscounters',
+            name='uds_stats_c_owner_t_db894d_idx',
+        ),
+        migrations.RemoveIndex(
+            model_name='statscounters',
+            name='uds_stats_c_owner_t_a195c1_idx',
+        ),
     ]

server/src/uds/models/stats_counters.py

@@ -66,10 +66,6 @@ class StatsCounters(models.Model):
 
         db_table = 'uds_stats_c'
         app_label = 'uds'
-        indexes = [
-            models.Index(fields=['owner_type', 'stamp']),
-            models.Index(fields=['owner_type', 'counter_type', 'stamp']),
-        ]
 
     @staticmethod
     def get_grouped(
@@ -143,6 +139,44 @@ class StatsCounters(models.Model):
         for i in q:
             yield StatsCounters(id=-1, owner_type=-1, counter_type=-1, stamp=i['group_by_stamp'], value=i['value'])
 
+    @staticmethod
+    def gp(
+        owner_type: typing.Union[int, typing.Iterable[int]], counter_type: int, **kwargs
+    ) -> typing.Any:
+        """
+        Returns a QuerySet of counters grouped by owner_type and counter_type
+        """
+        if isinstance(owner_type, int):
+            owner_type = [owner_type]
+
+        q = StatsCounters.objects.filter(owner_type__in=owner_type, counter_type=counter_type)
+
+        if kwargs.get('owner_id'):
+            # If owner_id is a int, we add it to the list
+            if isinstance(kwargs['owner_id'], int):
+                kwargs['owner_id'] = [kwargs['owner_id']]
+
+            q = q.filter(owner_id__in=kwargs['owner_id'])
+
+        since = kwargs.get('since')
+        if isinstance(since, datetime.datetime):
+            # Convert to unix timestamp
+            since = int(since.timestamp())
+        if not since:
+            # Get first timestamp from table, we knwo table has at least one record
+            since = StatsCounters.objects.order_by('stamp').first().stamp # type: ignore
+        to = kwargs.get('to')
+        if isinstance(to, datetime.datetime):
+            # Convert to unix timestamp
+            to = int(to.timestamp())
+        if not to:
+            # Get last timestamp from table, we know table has at least one record
+            to = StatsCounters.objects.order_by('-stamp').first().stamp # type: ignore
+
+        q = q.filter(stamp__gte=since, stamp__lte=to)
+
+        return q
+
     @staticmethod
     def get_grouped_old(
         owner_type: typing.Union[int, typing.Iterable[int]], counter_type: int, **kwargs