deps: upgrade to django 5.2 and all applicable deps

Refs: KK-1467

Author: nicobav

children/factories.py

@@ -1,6 +1,7 @@
 import factory
 
 from children.models import Child, Relationship
+from common.mixins import SaveAfterPostGenerationMixin
 from projects.models import Project
 from users.factories import GuardianFactory
 
@@ -39,10 +40,19 @@ class Meta:
         skip_postgeneration_save = True  # Not needed after factory v4.0.0
 
 
-class ChildWithGuardianFactory(ChildFactory):
-    relationship = factory.RelatedFactory(RelationshipFactory, "child")
+class ChildWithGuardianFactory(SaveAfterPostGenerationMixin, ChildFactory):
     project = factory.LazyFunction(lambda: Project.objects.get(year=2020))
 
+    @factory.post_generation
+    def relationship(self, created, extracted, **kwargs):
+        """Create a relationship with a guardian after the child is created."""
+        if created:
+            RelationshipFactory(child=self, **kwargs)
+
 
 class ChildWithTwoGuardiansFactory(ChildWithGuardianFactory):
-    relationship2 = factory.RelatedFactory(RelationshipFactory, "child")
+    @factory.post_generation
+    def relationship2(self, created, extracted, **kwargs):
+        """Create a second relationship with a guardian after the child is created."""
+        if created:
+            RelationshipFactory(child=self, **kwargs)

children/tests/__snapshots__/test_api.ambr

@@ -481,12 +481,12 @@
                   'edges': list([
                     dict({
                       'node': dict({
-                        'remainingCapacity': 12,
+                        'remainingCapacity': 29,
                       }),
                     }),
                     dict({
                       'node': dict({
-                        'remainingCapacity': 13,
+                        'remainingCapacity': 30,
                       }),
                     }),
                   ]),
@@ -914,7 +914,7 @@
     'data': dict({
       'updateChild': dict({
         'child': dict({
-          'birthyear': 2021,
+          'birthyear': 2023,
           'name': 'Matti',
           'postalCode': '00840',
         }),
@@ -927,9 +927,9 @@
     'data': dict({
       'updateChild': dict({
         'child': dict({
-          'birthyear': 2021,
-          'name': 'Derek Perry',
-          'postalCode': '70117',
+          'birthyear': 2023,
+          'name': 'Katherine Gomez',
+          'postalCode': '49763',
         }),
       }),
     }),

common/tests/conftest.py

@@ -12,7 +12,9 @@
 from graphene.test import Client
 from guardian.shortcuts import assign_perm
 
-from children.factories import ChildWithGuardianFactory
+from children.factories import (
+    ChildWithGuardianFactory,
+)
 from common.notification_service import SMSNotificationService
 from events.factories import EventFactory, EventGroupFactory, OccurrenceFactory
 from kukkuu.schema import schema
@@ -105,7 +107,8 @@ def user_api_client():
 
 @pytest.fixture
 def guardian_api_client():
-    return create_api_client_with_user(UserFactory(guardian=GuardianFactory()))
+    guardian = GuardianFactory()
+    return create_api_client_with_user(guardian.user)
 
 
 def _projects_user_api_client(
@@ -182,7 +185,8 @@ def child_with_random_guardian(project):
 @pytest.fixture
 def child_with_user_guardian(guardian_api_client, project):
     return ChildWithGuardianFactory(
-        relationship__guardian__user=guardian_api_client.user, project=project
+        relationship__guardian=guardian_api_client.user.guardian,
+        project=project,
     )
 
 

events/tests/__snapshots__/test_api.ambr

@@ -151,7 +151,7 @@
       'enrolOccurrence': dict({
         'enrolment': dict({
           'child': dict({
-            'name': 'Derek Perry',
+            'name': 'Katherine Gomez',
           }),
           'createdAt': '2020-12-12T00:00:00+00:00',
           'occurrence': dict({
@@ -186,7 +186,7 @@
       'enrolOccurrence': dict({
         'enrolment': dict({
           'child': dict({
-            'name': 'Derek Perry',
+            'name': 'Katherine Gomez',
           }),
           'createdAt': '2020-11-11T00:00:00+00:00',
           'occurrence': dict({
@@ -203,7 +203,7 @@
       'enrolOccurrence': dict({
         'enrolment': dict({
           'child': dict({
-            'name': 'Derek Perry',
+            'name': 'Katherine Gomez',
           }),
           'createdAt': '2020-11-11T00:00:00+00:00',
           'occurrence': dict({
@@ -220,7 +220,7 @@
       'enrolOccurrence': dict({
         'enrolment': dict({
           'child': dict({
-            'name': 'Derek Perry',
+            'name': 'Katherine Gomez',
           }),
           'createdAt': '2020-11-11T00:00:00+00:00',
           'occurrence': dict({
@@ -237,7 +237,7 @@
       'enrolOccurrence': dict({
         'enrolment': dict({
           'child': dict({
-            'name': 'Derek Perry',
+            'name': 'Katherine Gomez',
           }),
           'createdAt': '2020-11-11T00:00:00+00:00',
           'occurrence': dict({
@@ -254,7 +254,7 @@
       'enrolOccurrence': dict({
         'enrolment': dict({
           'child': dict({
-            'name': 'Sandra Brown',
+            'name': 'Sandra Hudson',
           }),
           'createdAt': '2020-12-12T00:00:00+00:00',
           'occurrence': dict({
@@ -275,56 +275,58 @@
             dict({
               'node': dict({
                 'child': dict({
-                  'name': 'Sandra Brown',
+                  'name': 'Sandra Hudson',
                 }),
               }),
             }),
           ]),
         }),
         'event': dict({
-          'capacityPerOccurrence': 25,
+          'capacityPerOccurrence': 9,
           'duration': 1,
-          'image': 'http://testserver/media/series.jpg',
-          'participantsPerInvite': 'CHILD_AND_1_OR_2_GUARDIANS',
+          'image': 'http://testserver/media/law.jpg',
+          'participantsPerInvite': 'FAMILY',
           'publishedAt': '2020-12-12T00:00:00+00:00',
           'translations': list([
             dict({
-              'description': 'Law ago respond yard door indicate country. Direction traditional whether serious sister work. Beat pressure unit toward movie by.',
+              'description': 'Able last in able local. Quite nearly gun two born land. Yeah trouble method yard campaign former model.',
               'languageCode': 'FI',
-              'name': 'Detail audience campaign college career fight data.',
-              'shortDescription': 'Last in able local garden modern they.',
+              'name': 'Always sport return student light a point.',
+              'shortDescription': 'Who Mrs public east site chance.',
             }),
           ]),
         }),
         'occurrenceLanguage': 'FI',
-        'remainingCapacity': 21,
+        'remainingCapacity': 5,
         'ticketSystem': dict({
           'type': 'INTERNAL',
         }),
         'time': '2020-12-12T00:00:00+00:00',
         'venue': dict({
           'translations': list([
             dict({
-              'accessibilityInfo': 'Moment strong hand push book and interesting sit. Near increase process truth list pressure. Capital city sing himself yard stuff.',
+              'accessibilityInfo': 'Daughter order stay sign discover. Analysis season project executive entire. Service wonder everything pay parent theory.',
               'additionalInfo': '''
-                Sense person the probably. Simply state social believe policy. Score think turn argue present.
-                Prevent pressure point. Voice radio happen color scene.
+                Local challenge box myself last.
+                Experience seven Republican throw wrong party wall.
+                Policy data control as receive.
+                Teacher subject family around year. Space speak sense person the probably deep.
               ''',
               'address': '''
-                404 Figueroa Trace
-                Pollardview, GA 81371
+                19054 Harold Mountains
+                Bakerland, MS 59687
               ''',
               'arrivalInstructions': '''
-                Water those notice medical science sort. Front affect senior. Mission network who think significant land especially.
-                Staff read rule point leg within. Staff country actually generation five training.
+                Election stay every something base. Treat final central situation past ready join.
+                Office water those notice medical. Already name likely behind mission network.
               ''',
               'description': '''
-                Page box child care any concern. Defense level church use.
-                Never news behind. Beat at success decade either enter everything. Newspaper force newspaper business himself exist.
+                Serious listen police shake. Page box child care any concern.
+                Agree room laugh prevent make. Our very television beat at success decade.
               ''',
               'languageCode': 'FI',
-              'name': 'Dog hospital number.',
-              'wwwUrl': 'https://www.beck-sherman.com/',
+              'name': 'South among score fall long respond draw.',
+              'wwwUrl': 'http://www.brooks.com/',
             }),
           ]),
         }),
@@ -415,7 +417,7 @@
           'edges': list([
             dict({
               'node': dict({
-                'name': 'Election stay every something base.',
+                'name': 'Sit future dream party door better performance.',
               }),
             }),
             dict({

events/tests/__snapshots__/test_notifications.ambr

@@ -224,11 +224,11 @@
 # name: test_unenrol_occurrence_notification
   list([
     '''
-      kukkuu@example.com|['pjenkins@example.net']|Occurrence unenrolment FI|
-              Event FI: Detail audience campaign college career fight data.
-              Guardian FI: Calvin Gutierrez (pjenkins@example.net)
+      kukkuu@example.com|['michellewalker@example.net']|Occurrence unenrolment FI|
+              Event FI: Always sport return student light a point.
+              Guardian FI: Michael Patton (michellewalker@example.net)
               Occurrence: 2020-12-12 00:00:00+00:00
-              Child: Sandra Brown (2023)
+              Child: Sandra Hudson (2023)
               Unsubscribe: http://localhost:3000/fi/profile/subscriptions?authToken=a1b2c3d4e5f6g7h8
     ''',
   ])

events/tests/test_api.py

@@ -98,7 +98,7 @@
 from projects.factories import ProjectFactory
 from projects.models import Project
 from subscriptions.factories import FreeSpotNotificationSubscriptionFactory
-from users.factories import GuardianFactory, UserFactory
+from users.factories import GuardianFactory
 from venues.factories import VenueFactory
 
 
@@ -1530,7 +1530,7 @@ def test_child_enrol_occurrence_from_different_project(
 )
 def test_api_query_depth(settings, event, max_query_depth, expected_error_message):
     settings.KUKKUU_QUERY_MAX_DEPTH = max_query_depth
-    user = UserFactory(guardian=GuardianFactory())
+    user = GuardianFactory().user
     request = RequestFactory().post("/graphql")
     request.user = user
 
@@ -2001,7 +2001,7 @@ def test_event_group_events_filtering_by_available_for_child_id(
     snapshot, guardian_api_client, user_api_client, event_group, past, future
 ):
     child_with_guardian = ChildWithGuardianFactory(
-        relationship__guardian__user=guardian_api_client.user
+        relationship__guardian=guardian_api_client.user.guardian
     )
     OccurrenceFactory(
         time=past, event__published_at=past, event__event_group=event_group
@@ -2061,7 +2061,7 @@ def test_event_ticket_system_password_own_child_password_exists(
 ):
     event = EventFactory(ticket_system=Event.TICKETMASTER, published_at=now())
     child = ChildWithGuardianFactory(
-        relationship__guardian__user=guardian_api_client.user.guardian.user
+        relationship__guardian=guardian_api_client.user.guardian
     )
     existing_password = TicketSystemPasswordFactory(
         event=event, child=child, value="the correct password"
@@ -2081,7 +2081,7 @@ def test_event_ticket_system_password_own_child_password_exists(
 def test_event_ticket_system_password_own_child_no_password(guardian_api_client):
     event = EventFactory(ticket_system=Event.TICKETMASTER, published_at=now())
     child = ChildWithGuardianFactory(
-        relationship__guardian__user=guardian_api_client.user.guardian.user
+        relationship__guardian=guardian_api_client.user.guardian
     )
 
     variables = {"eventId": get_global_id(event), "childId": get_global_id(child)}
@@ -2353,7 +2353,7 @@ def test_assign_ticket_system_password_success(guardian_api_client):
     )
     child = ChildWithGuardianFactory(
         name="Test child",
-        relationship__guardian__user=guardian_api_client.user.guardian.user,
+        relationship__guardian=guardian_api_client.user.guardian,
     )
     someone_elses_password = TicketSystemPasswordFactory(  # noqa: F841
         event=event, value="FATAL LEAK", assigned_at=now()
@@ -2386,7 +2386,7 @@ def test_assign_ticket_system_password_already_assigned(guardian_api_client):
     """
     event = EventFactory(ticket_system=Event.TICKETMASTER, published_at=now())
     child = ChildWithGuardianFactory(
-        relationship__guardian__user=guardian_api_client.user.guardian.user
+        relationship__guardian=guardian_api_client.user.guardian
     )
     used_password = TicketSystemPasswordFactory(
         event=event, child=child, value="Used password"
@@ -2410,7 +2410,7 @@ def test_assign_ticket_system_password_no_free_passwords(
     """
     event = EventFactory(ticket_system=Event.TICKETMASTER, published_at=now())
     child = ChildWithGuardianFactory(
-        relationship__guardian__user=guardian_api_client.user.guardian.user
+        relationship__guardian=guardian_api_client.user.guardian
     )
     TicketSystemPasswordFactory(
         event=event, value="Someone else's password", assigned_at=now()
@@ -2427,7 +2427,7 @@ def test_assign_ticket_system_password_internal_event(guardian_api_client):
     """
     event = EventFactory(ticket_system=Event.INTERNAL, published_at=now())
     child = ChildWithGuardianFactory(
-        relationship__guardian__user=guardian_api_client.user.guardian.user
+        relationship__guardian=guardian_api_client.user.guardian
     )
 
     executed = _assign_ticket_system_password(guardian_api_client, event, child)
@@ -2445,7 +2445,7 @@ def test_assign_ticket_system_password_not_published_event(guardian_api_client):
     """
     event = EventFactory(ticket_system=Event.TICKETMASTER, published_at=None)
     child = ChildWithGuardianFactory(
-        relationship__guardian__user=guardian_api_client.user.guardian.user
+        relationship__guardian=guardian_api_client.user.guardian
     )
 
     executed = _assign_ticket_system_password(guardian_api_client, event, child)
@@ -2470,7 +2470,7 @@ def _create_data_for_ticket_system_password_only_externals_enrolment_limit_tests
     child = ChildWithGuardianFactory(
         name="Test child",
         project=project,
-        relationship__guardian__user=client.user.guardian.user,
+        relationship__guardian=client.user.guardian,
     )
     TicketSystemPasswordFactory.create_batch(
         size=existing_enrolment_count,
@@ -2579,7 +2579,7 @@ def test_assign_ticket_system_password_internal_and_external_enrolment_limit(
     child = ChildWithGuardianFactory(
         name="Test child",
         project=project,
-        relationship__guardian__user=guardian_api_client.user.guardian.user,
+        relationship__guardian=guardian_api_client.user.guardian,
     )
     TicketSystemPasswordFactory(
         child=child,

events/tests/test_notifications.py

@@ -357,7 +357,7 @@ def test_unenrol_occurrence_notification(
 ):
     settings.KUKKUU_ENROLMENT_UNENROL_HOURS_BEFORE = 0
     child = ChildWithGuardianFactory(
-        relationship__guardian__user=guardian_api_client.user,
+        relationship__guardian=guardian_api_client.user.guardian,
         project=project,
     )
     EnrolmentFactory(occurrence=occurrence, child=child)