pedro
/
django-orchestra-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix resource agragation otion last value query

This commit is contained in:
Jorge Pastor 2023-09-25 11:47:24 +02:00 committed by pedro
parent 465862e444
commit be039bbeeb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
orchestra/contrib/resources/aggregations.py
View File

@ -32,7 +32,12 @@ class Last(Aggregation):
verbose_name = _("Last value") verbose_name = _("Last value")
def filter(self, dataset, date=None): def filter(self, dataset, date=None):
dataset = dataset.order_by('object_id', '-id').distinct('monitor')
# dataset = dataset.order_by('object_id', '-id').distinct('monitor')
now = timezone.now()
epoch = now - datetime.timedelta(minutes=2)
dataset = dataset.filter( created_at__range=(epoch, now ))
if date is not None: if date is not None:
dataset = dataset.filter(created_at__lte=date) dataset = dataset.filter(created_at__lte=date)
return dataset return dataset