Fixes issue 108 - additional filter on tended drinks (#109)

* Adds an additional filter for tended drinks to exclude drinks without a DCF, transactions, and kegs.

* Added distinct to query

---------

Co-authored-by: Frank van Mourik <[email protected]>

alexia/apps/organization/models.py

@@ -4,6 +4,7 @@
 
 from django.conf import settings
 from django.db import models
+from django.db.models import Q
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.encoding import python_2_unicode_compatible
@@ -114,10 +115,12 @@ def has_iva(self):
 
     def tended_count(self):
         return BartenderAvailability.objects.filter(
+            Q(event__kegs__gt=0) | Q(event__consumptionform__isnull=False) | Q(event__orders=True) |
+                Q(event__ends_at__lte=timezone.datetime(2016, 12, 13)),  # Date of first consumption form
             user=self.user,
             event__ends_at__lte=timezone.now(),
             availability__nature=Availability.ASSIGNED,
-        ).count()
+        ).distinct().count()
 
     def get_bartender_name(self):
         return (self.nickname or self.user.first_name)