Merge branch '469-oud-leden-op-een-na-verdwenen-uit-ledenlijst' into 'master'

Properly filter former members on member page

Closes #469

See merge request !534

website/members/tests.py

@@ -6,6 +6,8 @@ from django.utils import timezone
 
 from members.models import (Member, Membership,
                             gen_stats_member_type, gen_stats_year)
+from members.views import filter_users
+
 from utils.snippets import datetime_to_lectureyear
 
 
@@ -59,6 +61,54 @@ class MemberBirthdayTest(TestCase):
         self._assert_thom('1992-12-31', '1995-01-01')
 
 
+class MembershipFilterTest(TestCase):
+
+    @classmethod
+    def setUpTestData(cls):
+        # Add 10 members with default membership
+        users = [get_user_model()(id=i, username=i) for i in range(7)]
+        get_user_model().objects.bulk_create(users)
+        members = [Member(user_id=i) for i in range(7)]
+        Member.objects.bulk_create(members)
+
+        Membership(user_id=0, type='honorary',
+                   until=date.today() + timedelta(days=1)).save()
+
+        Membership(user_id=1, type='supporter',
+                   until=date.today() + timedelta(days=1)).save()
+
+        Membership(user_id=2, type='member',
+                   until=date.today() + timedelta(days=1)).save()
+
+        Membership(user_id=3, type='member',
+                   until=date.today() + timedelta(days=1)).save()
+        Membership(user_id=3, type='member',
+                   until=date.today() - timedelta(days=365*10)).save()
+
+        Membership(user_id=4, type='supporter',
+                   until=date.today() + timedelta(days=1)).save()
+        Membership(user_id=4, type='member',
+                   until=date.today() - timedelta(days=365*10)).save()
+
+        Membership(user_id=5, type='member',
+                   until=date.today() - timedelta(days=365*10)).save()
+
+        # user_id=6 has no memberships at all
+
+    def test_honorary(self):
+        members = filter_users('honor', '', [date.today().year])
+        self.assertEqual(len(members), 1)
+        self.assertEqual(members[0].user.id, 0)
+
+    def test_ex(self):
+        members = filter_users('ex', '', [date.today().year])
+        self.assertEqual(len(members), 3)
+        for member in members:
+            self.assertIn(member.user.id, {4, 5, 6})
+
+    # TODO more tests for other cases
+
+
 class StatisticsTest(TestCase):
 
     @classmethod

website/members/views.py

@@ -18,6 +18,47 @@ from . import models
 from .forms import MemberForm
 
 
+def filter_users(tab, keywords, year_range):
+    memberships_query = Q(until__gt=datetime.now()) | Q(until=None)
+    members_query = ~Q(id=None)
+
+    if tab and tab.isdigit():
+        members_query &= Q(starting_year=int(tab))
+    elif tab == 'old':
+        members_query &= Q(starting_year__lt=year_range[-1])
+    elif tab == 'ex':
+        # Filter out all current active memberships
+        memberships_query &= Q(type='member') | Q(type='honorary')
+        memberships = models.Membership.objects.filter(memberships_query)
+        members_query &= ~Q(user__in=memberships.values('user'))
+        # Members_query contains users that are not currently (honorary)member
+    elif tab == 'honor':
+        memberships_query = Q(until__gt=datetime.now().date()) | Q(until=None)
+        memberships_query &= Q(type='honorary')
+
+    if keywords:
+        for key in keywords:
+            members_query &= (Q(nickname__icontains=key) |
+                              Q(user__first_name__icontains=key) |
+                              Q(user__last_name__icontains=key) |
+                              Q(user__username__icontains=key))
+
+    if tab == 'ex':
+        memberships_query = Q(type='member') | Q(type='honorary')
+        memberships = models.Membership.objects.filter(memberships_query)
+        all_memberships = models.Membership.objects.all()
+        # Only keep members that were once members, or are legacy users that
+        #  do not have any memberships at all
+        members_query &= (Q(user__in=memberships.values('user')) |
+                          ~Q(user__in=all_memberships.values('user')))
+    else:
+        memberships = models.Membership.objects.filter(memberships_query)
+        members_query &= Q(user__in=memberships.values('user'))
+    return (models.Member.objects.filter(members_query)
+                                 .order_by('-starting_year',
+                                           'user__first_name'))
+
+
 @login_required
 def index(request):
     query_filter = '' if request.GET.get(
@@ -33,37 +74,9 @@ def index(request):
     # since the width is smaller than needed for the translations to fit
     if request.LANGUAGE_CODE == 'en':
         start_year += 1
-    year_range = reversed(range(start_year, date.today().year + 1))
+    year_range = list(reversed(range(start_year, date.today().year + 1)))
 
-    memberships_query = Q(until__gt=datetime.now()) | Q(until=None)
-    members_query = ~Q(id=None)
-
-    if query_filter and query_filter.isdigit() and not (
-                        query_filter == 'ex' or
-                        query_filter == 'honor' or
-                        query_filter == 'old'):
-        members_query &= Q(starting_year=int(query_filter))
-    elif query_filter == 'old':
-        members_query &= Q(starting_year__lt=start_year)
-    elif query_filter == 'ex':
-        memberships = models.Membership.objects.filter(memberships_query)
-        members_query &= ~Q(user__in=memberships.values('user'))
-        memberships_query = Q(type='member') & Q(until__lte=datetime.now())
-    elif query_filter == 'honor':
-        memberships_query = Q(until__gt=datetime.now().date()) | Q(until=None)
-        memberships_query &= Q(type='honorary')
-
-    if keywords:
-        for key in keywords:
-            memberships_query &= (Q(user__member__nickname__icontains=key) |
-                                  Q(user__first_name__icontains=key) |
-                                  Q(user__last_name__icontains=key) |
-                                  Q(user__username__icontains=key))
-
-    memberships = models.Membership.objects.filter(memberships_query)
-    members_query &= Q(user__in=memberships.values('user'))
-    members = models.Member.objects.filter(members_query).order_by(
-            '-starting_year', 'user__first_name')
+    members = filter_users(query_filter, keywords, year_range)
 
     paginator = Paginator(members, 24)