refactor: use enums with graphene

KK-1108
City-of-Helsinki · Aug 27, 2024 · 7973984 · 7973984
1 parent fe77116
commit 7973984
Show file tree

Hide file tree

Showing 16 changed files with 2,983 additions and 2,425 deletions.
diff --git a/children/schema.py b/children/schema.py
@@ -19,7 +19,7 @@
 
 from children.notifications import NotificationType
 from common.schema import set_obj_languages_spoken_at_home
-from common.utils import login_required, map_enums_to_values_in_kwargs, update_object
+from common.utils import login_required, safe_test_and_get_enum_value, update_object
 from events.models import Event, Occurrence
 from kukkuu.exceptions import (
     ApiUsageError,
@@ -391,7 +391,6 @@ class Input:
     @classmethod
     @login_required
     @transaction.atomic
-    @map_enums_to_values_in_kwargs
     def mutate_and_get_payload(cls, root, info, **kwargs):
         user = info.context.user
         if hasattr(user, "guardian"):
@@ -421,7 +420,7 @@ def mutate_and_get_payload(cls, root, info, **kwargs):
             first_name=guardian_data["first_name"],
             last_name=guardian_data["last_name"],
             phone_number=guardian_data.get("phone_number", ""),
-            language=guardian_data["language"],
+            language=safe_test_and_get_enum_value(guardian_data["language"]),
             email=guardian_data["email"],
             has_accepted_communication=guardian_data.get(
                 "has_accepted_communication", False
@@ -441,7 +440,9 @@ def mutate_and_get_payload(cls, root, info, **kwargs):
 
             child = Child.objects.create(**child_data)
             Relationship.objects.create(
-                type=relationship_data.get("type"), child=child, guardian=guardian
+                type=safe_test_and_get_enum_value(relationship_data.get("type")),
+                child=child,
+                guardian=guardian,
             )
             set_obj_languages_spoken_at_home(info, child, languages)
 
@@ -479,7 +480,6 @@ class Input(BaseNewChildInput):
     @classmethod
     @login_required
     @transaction.atomic
-    @map_enums_to_values_in_kwargs
     def mutate_and_get_payload(cls, root, info, **kwargs):
         user = info.context.user
         if not hasattr(user, "guardian"):
@@ -501,7 +501,9 @@ def mutate_and_get_payload(cls, root, info, **kwargs):
 
         child = Child.objects.create(**kwargs)
         Relationship.objects.create(
-            type=relationship_data.get("type"), child=child, guardian=user.guardian
+            type=safe_test_and_get_enum_value(relationship_data.get("type")),
+            child=child,
+            guardian=user.guardian,
         )
         set_obj_languages_spoken_at_home(info, child, languages)
 
@@ -523,7 +525,6 @@ class Input(BaseUpdateChildInput):
     @classmethod
     @login_required
     @transaction.atomic
-    @map_enums_to_values_in_kwargs
     def mutate_and_get_payload(cls, root, info, **kwargs):
         validate_child_data(kwargs)
         user = info.context.user
@@ -561,7 +562,6 @@ class Input:
     @classmethod
     @login_required
     @transaction.atomic
-    @map_enums_to_values_in_kwargs
     def mutate_and_get_payload(cls, root, info, **kwargs):
         user = info.context.user
 
@@ -590,7 +590,6 @@ class Input:
     @classmethod
     @login_required
     @transaction.atomic
-    @map_enums_to_values_in_kwargs
     def mutate_and_get_payload(cls, root, info, **kwargs):
         user = info.context.user
         child_global_id = kwargs.pop("child_id")