Merge branch '1170-job-failed-315563' into 'master'

Resolve "Job Failed #315563"

Closes #1170

See merge request !1681

aleksis/core/mixins.py

@@ -21,7 +21,6 @@ from django.views.generic import CreateView, UpdateView
 from django.views.generic.edit import DeleteView, ModelFormMixin
 
 import reversion
-from django_ical.feedgenerator import ITEM_ELEMENT_FIELD_MAP
 from dynamic_preferences.settings import preferences_settings
 from dynamic_preferences.types import FilePreference
 from guardian.admin import GuardedModelAdmin
@@ -39,7 +38,7 @@ from aleksis.core.managers import (
     SchoolTermRelatedQuerySet,
 )
 
-from .util.core_helpers import ExtendedICal20Feed
+from .util.core_helpers import EXTENDED_ITEM_ELEMENT_FIELD_MAP, ExtendedICal20Feed
 
 if TYPE_CHECKING:
     from .models import Person
@@ -725,7 +724,7 @@ class CalendarEventMixin(RegistryObject):
     @classmethod
     def get_event_field_names(cls) -> list[str]:
         """Return the names of the fields to be used for the feed."""
-        return [field_map[0] for field_map in ITEM_ELEMENT_FIELD_MAP]
+        return [field_map[0] for field_map in EXTENDED_ITEM_ELEMENT_FIELD_MAP]
 
     @classmethod
     def get_event_field_value(

aleksis/core/util/core_helpers.py

@@ -476,8 +476,8 @@ def get_ip(*args, **kwargs):
     return get_client_ip(*args, **kwargs)[0]
 
 
-feedgenerator.FEED_FIELD_MAP = feedgenerator.FEED_FIELD_MAP + (("color", "color"),)
-feedgenerator.ITEM_ELEMENT_FIELD_MAP = feedgenerator.ITEM_ELEMENT_FIELD_MAP + (
+EXTENDED_FEED_FIELD_MAP = feedgenerator.FEED_FIELD_MAP + (("color", "color"),)
+EXTENDED_ITEM_ELEMENT_FIELD_MAP = feedgenerator.ITEM_ELEMENT_FIELD_MAP + (
     ("color", "color"),
     ("meta", "x-meta"),
     ("reference_object", "reference_object"),
@@ -496,7 +496,7 @@ class ExtendedICal20Feed(feedgenerator.ICal20Feed):
         cal.add("calscale", "GREGORIAN")
         cal.add("prodid", "-//AlekSIS//AlekSIS//EN")
 
-        for ifield, efield in feedgenerator.FEED_FIELD_MAP:
+        for ifield, efield in EXTENDED_FEED_FIELD_MAP:
             val = self.feed.get(ifield)
             if val is not None:
                 cal.add(efield, val)
@@ -518,7 +518,7 @@ class ExtendedICal20Feed(feedgenerator.ICal20Feed):
             component_type = item.get("component_type")
             element = Todo() if component_type == "todo" else Event()
 
-            for ifield, efield in feedgenerator.ITEM_ELEMENT_FIELD_MAP:
+            for ifield, efield in EXTENDED_ITEM_ELEMENT_FIELD_MAP:
                 val = item.get(ifield)
                 if val is not None:
                     if ifield == "attendee":

conftest.py

@@ -30,15 +30,15 @@ def graphql_query(
         header_params = {"headers": headers}
         resp = client.post(
             graphql_url,
-            json.dumps([body]),
+            json.dumps(body),
             content_type="application/json",
             **header_params,
         )
     else:
         resp = client.post(
-            graphql_url, json.dumps([body]), content_type="application/json"
+            graphql_url, json.dumps(body), content_type="application/json"
         )
-    content = json.loads(resp.content)[0]
+    content = json.loads(resp.content)
     return resp, content