Merge pull request #1194 from samsplunks/time_spent

Moving python time_spent calculation to database aggregation
This commit is contained in:
Christopher Broderick
2024-07-22 22:31:56 +01:00
committed by GitHub

View File

@ -362,11 +362,8 @@ class Queue(models.Model):
"""Return back total time spent on the ticket. This is calculated value """Return back total time spent on the ticket. This is calculated value
based on total sum from all FollowUps based on total sum from all FollowUps
""" """
total = datetime.timedelta(0) res = FollowUp.objects.filter(ticket__queue=self).aggregate(models.Sum('time_spent'))
for val in self.ticket_set.all(): return res.get('time_spent__sum', datetime.timedelta(0))
if val.time_spent:
total = total + val.time_spent
return total
@property @property
def time_spent_formated(self): def time_spent_formated(self):
@ -582,11 +579,8 @@ class Ticket(models.Model):
"""Return back total time spent on the ticket. This is calculated value """Return back total time spent on the ticket. This is calculated value
based on total sum from all FollowUps based on total sum from all FollowUps
""" """
total = datetime.timedelta(0) res = FollowUp.objects.filter(ticket=self).aggregate(models.Sum('time_spent'))
for val in self.followup_set.all(): return res.get('time_spent__sum', datetime.timedelta(0))
if val.time_spent:
total = total + val.time_spent
return total
@property @property
def time_spent_formated(self): def time_spent_formated(self):