interface inheritance

CentreForDigitalHumanities · Sep 19, 2024 · 83da94d · 83da94d
1 parent f5228a1
commit 83da94d
Show file tree

Hide file tree

Showing 17 changed files with 59 additions and 86 deletions.
diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
@@ -6,6 +6,7 @@
 
 from user.models import User
 from user.types.UserType import UserType
+from core.types.entity import EntityDescription as EntityDescriptionInterface
 
 
 class EntityDescriptionType(NamedType, AbstractDjangoObjectType):
@@ -27,6 +28,7 @@ class Meta:
             "page",
             "contributors",
         ] + NamedType.fields()
+        interfaces = (EntityDescriptionInterface,)
 
     @staticmethod
     def resolve_contributors(

diff --git a/backend/core/types/NamedType.py b/backend/core/types/NamedType.py
@@ -10,6 +10,7 @@ class NamedType(AbstractDjangoObjectType):
     """
 
     name = graphene.NonNull(graphene.String)
+    description = graphene.NonNull(graphene.String)
 
     class Meta:
         model = Named

diff --git a/backend/core/types/entity.py b/backend/core/types/entity.py
@@ -8,7 +8,7 @@ class Entity(graphene.Enum):
     SPACE = "space"
 
 
-class EntityInterface(graphene.Interface):
+class EntityDescription(graphene.Interface):
     id = graphene.NonNull(graphene.ID)
     name = graphene.String()
     description = graphene.String()
diff --git a/backend/event/types/EpisodeAgentType.py b/backend/event/types/EpisodeAgentType.py
@@ -3,12 +3,12 @@
 
 from core.types.DescriptionFieldType import DescriptionFieldType
 from event.models import EpisodeAgent
-from core.types.entity import Entity, EntityInterface
+from core.types.entity import Entity, EntityDescription
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 from core.types.DescriptionFieldType import SourceMentionEnum
 
 class EpisodeAgentType(DescriptionFieldType, DjangoObjectType):
-    entity = NonNull(EntityInterface)
+    entity = NonNull(EntityDescription)
     entity_type = NonNull(Entity)
 
     class Meta:

diff --git a/backend/event/types/EpisodeEntityLink.py b/backend/event/types/EpisodeEntityLink.py
@@ -1,13 +1,13 @@
 from graphene import ID, NonNull, String, Interface
 from core.types.DescriptionFieldType import SourceMentionEnum
 from event.types.EpisodeType import EpisodeType
-from core.types.entity import Entity, EntityInterface
+from core.types.entity import Entity, EntityDescription
 
 
 class EpisodeEntityLink(Interface):
     id = NonNull(ID)
     episode = NonNull(EpisodeType)
     entity_type = NonNull(Entity)
-    entity = NonNull(EntityInterface)
+    entity = NonNull(EntityDescription)
     source_mention = NonNull(SourceMentionEnum)
     note = String()
diff --git a/backend/event/types/EpisodeGiftType.py b/backend/event/types/EpisodeGiftType.py
@@ -1,14 +1,14 @@
 from graphene import NonNull
 from graphene_django import DjangoObjectType
 
-from core.types.entity import Entity, EntityInterface
+from core.types.entity import Entity, EntityDescription
 from core.types.DescriptionFieldType import DescriptionFieldType, SourceMentionEnum
 from event.models import EpisodeGift
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 
 
 class EpisodeGiftType(DescriptionFieldType, DjangoObjectType):
-    entity = NonNull(EntityInterface)
+    entity = NonNull(EntityDescription)
     entity_type = NonNull(Entity)
 
     class Meta:

diff --git a/backend/event/types/EpisodeLetterType.py b/backend/event/types/EpisodeLetterType.py
@@ -2,12 +2,12 @@
 from graphene_django import DjangoObjectType
 
 from core.types.DescriptionFieldType import DescriptionFieldType, SourceMentionEnum
-from core.types.entity import Entity, EntityInterface
+from core.types.entity import Entity, EntityDescription
 from event.models import EpisodeLetter
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 
 class EpisodeLetterType(DescriptionFieldType, DjangoObjectType):
-    entity = NonNull(EntityInterface)
+    entity = NonNull(EntityDescription)
     entity_type = NonNull(Entity)
 
     class Meta:

diff --git a/backend/event/types/EpisodeSpaceType.py b/backend/event/types/EpisodeSpaceType.py
@@ -2,12 +2,12 @@
 from graphene_django import DjangoObjectType
 
 from core.types.DescriptionFieldType import DescriptionFieldType, SourceMentionEnum
-from core.types.entity import Entity, EntityInterface
+from core.types.entity import Entity, EntityDescription
 from event.models import EpisodeSpace
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 
 class EpisodeSpaceType(DescriptionFieldType, DjangoObjectType):
-    entity = NonNull(EntityInterface)
+    entity = NonNull(EntityDescription)
     entity_type = NonNull(Entity)
 
     class Meta:

diff --git a/backend/event/types/EpisodeType.py b/backend/event/types/EpisodeType.py
@@ -21,6 +21,7 @@ class Meta:
             "letters",
             "spaces",
         ] + EntityDescriptionType.fields()
+        interfaces = EntityDescriptionType._meta.interfaces
 
     @classmethod
     def get_queryset(

diff --git a/backend/letter/types/GiftDescriptionType.py b/backend/letter/types/GiftDescriptionType.py
@@ -6,7 +6,6 @@
 from letter.models import GiftCategory, GiftDescription, GiftDescriptionCategory
 from letter.types.GiftDescriptionCategoryType import GiftDescriptionCategoryType
 from letter.types.GiftCategoryType import GiftCategoryType
-from core.types.entity import EntityInterface
 from event.types.EpisodeGiftType import EpisodeGiftType
 from event.models import EpisodeGift
 
@@ -24,7 +23,7 @@ class Meta:
             "categories",
             "episodes",
         ] + EntityDescriptionType.fields()
-        interfaces = (EntityInterface,)
+        interfaces = EntityDescriptionType._meta.interfaces
 
     @classmethod
     def get_queryset(

diff --git a/backend/letter/types/LetterDescriptionType.py b/backend/letter/types/LetterDescriptionType.py
@@ -6,7 +6,6 @@
 from letter.models import LetterCategory, LetterDescription, LetterDescriptionCategory
 from letter.types.LetterCategoryType import LetterCategoryType
 from letter.types.LetterDescriptionCategoryType import LetterDescriptionCategoryType
-from core.types.entity import EntityInterface
 from event.models import EpisodeLetter
 from event.types.EpisodeLetterType import EpisodeLetterType
 
@@ -24,7 +23,7 @@ class Meta:
             "categories",
             "episodes",
         ] + EntityDescriptionType.fields()
-        interfaces = (EntityInterface,)
+        interfaces = EntityDescriptionType._meta.interfaces
 
     @classmethod
     def get_queryset(

diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
@@ -10,7 +10,6 @@
 from person.types.PersonReferenceType import PersonReferenceType
 from event.types.EpisodeAgentType import EpisodeAgentType
 from event.models import EpisodeAgent
-from core.types.entity import EntityInterface
 
 
 class AgentDescriptionType(EntityDescriptionType, DjangoObjectType):
@@ -31,7 +30,7 @@ class Meta:
             "location",
             "episodes",
         ] + EntityDescriptionType.fields()
-        interfaces = (EntityInterface,)
+        interfaces = EntityDescriptionType._meta.interfaces
 
     @classmethod
     def get_queryset(

diff --git a/backend/space/types/SpaceDescriptionType.py b/backend/space/types/SpaceDescriptionType.py
@@ -18,7 +18,6 @@
 from space.types.StructureType import StructureType
 from space.types.SettlementFieldType import SettlementFieldType
 from space.types.StructureFieldType import StructureFieldType
-from core.types.entity import EntityInterface
 from event.types.EpisodeSpaceType import EpisodeSpaceType
 from event.models import EpisodeSpace
 
@@ -41,7 +40,7 @@ class Meta:
             "structures",
             "episodes",
         ] + EntityDescriptionType.fields()
-        interfaces = (EntityInterface,)
+        interfaces = EntityDescriptionType._meta.interfaces
 
     @classmethod
     def get_queryset(