From 8c106c9336287046ebddaaf266a657cb28cbdb77 Mon Sep 17 00:00:00 2001 From: Kevin Alberts Date: Mon, 18 Mar 2024 19:53:39 +0100 Subject: [PATCH] Re-use functions instead of duplicating code --- amelie/members/managers.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/amelie/members/managers.py b/amelie/members/managers.py index 664380a..2cbc8d2 100644 --- a/amelie/members/managers.py +++ b/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