Get active members through a manager

website/events/models.py

@@ -179,7 +179,7 @@ class Registration(models.Model):
         blank=True,
         null=True,
         limit_choices_to=(Q(user__membership__until__isnull=True) |
-                          Q(user__membership__until__gt=timezone.now()))
+                          Q(user__membership__until__gt=timezone.now().date()))
     )
 
     name = models.CharField(

website/members/models.py

 from django.utils import timezone
 from django.db import models
+from django.db.models import Q
 from django.core import validators
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
@@ -10,9 +11,20 @@ from localflavor.generic.models import IBANField
 from utils.validators import validate_file_extension
 
 
+class ActiveMemberManager(models.Manager):
+    """Get all active members"""
+    def get_queryset(self):
+        return (super().get_queryset()
+                .filter(Q(user__membership__until__isnull=True) |
+                        Q(user__membership__until__gt=timezone.now().date())))
+
+
 class Member(models.Model):
     """This class describes a member"""
 
+    objects = models.Manager()
+    active_members = ActiveMemberManager()
+
     # No longer yearly membership as a type, use expiration date instead.
     PROGRAMME_CHOICES = (
         ('computingscience', _('Computing Science')),