Re-use functions instead of duplicating code

amelie/members/managers.py

@@ -8,24 +8,14 @@
 
 
 class PersonManager(models.Manager):
-    def members(self):
-        return super(PersonManager, self).get_queryset().filter(
-            Q(membership__year=current_association_year()),
-            Q(membership__ended__isnull=True) | Q(membership__ended__gt=datetime.date.today())
-        )
-
     def members_at(self, dt):
         return super(PersonManager, self).get_queryset().filter(
             Q(membership__year=association_year(dt)),
             Q(membership__ended__isnull=True) | Q(membership__ended__gt=dt)
         )
 
-    def active_members(self):
-        return self.members().filter(
-            Q(function__begin__isnull=False),
-            Q(function__end__isnull=True) | Q(function__end__gt=datetime.date.today()),
-            Q(function__committee__abolished__isnull=True) | Q(function__committee__abolished__gt=datetime.date.today())
-        ).distinct()
+    def members(self):
+        return self.members_at(datetime.date.today())
 
     def active_members_at(self, dt):
         return self.members_at(dt).filter(
@@ -35,6 +25,9 @@ def active_members_at(self, dt):
             Q(function__committee__abolished__isnull=True) | Q(function__committee__abolished__gt=dt)
         ).distinct()
 
+    def active_members(self):
+        return self.active_members_at(datetime.date.today())
+
     def board(self):
         # Import here because of circular imports
         from amelie.members.models import Committee