Make changes in GREG-28 work with the changes from GREG-26.

greg/api/filters.py

@@ -38,9 +38,9 @@ class PersonFilter(FilterSet):
             return queryset.annotate(
                 active=Case(
                     When(
-                        Q(person_roles__start_date__isnull=True)
-                        | Q(person_roles__start_date__lte=datetime_now),
-                        person_roles__end_date__gte=datetime_now,
+                        Q(roles__start_date__isnull=True)
+                        | Q(roles__start_date__lte=datetime_now),
+                        roles__end_date__gte=datetime_now,
                         then=True,
                     ),
                     default=False,

greg/tests/api/test_person.py

@@ -427,13 +427,13 @@ def test_filter_active_includes_person_with_active_role(
     person_foo: Person,
     sponsor_guy: Sponsor,
     unit_foo: OrganizationalUnit,
-    role_test_guest: Role,
+    role_type_test_guest: RoleType,
 ):
     date_today = datetime.date.today()
 
-    PersonRole.objects.create(
+    Role.objects.create(
         person=person_foo,
-        role=role_test_guest,
+        type=role_type_test_guest,
         end_date=date_today + datetime.timedelta(days=1),
         registered_by=sponsor_guy,
         unit=unit_foo,
@@ -449,7 +449,7 @@ def test_filter_active_includes_person_with_active_role(
 
 @pytest.mark.django_db
 def test_filter_active_excludes_person_with_no_active_role(
-    client, person_foo: Person, person_foo_role: PersonRole
+    client, person_foo: Person, person_foo_role: Role
 ):
     url = reverse("v1:person-list")
     response = client.get(url, {"active": "true"})